From 8bc4c1f05eb4a76777c61de7b0a425b68bf5d6ca Mon Sep 17 00:00:00 2001 From: Steffen Furholm Date: Fri, 16 Oct 2015 23:29:08 +0200 Subject: [PATCH 001/142] Allow overriding of only some templates when using --template-dir option. Templates which aren't found in the template directory will fall back to the ones packaged/distributed with Swagger --- .../io/swagger/codegen/AbstractGenerator.java | 21 ++++++++++++++++--- .../io/swagger/codegen/CodegenConfig.java | 2 ++ .../io/swagger/codegen/DefaultCodegen.java | 9 ++++++++ .../languages/AkkaScalaClientCodegen.java | 2 +- .../languages/AndroidClientCodegen.java | 2 +- .../languages/AsyncScalaClientCodegen.java | 2 +- .../languages/CSharpClientCodegen.java | 2 +- .../languages/CsharpDotNet2ClientCodegen.java | 2 +- .../codegen/languages/DartClientCodegen.java | 2 +- .../codegen/languages/FlashClientCodegen.java | 2 +- .../codegen/languages/JavaClientCodegen.java | 2 +- .../languages/JavaInflectorServerCodegen.java | 2 +- .../codegen/languages/JaxRSServerCodegen.java | 2 +- .../languages/NodeJSServerCodegen.java | 2 +- .../codegen/languages/ObjcClientCodegen.java | 2 +- .../codegen/languages/PerlClientCodegen.java | 2 +- .../codegen/languages/PhpClientCodegen.java | 2 +- .../languages/PythonClientCodegen.java | 2 +- .../codegen/languages/Qt5CPPGenerator.java | 2 +- .../codegen/languages/RubyClientCodegen.java | 2 +- .../codegen/languages/ScalaClientCodegen.java | 2 +- .../languages/ScalatraServerCodegen.java | 2 +- .../codegen/languages/SilexServerCodegen.java | 2 +- .../languages/SinatraServerCodegen.java | 2 +- .../languages/SpringMVCServerCodegen.java | 2 +- .../codegen/languages/StaticDocCodegen.java | 2 +- .../languages/StaticHtmlGenerator.java | 2 +- .../codegen/languages/SwaggerGenerator.java | 2 +- .../languages/SwaggerYamlGenerator.java | 2 +- .../codegen/languages/SwiftCodegen.java | 2 +- .../codegen/languages/TizenClientCodegen.java | 2 +- .../TypeScriptAngularClientCodegen.java | 2 +- .../TypeScriptNodeClientCodegen.java | 2 +- 33 files changed, 59 insertions(+), 33 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java index 2c90f4255ec..d6bbb9fa526 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -70,14 +70,29 @@ public abstract class AbstractGenerator { String libTemplateFile = config.templateDir() + File.separator + "libraries" + File.separator + library + File.separator + templateFile; - if (templateExists(libTemplateFile)) { + + if (new File(libTemplateFile).exists()) { + return libTemplateFile; + } + + libTemplateFile = config.embeddedTemplateDir() + File.separator + + "libraries" + File.separator + library + File.separator + + templateFile; + if (embeddedTemplateExists(libTemplateFile)) { + // Fall back to the template file embedded/packaged in the JAR file... return libTemplateFile; } } - return config.templateDir() + File.separator + templateFile; + String template = config.templateDir() + File.separator + templateFile; + if (new File(template).exists()) { + return template; + } else { + // Fall back to the template file embedded/packaged in the JAR file... + return config.embeddedTemplateDir() + File.separator + templateFile; + } } - public boolean templateExists(String name) { + public boolean embeddedTemplateExists(String name) { return this.getClass().getClassLoader().getResource(getCPResourcePath(name)) != null; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java index 10d7363cc35..3292efbfe76 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java @@ -29,6 +29,8 @@ public interface CodegenConfig { String templateDir(); + String embeddedTemplateDir(); + String modelFileFolder(); String modelPackage(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 575f9742f50..45b5d9f64ee 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -78,6 +78,7 @@ public class DefaultCodegen { protected Map apiTemplateFiles = new HashMap(); protected Map modelTemplateFiles = new HashMap(); protected String templateDir; + protected String embeddedTemplateDir; protected Map additionalProperties = new HashMap(); protected List supportingFiles = new ArrayList(); protected List cliOptions = new ArrayList(); @@ -183,6 +184,14 @@ public class DefaultCodegen { return templateDir; } + public String embeddedTemplateDir() { + if (embeddedTemplateDir != null) { + return embeddedTemplateDir; + } else { + return templateDir; + } + } + public Map apiTemplateFiles() { return apiTemplateFiles; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java index c40eb653543..312f087f83c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java @@ -68,7 +68,7 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon outputFolder = "generated-code/scala"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "akka-scala"; + embeddedTemplateDir = templateDir = "akka-scala"; apiPackage = mainPackage + ".api"; modelPackage = mainPackage + ".model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java index 9c55053e59c..cdc88d1f023 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java @@ -30,7 +30,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi outputFolder = "generated-code/android"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "android-java"; + embeddedTemplateDir = templateDir = "android-java"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java index 38e6328a8e5..e033b9f3cf3 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java @@ -40,7 +40,7 @@ public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenCo outputFolder = "generated-code/async-scala"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "asyncscala"; + embeddedTemplateDir = templateDir = "asyncscala"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index bd3487d06df..66692bf5f83 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -27,7 +27,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig outputFolder = "generated-code" + File.separator + "csharp"; modelTemplateFiles.put("model.mustache", ".cs"); apiTemplateFiles.put("api.mustache", ".cs"); - templateDir = "csharp"; + embeddedTemplateDir = templateDir = "csharp"; apiPackage = "IO.Swagger.Api"; modelPackage = "IO.Swagger.Model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java index 9d9757a9131..06f87edef38 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java @@ -25,7 +25,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege outputFolder = "generated-code" + File.separator + "CsharpDotNet2"; modelTemplateFiles.put("model.mustache", ".cs"); apiTemplateFiles.put("api.mustache", ".cs"); - templateDir = "CsharpDotNet2"; + embeddedTemplateDir = templateDir = "CsharpDotNet2"; apiPackage = "IO.Swagger.Api"; modelPackage = "IO.Swagger.Model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java index ede4505d4dd..f156146580a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java @@ -26,7 +26,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "generated-code/dart"; modelTemplateFiles.put("model.mustache", ".dart"); apiTemplateFiles.put("api.mustache", ".dart"); - templateDir = "dart"; + embeddedTemplateDir = templateDir = "dart"; apiPackage = "lib.api"; modelPackage = "lib.model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java index 7c484c38a0b..cf91c8fd78c 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java @@ -40,7 +40,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig modelTemplateFiles.put("model.mustache", ".as"); modelTemplateFiles.put("modelList.mustache", "List.as"); apiTemplateFiles.put("api.mustache", ".as"); - templateDir = "flash"; + embeddedTemplateDir = templateDir = "flash"; languageSpecificPrimitives.clear(); languageSpecificPrimitives.add("Number"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index d265e5a7232..930295f172d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -47,7 +47,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "generated-code/java"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "Java"; + embeddedTemplateDir = templateDir = "Java"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index d678515f4cb..aecdfd59921 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -30,7 +30,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod sourceFolder = "src/main/java"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "JavaInflector"; + embeddedTemplateDir = templateDir = "JavaInflector"; invokerPackage = "io.swagger.handler"; artifactId = "swagger-inflector-server"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java index 883b08d8dfa..03707c249a4 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java @@ -31,7 +31,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf apiTemplateFiles.put("apiService.mustache", ".java"); apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); apiTemplateFiles.put("apiServiceFactory.mustache", ".java"); - templateDir = "JavaJaxRS"; + embeddedTemplateDir = templateDir = "JavaJaxRS"; apiPackage = System.getProperty("swagger.codegen.jaxrs.apipackage", "io.swagger.api"); modelPackage = System.getProperty("swagger.codegen.jaxrs.modelpackage", "io.swagger.model"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index 10070ece512..664530c33d8 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -55,7 +55,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig * Template Location. This is the location which templates will be read from. The generator * will use the resource stream to attempt to read the templates. */ - templateDir = "nodejs"; + embeddedTemplateDir = templateDir = "nodejs"; /** * Reserved words. Override this with reserved words specific to your language diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java index ef369169827..8f98568425e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -36,7 +36,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { modelTemplateFiles.put("model-body.mustache", ".m"); apiTemplateFiles.put("api-header.mustache", ".h"); apiTemplateFiles.put("api-body.mustache", ".m"); - templateDir = "objc"; + embeddedTemplateDir = templateDir = "objc"; defaultIncludes.clear(); defaultIncludes.add("bool"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index d54c44a9bdd..2bef9fd073b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -25,7 +25,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "generated-code" + File.separatorChar + "perl"; modelTemplateFiles.put("object.mustache", ".pm"); apiTemplateFiles.put("api.mustache", ".pm"); - templateDir = "perl"; + embeddedTemplateDir = templateDir = "perl"; reservedWords = new HashSet( diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 538a5c494a6..8117cc58ce9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -33,7 +33,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "generated-code" + File.separator + "php"; modelTemplateFiles.put("model.mustache", ".php"); apiTemplateFiles.put("api.mustache", ".php"); - templateDir = "php"; + embeddedTemplateDir = templateDir = "php"; apiPackage = invokerPackage + "\\Api"; modelPackage = invokerPackage + "\\Model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index 6d9982cf78c..23364b5d982 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -27,7 +27,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig outputFolder = "generated-code" + File.separatorChar + "python"; modelTemplateFiles.put("model.mustache", ".py"); apiTemplateFiles.put("api.mustache", ".py"); - templateDir = "python"; + embeddedTemplateDir = templateDir = "python"; languageSpecificPrimitives.clear(); languageSpecificPrimitives.add("int"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java index ff58dbd9440..02754f7b480 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java @@ -71,7 +71,7 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { * Template Location. This is the location which templates will be read from. The generator * will use the resource stream to attempt to read the templates. */ - templateDir = "qt5cpp"; + embeddedTemplateDir = templateDir = "qt5cpp"; /** * Reserved words. Override this with reserved words specific to your language diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java index 4aac683b6ef..d4453fe4102 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -28,7 +28,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "generated-code" + File.separator + "ruby"; modelTemplateFiles.put("model.mustache", ".rb"); apiTemplateFiles.put("api.mustache", ".rb"); - templateDir = "ruby"; + embeddedTemplateDir = templateDir = "ruby"; typeMapping.clear(); languageSpecificPrimitives.clear(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java index 003be5ab950..3da348ad530 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java @@ -42,7 +42,7 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig outputFolder = "generated-code/scala"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "scala"; + embeddedTemplateDir = templateDir = "scala"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java index 9bab6a6cad0..81106955d84 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java @@ -29,7 +29,7 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf outputFolder = "generated-code/scalatra"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "scalatra"; + embeddedTemplateDir = templateDir = "scalatra"; apiPackage = "com.wordnik.client.api"; modelPackage = "com.wordnik.client.model"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java index e25aae15976..2e35f412bbf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java @@ -35,7 +35,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig modelTemplateFiles.clear(); apiTemplateFiles.clear(); - templateDir = "silex"; + embeddedTemplateDir = templateDir = "silex"; reservedWords = new HashSet( Arrays.asList( diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java index c9d8e550b5d..9bcece87429 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java @@ -29,7 +29,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi // no model modelTemplateFiles.clear(); apiTemplateFiles.put("api.mustache", ".rb"); - templateDir = "sinatra"; + embeddedTemplateDir = templateDir = "sinatra"; typeMapping.clear(); languageSpecificPrimitives.clear(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java index 30d10073268..48b70f834c7 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -23,7 +23,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen outputFolder = "generated-code/javaSpringMVC"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "JavaSpringMVC"; + embeddedTemplateDir = templateDir = "JavaSpringMVC"; apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; configPackage = "io.swagger.configuration"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java index c0ccf2a0a6f..b27ba23a4cd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java @@ -20,7 +20,7 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "docs"; modelTemplateFiles.put("model.mustache", ".html"); apiTemplateFiles.put("operation.mustache", ".html"); - templateDir = "swagger-static"; + embeddedTemplateDir = templateDir = "swagger-static"; additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); additionalProperties.put(CodegenConstants.GROUP_ID, groupId); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java index 29cb5d55eaa..a86c2244995 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java @@ -28,7 +28,7 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig public StaticHtmlGenerator() { super(); outputFolder = "docs"; - templateDir = "htmlDocs"; + embeddedTemplateDir = templateDir = "htmlDocs"; defaultIncludes = new HashSet(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java index 94f6279f46f..3241dde7b92 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java @@ -13,7 +13,7 @@ import java.io.File; public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { public SwaggerGenerator() { super(); - templateDir = "swagger"; + embeddedTemplateDir = templateDir = "swagger"; outputFolder = "generated-code/swagger"; supportingFiles.add(new SupportingFile("README.md", "", "README.md")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java index 35874390e0f..8ee1440b17e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java @@ -13,7 +13,7 @@ import java.io.File; public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig { public SwaggerYamlGenerator() { super(); - templateDir = "swagger"; + embeddedTemplateDir = templateDir = "swagger"; outputFolder = "generated-code/swagger"; supportingFiles.add(new SupportingFile("README.md", "", "README.md")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java index 55c3864adb7..b98d75f49e3 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java @@ -46,7 +46,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { outputFolder = "generated-code" + File.separator + "swift"; modelTemplateFiles.put("model.mustache", ".swift"); apiTemplateFiles.put("api.mustache", ".swift"); - templateDir = "swift"; + embeddedTemplateDir = templateDir = "swift"; apiPackage = File.separator + "APIs"; modelPackage = File.separator + "Models"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java index 7dc0b8ec3bd..8efb5276cff 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java @@ -40,7 +40,7 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig modelTemplateFiles.put("model-body.mustache", ".cpp"); apiTemplateFiles.put("api-header.mustache", ".h"); apiTemplateFiles.put("api-body.mustache", ".cpp"); - templateDir = "tizen"; + embeddedTemplateDir = templateDir = "tizen"; modelPackage = ""; defaultIncludes = new HashSet( diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java index 8eec2b8772e..65fdbb6f312 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java @@ -20,7 +20,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode outputFolder = "generated-code/typescript-angular"; modelTemplateFiles.put("model.mustache", ".ts"); apiTemplateFiles.put("api.mustache", ".ts"); - templateDir = "TypeScript-Angular"; + embeddedTemplateDir = templateDir = "TypeScript-Angular"; apiPackage = "API.Client"; modelPackage = "API.Client"; supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java index b92598b1fb6..b4de0f7ed0c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java @@ -17,7 +17,7 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen public TypeScriptNodeClientCodegen() { super(); outputFolder = "generated-code/typescript-node"; - templateDir = "TypeScript-node"; + embeddedTemplateDir = templateDir = "TypeScript-node"; supportingFiles.add(new SupportingFile("api.mustache", null, "api.ts")); } From f44eb766b4c1dd9f004d6280dc65bb13903cdcdf Mon Sep 17 00:00:00 2001 From: Richard Hunt Date: Thu, 22 Oct 2015 15:54:28 +1300 Subject: [PATCH 002/142] Replace File.separator with '/' to fix Windows path generation and avoid regular expression issues --- .../main/java/io/swagger/codegen/DefaultCodegen.java | 6 +++--- .../swagger/codegen/languages/JavaClientCodegen.java | 8 ++++---- .../swagger/codegen/languages/JaxRSServerCodegen.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index bdd6968eee8..2a6eda0adee 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -192,11 +192,11 @@ public class DefaultCodegen { } public String apiFileFolder() { - return outputFolder + "/" + apiPackage().replace('.', File.separatorChar); + return outputFolder + "/" + apiPackage().replace('.', '/'); } public String modelFileFolder() { - return outputFolder + "/" + modelPackage().replace('.', File.separatorChar); + return outputFolder + "/" + modelPackage().replace('.', '/'); } public Map additionalProperties() { @@ -1609,7 +1609,7 @@ public class DefaultCodegen { public String apiFilename(String templateName, String tag) { String suffix = apiTemplateFiles().get(templateName); - return apiFileFolder() + File.separator + toApiFilename(tag) + suffix; + return apiFileFolder() + '/' + toApiFilename(tag) + suffix; } public boolean shouldOverwrite(String filename) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index d265e5a7232..9c70cc74cb6 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -188,7 +188,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { this.sanitizeConfig(); - final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator); + final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle")); supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); @@ -196,7 +196,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java")); supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java")); - final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator); + final String authFolder = (sourceFolder + '/' + invokerPackage + ".auth").replace(".", "/"); supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java")); supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java")); supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java")); @@ -251,12 +251,12 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/'); } @Override public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/'); } @Override diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java index 883b08d8dfa..17a35c66532 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java @@ -74,13 +74,13 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("ApiException.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java")); + (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiException.java")); supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java")); + (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiOriginFilter.java")); supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java")); + (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiResponseMessage.java")); supportingFiles.add(new SupportingFile("NotFoundException.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java")); + (sourceFolder + '/' + apiPackage).replace(".", "/"), "NotFoundException.java")); supportingFiles.add(new SupportingFile("web.mustache", ("src/main/webapp/WEB-INF"), "web.xml")); @@ -195,7 +195,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf } private String implFileFolder(String output) { - return outputFolder + "/" + output + "/" + apiPackage().replace('.', File.separatorChar); + return outputFolder + "/" + output + "/" + apiPackage().replace('.', '/'); } public boolean shouldOverwrite(String filename) { From c298b7d152f147f2230300787c08c33b247007e9 Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Fri, 16 Oct 2015 16:40:01 +0300 Subject: [PATCH 003/142] ReturnType processing has been fixed --- .../java/io/swagger/codegen/CodegenOperation.java | 3 ++- .../main/java/io/swagger/codegen/DefaultCodegen.java | 1 + .../src/main/resources/htmlDocs/index.mustache | 12 +++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java index 871b3f261c0..7183c4d3456 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java @@ -12,7 +12,8 @@ public class CodegenOperation { public final List responseHeaders = new ArrayList(); public Boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer, isListContainer, - hasMore = Boolean.TRUE, isMultipart, isResponseBinary = Boolean.FALSE; + hasMore = Boolean.TRUE, isMultipart, isResponseBinary = Boolean.FALSE, + hasReference = Boolean.FALSE; public String path, operationId, returnType, httpMethod, returnBaseType, returnContainer, summary, notes, baseName, defaultResponse; public List> consumes, produces; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index bdd6968eee8..77e7ee85bec 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1017,6 +1017,7 @@ public class DefaultCodegen { op.examples = new ExampleGenerator(definitions).generate(methodResponse.getExamples(), operation.getProduces(), responseProperty); op.defaultResponse = toDefaultValue(responseProperty); op.returnType = cm.datatype; + op.hasReference = definitions != null && definitions.containsKey(op.returnBaseType); if (cm.isContainer != null) { op.returnContainer = cm.containerType; if ("map".equals(cm.containerType)) { diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache index 9473309ff83..83cd24e72d0 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache @@ -94,17 +94,15 @@ {{/hasFormParams}} - + {{#hasExamples}} {{#examples}} From f1e380927907303d69d15c2a6dc1d1210d6157f6 Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 22 Oct 2015 13:08:31 +0800 Subject: [PATCH 004/142] Fix partial template reading --- .../src/main/java/io/swagger/codegen/DefaultGenerator.java | 6 +++--- 1 file changed, 3 insertions(+), 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 6fc8eecd045..5df85e1b88c 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 @@ -163,7 +163,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { .withLoader(new Mustache.TemplateLoader() { @Override public Reader getTemplate(String name) { - return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); + return getTemplateReader(getFullTemplateFile(config, name + ".mustache")); } }) .defaultValue("") @@ -220,7 +220,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { .withLoader(new Mustache.TemplateLoader() { @Override public Reader getTemplate(String name) { - return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); + return getTemplateReader(getFullTemplateFile(config, name + ".mustache")); } }) .defaultValue("") @@ -299,7 +299,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { .withLoader(new Mustache.TemplateLoader() { @Override public Reader getTemplate(String name) { - return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); + return getTemplateReader(getFullTemplateFile(config, name + ".mustache")); } }) .defaultValue("") From 9e791c229b9b392a6e83c863469ec0dbe8ad3e4c Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Mon, 26 Oct 2015 14:46:45 +0300 Subject: [PATCH 005/142] processOptions tests have been added for Java and JaxRS --- .../codegen/languages/JavaClientCodegen.java | 12 ++- .../swagger/codegen/AbstractOptionsTest.java | 57 +++++++++++++ .../codegen/java/JavaClientOptionsTest.java | 84 +++++++++++++++++++ .../codegen/jaxrs/JaxRSServerOptionsTest.java | 49 +++++++++++ .../swagger/generator/online/Generator.java | 4 +- 5 files changed, 199 insertions(+), 7 deletions(-) create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 658b0ca9602..e236b7ac400 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory; public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class); + public static final String FULL_JAVA_UTIL = "fullJavaUtil"; protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; @@ -84,7 +85,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC)); cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC)); cliOptions.add(new CliOption(CodegenConstants.SERIALIZABLE_MODEL, CodegenConstants.SERIALIZABLE_MODEL_DESC)); - cliOptions.add(new CliOption("fullJavaUtil", "whether to use fully qualified name for classes under java.util (default to false)")); + cliOptions.add(new CliOption(FULL_JAVA_UTIL, "whether to use fully qualified name for classes under java.util (default to false)")); supportedLibraries.put("", "HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2"); supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6"); @@ -160,13 +161,13 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { // need to put back serializableModel (boolean) into additionalProperties as value in additionalProperties is string additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel); - if (additionalProperties.containsKey("fullJavaUtil")) { - fullJavaUtil = Boolean.valueOf(additionalProperties.get("fullJavaUtil").toString()); + if (additionalProperties.containsKey(FULL_JAVA_UTIL)) { + this.setFullJavaUtil(Boolean.valueOf(additionalProperties.get(FULL_JAVA_UTIL).toString())); } if (fullJavaUtil) { javaUtilPrefix = "java.util."; } - additionalProperties.put("fullJavaUtil", fullJavaUtil); + additionalProperties.put(FULL_JAVA_UTIL, fullJavaUtil); additionalProperties.put("javaUtilPrefix", javaUtilPrefix); if (fullJavaUtil) { @@ -582,4 +583,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { return packageName; } + public void setFullJavaUtil(boolean fullJavaUtil) { + this.fullJavaUtil = fullJavaUtil; + } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java new file mode 100644 index 00000000000..8aa497417e9 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java @@ -0,0 +1,57 @@ +package io.swagger.codegen; + +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import mockit.FullVerifications; +import org.apache.commons.lang3.StringUtils; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public abstract class AbstractOptionsTest { + + @Test + public void checkOptionsProcessing() { + getCodegenConfig().additionalProperties().putAll(getAvaliableOptions()); + setExpectations(); + + getCodegenConfig().processOpts(); + + new FullVerifications() {{ + }}; + } + + @Test(description = "check if all options described in documentation are presented in test case") + public void checkOptionsHelp() { + final List cliOptions = Lists.transform(getCodegenConfig().cliOptions(), getCliOptionTransformer()); + final Set testOptions = getAvaliableOptions().keySet(); + final Set skipped = new HashSet(cliOptions); + skipped.removeAll(testOptions); + if (!skipped.isEmpty()) { + Assert.fail(String.format("These options weren't checked: %s.", StringUtils.join(skipped, ", "))); + } + final Set undocumented = new HashSet(testOptions); + undocumented.removeAll(cliOptions); + if (!undocumented.isEmpty()) { + Assert.fail(String.format("These options weren't documented: %s.", StringUtils.join(undocumented, ", "))); + } + } + + private Function getCliOptionTransformer() { + return new Function() { + public String apply(CliOption option) { + return option.getOpt(); + } + }; + } + + protected abstract CodegenConfig getCodegenConfig(); + + protected abstract void setExpectations(); + + protected abstract Map getAvaliableOptions(); +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java new file mode 100644 index 00000000000..9cdac7d394b --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java @@ -0,0 +1,84 @@ +package io.swagger.codegen.java; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.JavaClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class JavaClientOptionsTest extends AbstractOptionsTest { + + protected static final String ARTIFACT_ID_VALUE = "swagger-java-client-test"; + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; + protected static final String SORT_PARAMS_VALUE = "false"; + protected static final String GROUP_ID_VALUE = "io.swagger.test"; + protected static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; + protected static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; + protected static final String LOCAL_PREFIX_VALUE = "tst"; + protected static final String LIBRARY_VALUE = "jersey2"; + protected static final String SERIALIZABLE_MODEL_VALUE = "false"; + protected static final String FULL_JAVA_UTIL_VALUE = "true"; + + @Tested + private JavaClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setGroupId(GROUP_ID_VALUE); + times = 1; + clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + times = 1; + clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + times = 1; + clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + times = 1; + clientCodegen.setLibrary(LIBRARY_VALUE); + times = 1; + clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) + .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE) + .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE) + .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) + .put(CodegenConstants.LIBRARY, LIBRARY_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java new file mode 100644 index 00000000000..00f09ad036b --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java @@ -0,0 +1,49 @@ +package io.swagger.codegen.jaxrs; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.java.JavaClientOptionsTest; +import io.swagger.codegen.languages.JaxRSServerCodegen; + +import mockit.Expectations; +import mockit.Tested; + +public class JaxRSServerOptionsTest extends JavaClientOptionsTest { + + @Tested + private JaxRSServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setGroupId(GROUP_ID_VALUE); + times = 1; + clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + times = 1; + clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + times = 1; + clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + times = 1; + clientCodegen.setLibrary(LIBRARY_VALUE); + times = 1; + clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + times = 1; + }}; + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index 6e17c38218e..18e883effbf 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -86,9 +86,7 @@ public class Generator { } if (opts.getOptions() != null) { - for (Map.Entry entry : opts.getOptions().entrySet()) { - codegenConfig.additionalProperties().put(entry.getKey(), entry.getValue()); - } + codegenConfig.additionalProperties().putAll(opts.getOptions()); } codegenConfig.setOutputDir(outputFolder); From 5cdee3f424898ea6cfd770ef1b3d6f6d709c6e03 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 27 Oct 2015 17:33:57 -0400 Subject: [PATCH 006/142] Path is a commonly used variable name --- .../src/main/resources/csharp/api.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache index 89594091dfb..6708fa1e16d 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache @@ -102,7 +102,7 @@ namespace {{packageName}}.Api if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}"); {{/required}}{{/allParams}} - var path = "{{path}}"; + var path_ = "{{path}}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -137,7 +137,7 @@ namespace {{packageName}}.Api String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content); @@ -158,7 +158,7 @@ namespace {{packageName}}.Api if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}"); {{/required}}{{/allParams}} - var path = "{{path}}"; + var path_ = "{{path}}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -193,7 +193,7 @@ namespace {{packageName}}.Api String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content); From d907822fa9f34be6097ca058b641356ca942c58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= Date: Tue, 27 Oct 2015 22:56:19 +0100 Subject: [PATCH 007/142] Use CURLFile object on PHP5.5+. --- .../src/main/resources/php/api.mustache | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache index db1d4c8cb4f..78eaeb7cc6b 100644 --- a/modules/swagger-codegen/src/main/resources/php/api.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api.mustache @@ -140,7 +140,18 @@ use \{{invokerPackage}}\ObjectSerializer; }{{/pathParams}} {{#formParams}}// form params if (${{paramName}} !== null) { - $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->getSerializer()->toFormValue(${{paramName}}); + {{#isFile}} + // PHP 5.5 introduced a CurlFile object that deprecates the old @filename syntax + // See: https://wiki.php.net/rfc/curl-file-upload + if (function_exists('curl_file_create')) { + $formParams['{{baseName}}'] = curl_file_create($this->apiClient->getSerializer()->toFormValue(${{paramName}})); + } else { + $formParams['{{baseName}}'] = '@' . $this->apiClient->getSerializer()->toFormValue(${{paramName}}); + } + {{/isFile}} + {{^isFile}} + $formParams['{{baseName}}'] = $this->apiClient->getSerializer()->toFormValue(${{paramName}}); + {{/isFile}} }{{/formParams}} {{#bodyParams}}// body params $_tempBody = null; From 47b2ae934bc49b687848a3767814dffab6e001fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= Date: Tue, 27 Oct 2015 22:58:25 +0100 Subject: [PATCH 008/142] Regenerated PHP petstore sample. --- .../php/SwaggerClient-php/lib/Api/PetApi.php | 23 +++- .../php/SwaggerClient-php/lib/ApiClient.php | 89 ++++++------ .../SwaggerClient-php/lib/ApiException.php | 26 ++-- .../SwaggerClient-php/lib/Configuration.php | 128 +++++++++++------- .../lib/ObjectSerializer.php | 2 +- 5 files changed, 163 insertions(+), 105 deletions(-) diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php index cb0df4e8af0..bcd91f4ffb8 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php @@ -431,9 +431,6 @@ class PetApi - - //TODO support oauth - // make the API Call try { @@ -509,10 +506,16 @@ class PetApi } // form params if ($name !== null) { + + $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name); + }// form params if ($status !== null) { + + $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status); + } @@ -665,10 +668,22 @@ class PetApi } // form params if ($additional_metadata !== null) { + + $formParams['additionalMetadata'] = $this->apiClient->getSerializer()->toFormValue($additional_metadata); + }// form params if ($file !== null) { - $formParams['file'] = '@' . $this->apiClient->getSerializer()->toFormValue($file); + + // PHP 5.5 introduced a CurlFile object that deprecates the old @filename syntax + // See: https://wiki.php.net/rfc/curl-file-upload + if (function_exists('curl_file_create')) { + $formParams['file'] = curl_file_create($this->apiClient->getSerializer()->toFormValue($file)); + } else { + $formParams['file'] = '@' . $this->apiClient->getSerializer()->toFormValue($file); + } + + } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php index 20150b7160b..982b8955a15 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php @@ -1,11 +1,11 @@ config = $config; $this->serializer = new ObjectSerializer(); } - + /** * Get the config * @return Configuration @@ -87,7 +87,7 @@ class ApiClient { return $this->config; } - + /** * Get the serializer * @return ObjectSerializer @@ -96,7 +96,7 @@ class ApiClient { return $this->serializer; } - + /** * Get API key (with prefix if set) * @param string $apiKeyIdentifier name of apikey @@ -106,20 +106,20 @@ class ApiClient { $prefix = $this->config->getApiKeyPrefix($apiKeyIdentifier); $apiKey = $this->config->getApiKey($apiKeyIdentifier); - + if (!isset($apiKey)) { return null; } - + if (isset($prefix)) { $keyWithPrefix = $prefix." ".$apiKey; } else { $keyWithPrefix = $apiKey; } - + return $keyWithPrefix; } - + /** * Make the HTTP call (Sync) * @param string $resourcePath path to method endpoint @@ -133,28 +133,28 @@ class ApiClient */ public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams, $responseType=null) { - + $headers = array(); - + // construct the http header $headerParams = array_merge( - (array)$this->config->getDefaultHeaders(), + (array)$this->config->getDefaultHeaders(), (array)$headerParams ); - + foreach ($headerParams as $key => $val) { $headers[] = "$key: $val"; } - + // form data if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) { $postData = http_build_query($postData); } else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model $postData = json_encode($this->serializer->sanitizeForSerialization($postData)); } - + $url = $this->config->getHost() . $resourcePath; - + $curl = curl_init(); // set timeout, if needed if ($this->config->getCurlTimeout() != 0) { @@ -162,13 +162,19 @@ class ApiClient } // return the result on success, rather than just TRUE curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - + curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); - + + // disable SSL verification, if needed + if ($this->config->getSSLVerification() == false) { + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); + } + if (! empty($queryParams)) { $url = ($url . '?' . http_build_query($queryParams)); } - + if ($method == self::$POST) { curl_setopt($curl, CURLOPT_POST, true); curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); @@ -190,57 +196,62 @@ class ApiClient throw new ApiException('Method ' . $method . ' is not recognized.'); } curl_setopt($curl, CURLOPT_URL, $url); - + // Set user agent curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent()); - + // debugging for curl if ($this->config->getDebug()) { error_log("[DEBUG] HTTP Request body ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile()); - + curl_setopt($curl, CURLOPT_VERBOSE, 1); curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a')); } else { curl_setopt($curl, CURLOPT_VERBOSE, 0); } - + // obtain the HTTP response headers curl_setopt($curl, CURLOPT_HEADER, 1); - + // Make the request $response = curl_exec($curl); $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE); $http_header = substr($response, 0, $http_header_size); $http_body = substr($response, $http_header_size); $response_info = curl_getinfo($curl); - + // debug HTTP response body if ($this->config->getDebug()) { error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile()); } - + // Handle the response if ($response_info['http_code'] == 0) { throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null); } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) { - // return raw body if response is a file + // return raw body if response is a file if ($responseType == '\SplFileObject') { return array($http_body, $http_header); } - + $data = json_decode($http_body); if (json_last_error() > 0) { // if response is a string $data = $http_body; } } else { + $data = json_decode($http_body); + if (json_last_error() > 0) { // if response is a string + $data = $http_body; + } + throw new ApiException( "[".$response_info['http_code']."] Error connecting to the API ($url)", - $response_info['http_code'], $http_header, $http_body + $response_info['http_code'], $http_header, $data ); } return array($data, $http_header); } - + /** * Return the header 'Accept' based on an array of Accept provided * @@ -258,7 +269,7 @@ class ApiClient return implode(',', $accept); } } - + /** * Return the content type based on an array of content-type provided * diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php index ce6c19e245f..0b8f5892a35 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php @@ -46,30 +46,30 @@ use \Exception; class ApiException extends Exception { - /** - * The HTTP body of the server response. - * @var string + /** + * The HTTP body of the server response either as Json or string. + * @var mixed */ protected $responseBody; - + /** * The HTTP header of the server response. * @var string[] */ protected $responseHeaders; - + /** * The deserialized response object * @var $responseObject; */ protected $responseObject; - + /** * Constructor * @param string $message Error message - * @param string $code HTTP status code + * @param int $code HTTP status code * @param string $responseHeaders HTTP response header - * @param string $responseBody Deseralized response object + * @param mixed $responseBody HTTP body of the server response either as Json or string */ public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) { @@ -77,7 +77,7 @@ class ApiException extends Exception $this->responseHeaders = $responseHeaders; $this->responseBody = $responseBody; } - + /** * Gets the HTTP response header * @@ -87,17 +87,17 @@ class ApiException extends Exception { return $this->responseHeaders; } - + /** - * Gets the HTTP response body + * Gets the HTTP body of the server response either as Json or string * - * @return string HTTP response body + * @return mixed HTTP body of the server response either as Json or string */ public function getResponseBody() { return $this->responseBody; } - + /** * Sets the deseralized response object (during deserialization) * @param mixed $obj Deserialized response object diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php index fcea7100ae4..ad715e75994 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php @@ -27,8 +27,8 @@ */ /** - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ @@ -48,70 +48,70 @@ class Configuration { private static $_defaultConfiguration = null; - - /** + + /** * Associate array to store API key(s) * * @var string[] */ protected $apiKeys = array(); - + /** * Associate array to store API prefix (e.g. Bearer) * * @var string[] */ protected $apiKeyPrefixes = array(); - - /** + + /** * Username for HTTP basic authentication * * @var string */ protected $username = ''; - + /** * Password for HTTP basic authentication * * @var string */ protected $password = ''; - + /** * The default instance of ApiClient * * @var \Swagger\Client\ApiClient */ protected $defaultHeaders = array(); - + /** * The host * * @var string */ protected $host = 'http://petstore.swagger.io/v2'; - + /** * Timeout (second) of the HTTP request, by default set to 0, no timeout * - * @var string + * @var string */ protected $curlTimeout = 0; - + /** * User agent of the HTTP request, set to "PHP-Swagger" by default * * @var string */ protected $userAgent = "PHP-Swagger/1.0.0"; - + /** * Debug switch (default set to false) * * @var bool */ protected $debug = false; - + /** * Debug file location (log to STDOUT by default) * @@ -126,6 +126,15 @@ class Configuration */ protected $tempFolderPath; + /** + * Indicates if SSL verification should be enabled or disabled. + * + * This is useful if the host uses a self-signed SSL certificate. + * + * @var boolean True if the certificate should be validated, false otherwise. + */ + protected $sslVerification = true; + /** * Constructor */ @@ -133,7 +142,7 @@ class Configuration { $this->tempFolderPath = sys_get_temp_dir(); } - + /** * Sets API key * @@ -147,7 +156,7 @@ class Configuration $this->apiKeys[$apiKeyIdentifier] = $key; return $this; } - + /** * Gets API key * @@ -159,7 +168,7 @@ class Configuration { return isset($this->apiKeys[$apiKeyIdentifier]) ? $this->apiKeys[$apiKeyIdentifier] : null; } - + /** * Sets the prefix for API key (e.g. Bearer) * @@ -173,7 +182,7 @@ class Configuration $this->apiKeyPrefixes[$apiKeyIdentifier] = $prefix; return $this; } - + /** * Gets API key prefix * @@ -185,7 +194,7 @@ class Configuration { return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null; } - + /** * Sets the username for HTTP basic authentication * @@ -198,7 +207,7 @@ class Configuration $this->username = $username; return $this; } - + /** * Gets the username for HTTP basic authentication * @@ -208,7 +217,7 @@ class Configuration { return $this->username; } - + /** * Sets the password for HTTP basic authentication * @@ -221,7 +230,7 @@ class Configuration $this->password = $password; return $this; } - + /** * Gets the password for HTTP basic authentication * @@ -231,7 +240,7 @@ class Configuration { return $this->password; } - + /** * Adds a default header * @@ -245,11 +254,11 @@ class Configuration if (!is_string($headerName)) { throw new \InvalidArgumentException('Header name must be a string.'); } - + $this->defaultHeaders[$headerName] = $headerValue; return $this; } - + /** * Gets the default header * @@ -259,7 +268,7 @@ class Configuration { return $this->defaultHeaders; } - + /** * Deletes a default header * @@ -271,7 +280,7 @@ class Configuration { unset($this->defaultHeaders[$headerName]); } - + /** * Sets the host * @@ -284,7 +293,7 @@ class Configuration $this->host = $host; return $this; } - + /** * Gets the host * @@ -294,7 +303,7 @@ class Configuration { return $this->host; } - + /** * Sets the user agent of the api client * @@ -307,11 +316,11 @@ class Configuration if (!is_string($userAgent)) { throw new \InvalidArgumentException('User-agent must be a string.'); } - + $this->userAgent = $userAgent; return $this; } - + /** * Gets the user agent of the api client * @@ -321,7 +330,7 @@ class Configuration { return $this->userAgent; } - + /** * Sets the HTTP timeout value * @@ -334,11 +343,11 @@ class Configuration if (!is_numeric($seconds) || $seconds < 0) { throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.'); } - + $this->curlTimeout = $seconds; return $this; } - + /** * Gets the HTTP timeout value * @@ -348,10 +357,10 @@ class Configuration { return $this->curlTimeout; } - + /** * Sets debug flag - * + * * @param bool $debug Debug flag * * @return Configuration @@ -361,7 +370,7 @@ class Configuration $this->debug = $debug; return $this; } - + /** * Gets the debug flag * @@ -371,7 +380,7 @@ class Configuration { return $this->debug; } - + /** * Sets the debug file * @@ -384,7 +393,7 @@ class Configuration $this->debugFile = $debugFile; return $this; } - + /** * Gets the debug file * @@ -394,7 +403,7 @@ class Configuration { return $this->debugFile; } - + /** * Sets the temp folder path * @@ -407,7 +416,7 @@ class Configuration $this->tempFolderPath = $tempFolderPath; return $this; } - + /** * Gets the temp folder path * @@ -417,7 +426,30 @@ class Configuration { return $this->tempFolderPath; } - + + /** + * Sets if SSL verification should be enabled or disabled + * + * @param boolean $sslVerification True if the certificate should be validated, false otherwise + * + * @return Configuration + */ + public function setSSLVerification($sslVerification) + { + $this->sslVerification = $sslVerification; + return $this; + } + + /** + * Gets if SSL verification should be enabled or disabled + * + * @return boolean True if the certificate should be validated, false otherwise + */ + public function getSSLVerification() + { + return $this->sslVerification; + } + /** * Gets the default configuration instance * @@ -428,10 +460,10 @@ class Configuration if (self::$_defaultConfiguration == null) { self::$_defaultConfiguration = new Configuration(); } - + return self::$_defaultConfiguration; } - + /** * Sets the detault configuration instance * @@ -443,7 +475,7 @@ class Configuration { self::$_defaultConfiguration = $config; } - + /** * Gets the essential information for debugging * @@ -457,8 +489,8 @@ class Configuration $report .= " Swagger Spec Version: 1.0.0\n"; $report .= " SDK Package Version: 1.0.0\n"; $report .= " Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n"; - + return $report; } - + } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php index 0d281b9d1fa..efdc1c896ab 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php @@ -193,7 +193,7 @@ class ObjectSerializer $deserialized = $values; } elseif ($class === '\DateTime') { $deserialized = new \DateTime($data); - } elseif (in_array($class, array('integer', 'int', 'void', 'number', 'object', 'double', 'float', 'byte', 'DateTime', 'string', 'mixed', 'boolean', 'bool'))) { + } elseif (in_array($class, array('void', 'bool', 'string', 'double', 'byte', 'mixed', 'integer', 'float', 'int', 'DateTime', 'number', 'boolean', 'object'))) { settype($data, $class); $deserialized = $data; } elseif ($class === '\SplFileObject') { From 2595992df7112c13d5c2e98899d230fa546e197b Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 28 Oct 2015 15:26:16 +0800 Subject: [PATCH 009/142] Assign default value for model properties in Java-related client and server codegen. Closes #1448 --- .../codegen/languages/JavaClientCodegen.java | 32 +++++++++++++++++++ .../languages/JavaInflectorServerCodegen.java | 18 +++++++++++ .../codegen/languages/JaxRSServerCodegen.java | 20 ++++++++++++ .../languages/SpringMVCServerCodegen.java | 11 +++++++ 4 files changed, 81 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index e236b7ac400..45b3f99c16d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -12,9 +12,11 @@ import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; import io.swagger.models.Model; import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; import io.swagger.models.properties.LongProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; +import io.swagger.models.properties.StringProperty; import java.io.File; import java.util.ArrayList; @@ -353,6 +355,22 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { return dp.getDefault().toString()+"l"; } return "null"; + } else if (p instanceof BooleanProperty) { + BooleanProperty bp = (BooleanProperty) p; + if (bp.getDefault() != null) { + return bp.getDefault().toString(); + } + } else if (p instanceof StringProperty) { + StringProperty sp = (StringProperty) p; + if (sp.getDefault() != null) { + String _default = sp.getDefault(); + if (sp.getEnum() == null) { + return "\"" + escapeText(_default) + "\""; + } else { + // convert to enum var name later in postProcessModels + return _default; + } + } } return super.toDefaultValue(p); } @@ -445,6 +463,20 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { enumVars.add(enumVar); } allowableValues.put("enumVars", enumVars); + // handle default value for enum, e.g. available => StatusEnum.AVAILABLE + if (var.defaultValue != null && !"null".equals(var.defaultValue)) { + String enumName = null; + for (Map enumVar : enumVars) { + if (var.defaultValue.equals(enumVar.get("value"))) { + enumName = enumVar.get("name"); + break; + } + } + if (enumName == null) { + throw new RuntimeException("default value of property \"" + var.baseName + "\" is not in allowed values: " + var.defaultValue); + } + var.defaultValue = var.datatypeWithEnum + "." + enumName; + } } } return objs; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index d678515f4cb..b1d89ce3b69 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -2,7 +2,9 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenProperty; import io.swagger.codegen.CodegenType; import io.swagger.codegen.SupportingFile; import io.swagger.models.Operation; @@ -121,6 +123,22 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod co.baseName = basePath; } + @Override + public Map postProcessModels(Map objs) { + List models = (List) objs.get("models"); + for (Object _mo : models) { + Map mo = (Map) _mo; + CodegenModel cm = (CodegenModel) mo.get("model"); + for (CodegenProperty var : cm.vars) { + // handle default value for enum, e.g. available => StatusEnum.available + if (var.isEnum && var.defaultValue != null && !"null".equals(var.defaultValue)) { + var.defaultValue = var.datatypeWithEnum + "." + var.defaultValue; + } + } + } + return objs; + } + public Map postProcessOperations(Map objs) { Map operations = (Map) objs.get("operations"); if (operations != null) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java index 883b08d8dfa..3c2329321ad 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java @@ -2,11 +2,15 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenProperty; import io.swagger.codegen.CodegenResponse; import io.swagger.codegen.CodegenType; import io.swagger.codegen.SupportingFile; import io.swagger.models.Operation; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.StringProperty; import java.io.File; import java.util.ArrayList; @@ -114,6 +118,22 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf co.baseName = basePath; } + @Override + public Map postProcessModels(Map objs) { + List models = (List) objs.get("models"); + for (Object _mo : models) { + Map mo = (Map) _mo; + CodegenModel cm = (CodegenModel) mo.get("model"); + for (CodegenProperty var : cm.vars) { + // handle default value for enum, e.g. available => StatusEnum.available + if (var.isEnum && var.defaultValue != null && !"null".equals(var.defaultValue)) { + var.defaultValue = var.datatypeWithEnum + "." + var.defaultValue; + } + } + } + return objs; + } + public Map postProcessOperations(Map objs) { Map operations = (Map) objs.get("operations"); if (operations != null) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java index 30d10073268..82aa15b0d64 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -193,6 +193,17 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen String _import = iterator.next().get("import"); if (_import.endsWith(".Object")) iterator.remove(); } + List models = (List) objs.get("models"); + for (Object _mo : models) { + Map mo = (Map) _mo; + CodegenModel cm = (CodegenModel) mo.get("model"); + for (CodegenProperty var : cm.vars) { + // handle default value for enum, e.g. available => StatusEnum.available + if (var.isEnum && var.defaultValue != null && !"null".equals(var.defaultValue)) { + var.defaultValue = var.datatypeWithEnum + "." + var.defaultValue; + } + } + } return objs; } } From 55d69d80bcff94fbd3359638f13a0ff2127832e7 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 28 Oct 2015 15:33:56 +0800 Subject: [PATCH 010/142] update c# sample code --- .../src/main/csharp/IO/Swagger/Api/PetApi.cs | 80 +++++++++--------- .../main/csharp/IO/Swagger/Api/StoreApi.cs | 44 +++++----- .../src/main/csharp/IO/Swagger/Api/UserApi.cs | 72 ++++++++-------- .../csharp/IO/Swagger/Client/ApiClient.cs | 27 +++--- .../bin/Debug/SwaggerClientTest.dll | Bin 61952 -> 61952 bytes .../bin/Debug/SwaggerClientTest.dll.mdb | Bin 18987 -> 18999 bytes .../obj/Debug/SwaggerClientTest.dll | Bin 61952 -> 61952 bytes .../obj/Debug/SwaggerClientTest.dll.mdb | Bin 18987 -> 18999 bytes 8 files changed, 113 insertions(+), 110 deletions(-) diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs index 4e7e84fb725..00bd7a5e9f2 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs @@ -248,7 +248,7 @@ namespace IO.Swagger.Api { - var path = "/pet"; + var path_ = "/pet"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -279,7 +279,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content); @@ -298,7 +298,7 @@ namespace IO.Swagger.Api { - var path = "/pet"; + var path_ = "/pet"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -329,7 +329,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content); @@ -346,7 +346,7 @@ namespace IO.Swagger.Api { - var path = "/pet"; + var path_ = "/pet"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -377,7 +377,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content); @@ -396,7 +396,7 @@ namespace IO.Swagger.Api { - var path = "/pet"; + var path_ = "/pet"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -427,7 +427,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content); @@ -444,7 +444,7 @@ namespace IO.Swagger.Api { - var path = "/pet/findByStatus"; + var path_ = "/pet/findByStatus"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -475,14 +475,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage); - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); + return (List) ApiClient.Deserialize(response, typeof(List)); } /// @@ -494,7 +494,7 @@ namespace IO.Swagger.Api { - var path = "/pet/findByStatus"; + var path_ = "/pet/findByStatus"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -525,11 +525,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content); - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); + return (List) ApiClient.Deserialize(response, typeof(List)); } /// @@ -541,7 +541,7 @@ namespace IO.Swagger.Api { - var path = "/pet/findByTags"; + var path_ = "/pet/findByTags"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -572,14 +572,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage); - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); + return (List) ApiClient.Deserialize(response, typeof(List)); } /// @@ -591,7 +591,7 @@ namespace IO.Swagger.Api { - var path = "/pet/findByTags"; + var path_ = "/pet/findByTags"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -622,11 +622,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content); - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); + return (List) ApiClient.Deserialize(response, typeof(List)); } /// @@ -641,7 +641,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById"); - var path = "/pet/{petId}"; + var path_ = "/pet/{petId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -669,17 +669,17 @@ namespace IO.Swagger.Api // authentication setting, if any - String[] authSettings = new String[] { "api_key", "petstore_auth" }; + String[] authSettings = new String[] { "api_key" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage); - return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers); + return (Pet) ApiClient.Deserialize(response, typeof(Pet)); } /// @@ -693,7 +693,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById"); - var path = "/pet/{petId}"; + var path_ = "/pet/{petId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -721,14 +721,14 @@ namespace IO.Swagger.Api // authentication setting, if any - String[] authSettings = new String[] { "api_key", "petstore_auth" }; + String[] authSettings = new String[] { "api_key" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content); - return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers); + return (Pet) ApiClient.Deserialize(response, typeof(Pet)); } /// @@ -745,7 +745,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm"); - var path = "/pet/{petId}"; + var path_ = "/pet/{petId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -778,7 +778,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content); @@ -801,7 +801,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm"); - var path = "/pet/{petId}"; + var path_ = "/pet/{petId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -834,7 +834,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content); @@ -855,7 +855,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet"); - var path = "/pet/{petId}"; + var path_ = "/pet/{petId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -887,7 +887,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content); @@ -909,7 +909,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet"); - var path = "/pet/{petId}"; + var path_ = "/pet/{petId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -941,7 +941,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content); @@ -963,7 +963,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile"); - var path = "/pet/{petId}/uploadImage"; + var path_ = "/pet/{petId}/uploadImage"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -996,7 +996,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content); @@ -1019,7 +1019,7 @@ namespace IO.Swagger.Api if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile"); - var path = "/pet/{petId}/uploadImage"; + var path_ = "/pet/{petId}/uploadImage"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -1052,7 +1052,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "petstore_auth" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content); diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs index f96b773c76f..b0a439ddf1a 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs @@ -155,7 +155,7 @@ namespace IO.Swagger.Api { - var path = "/store/inventory"; + var path_ = "/store/inventory"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -185,14 +185,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "api_key" }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage); - return (Dictionary) ApiClient.Deserialize(response.Content, typeof(Dictionary), response.Headers); + return (Dictionary) ApiClient.Deserialize(response, typeof(Dictionary)); } /// @@ -203,7 +203,7 @@ namespace IO.Swagger.Api { - var path = "/store/inventory"; + var path_ = "/store/inventory"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -233,11 +233,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { "api_key" }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content); - return (Dictionary) ApiClient.Deserialize(response.Content, typeof(Dictionary), response.Headers); + return (Dictionary) ApiClient.Deserialize(response, typeof(Dictionary)); } /// @@ -249,7 +249,7 @@ namespace IO.Swagger.Api { - var path = "/store/order"; + var path_ = "/store/order"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -280,14 +280,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage); - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); + return (Order) ApiClient.Deserialize(response, typeof(Order)); } /// @@ -299,7 +299,7 @@ namespace IO.Swagger.Api { - var path = "/store/order"; + var path_ = "/store/order"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -330,11 +330,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content); - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); + return (Order) ApiClient.Deserialize(response, typeof(Order)); } /// @@ -349,7 +349,7 @@ namespace IO.Swagger.Api if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById"); - var path = "/store/order/{orderId}"; + var path_ = "/store/order/{orderId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -380,14 +380,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage); - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); + return (Order) ApiClient.Deserialize(response, typeof(Order)); } /// @@ -401,7 +401,7 @@ namespace IO.Swagger.Api if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById"); - var path = "/store/order/{orderId}"; + var path_ = "/store/order/{orderId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -432,11 +432,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content); - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); + return (Order) ApiClient.Deserialize(response, typeof(Order)); } /// @@ -451,7 +451,7 @@ namespace IO.Swagger.Api if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder"); - var path = "/store/order/{orderId}"; + var path_ = "/store/order/{orderId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -482,7 +482,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content); @@ -503,7 +503,7 @@ namespace IO.Swagger.Api if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder"); - var path = "/store/order/{orderId}"; + var path_ = "/store/order/{orderId}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -534,7 +534,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content); diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs index f7c68cfbe35..b4c8d93c28c 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs @@ -240,7 +240,7 @@ namespace IO.Swagger.Api { - var path = "/user"; + var path_ = "/user"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -271,7 +271,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content); @@ -290,7 +290,7 @@ namespace IO.Swagger.Api { - var path = "/user"; + var path_ = "/user"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -321,7 +321,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content); @@ -338,7 +338,7 @@ namespace IO.Swagger.Api { - var path = "/user/createWithArray"; + var path_ = "/user/createWithArray"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -369,7 +369,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content); @@ -388,7 +388,7 @@ namespace IO.Swagger.Api { - var path = "/user/createWithArray"; + var path_ = "/user/createWithArray"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -419,7 +419,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content); @@ -436,7 +436,7 @@ namespace IO.Swagger.Api { - var path = "/user/createWithList"; + var path_ = "/user/createWithList"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -467,7 +467,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content); @@ -486,7 +486,7 @@ namespace IO.Swagger.Api { - var path = "/user/createWithList"; + var path_ = "/user/createWithList"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -517,7 +517,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content); @@ -535,7 +535,7 @@ namespace IO.Swagger.Api { - var path = "/user/login"; + var path_ = "/user/login"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -567,14 +567,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage); - return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers); + return (string) ApiClient.Deserialize(response, typeof(string)); } /// @@ -587,7 +587,7 @@ namespace IO.Swagger.Api { - var path = "/user/login"; + var path_ = "/user/login"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -619,11 +619,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content); - return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers); + return (string) ApiClient.Deserialize(response, typeof(string)); } /// @@ -634,7 +634,7 @@ namespace IO.Swagger.Api { - var path = "/user/logout"; + var path_ = "/user/logout"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -664,7 +664,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content); @@ -682,7 +682,7 @@ namespace IO.Swagger.Api { - var path = "/user/logout"; + var path_ = "/user/logout"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -712,7 +712,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content); @@ -732,7 +732,7 @@ namespace IO.Swagger.Api if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName"); - var path = "/user/{username}"; + var path_ = "/user/{username}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -763,14 +763,14 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content); else if (((int)response.StatusCode) == 0) throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage); - return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers); + return (User) ApiClient.Deserialize(response, typeof(User)); } /// @@ -784,7 +784,7 @@ namespace IO.Swagger.Api if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName"); - var path = "/user/{username}"; + var path_ = "/user/{username}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -815,11 +815,11 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content); - return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers); + return (User) ApiClient.Deserialize(response, typeof(User)); } /// @@ -835,7 +835,7 @@ namespace IO.Swagger.Api if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser"); - var path = "/user/{username}"; + var path_ = "/user/{username}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -867,7 +867,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content); @@ -889,7 +889,7 @@ namespace IO.Swagger.Api if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser"); - var path = "/user/{username}"; + var path_ = "/user/{username}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -921,7 +921,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content); @@ -941,7 +941,7 @@ namespace IO.Swagger.Api if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser"); - var path = "/user/{username}"; + var path_ = "/user/{username}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -972,7 +972,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) ApiClient.CallApi(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content); @@ -993,7 +993,7 @@ namespace IO.Swagger.Api if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser"); - var path = "/user/{username}"; + var path_ = "/user/{username}"; var pathParams = new Dictionary(); var queryParams = new Dictionary(); @@ -1024,7 +1024,7 @@ namespace IO.Swagger.Api String[] authSettings = new String[] { }; // make the HTTP request - IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); + IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings); if (((int)response.StatusCode) >= 400) throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content); diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs index 74b898be626..0416f985360 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs @@ -214,12 +214,14 @@ namespace IO.Swagger.Client /// /// Deserialize the JSON string into a proper object. /// - /// HTTP body (e.g. string, JSON). + /// The HTTP response. /// Object type. - /// /// Object representation of the JSON string. - public object Deserialize(string content, Type type, IList headers=null) + public object Deserialize(IRestResponse response, Type type) { + byte[] data = response.RawBytes; + string content = response.Content; + IList headers = response.Headers; if (type == typeof(Object)) // return an object { return content; @@ -227,21 +229,22 @@ namespace IO.Swagger.Client if (type == typeof(Stream)) { - var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath) - ? Path.GetTempPath() - : Configuration.TempFolderPath; - - var fileName = filePath + Guid.NewGuid(); if (headers != null) { + var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath) + ? Path.GetTempPath() + : Configuration.TempFolderPath; var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$"); var match = regex.Match(headers.ToString()); if (match.Success) - fileName = filePath + match.Value.Replace("\"", "").Replace("'", ""); + { + string fileName = filePath + match.Value.Replace("\"", "").Replace("'", ""); + File.WriteAllBytes(fileName, data); + return new FileStream(fileName, FileMode.Open); + } } - File.WriteAllText(fileName, content); - return new FileStream(fileName, FileMode.Open); - + var stream = new MemoryStream(data); + return stream; } if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll index 74b5b6455e3f793db9f44be0d3daedbfed1a907d..3541160c3b9ace66ad275322526c3a6d0c45eb8a 100755 GIT binary patch delta 17184 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 delta 17408 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 ZyZb_Y)cyHCOj4vE>ig4|Vtt7 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 F{y+8>VkH0o literal 18987 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 diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll index 74b5b6455e3f793db9f44be0d3daedbfed1a907d..3541160c3b9ace66ad275322526c3a6d0c45eb8a 100755 GIT binary patch delta 17184 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 delta 17408 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 ZyZb_Y)cyHCOj4vE>ig4|Vtt7 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 F{y+8>VkH0o literal 18987 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 From ef29f70508f19e4623b3919a0bf3a2d3120f5b22 Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 28 Oct 2015 16:37:31 +0800 Subject: [PATCH 011/142] Handle default value for Integer, Double and Float properties --- .../codegen/languages/JavaClientCodegen.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 45b3f99c16d..43b60788bf9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -13,6 +13,9 @@ import io.swagger.codegen.SupportingFile; import io.swagger.models.Model; import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DoubleProperty; +import io.swagger.models.properties.FloatProperty; +import io.swagger.models.properties.IntegerProperty; import io.swagger.models.properties.LongProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; @@ -349,17 +352,36 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { pattern = "new HashMap()"; } return String.format(pattern, getTypeDeclaration(ap.getAdditionalProperties())); + } else if (p instanceof IntegerProperty) { + IntegerProperty dp = (IntegerProperty) p; + if (dp.getDefault() != null) { + return dp.getDefault().toString(); + } + return "null"; } else if (p instanceof LongProperty) { LongProperty dp = (LongProperty) p; if (dp.getDefault() != null) { return dp.getDefault().toString()+"l"; } return "null"; + } else if (p instanceof DoubleProperty) { + DoubleProperty dp = (DoubleProperty) p; + if (dp.getDefault() != null) { + return dp.getDefault().toString() + "d"; + } + return "null"; + } else if (p instanceof FloatProperty) { + FloatProperty dp = (FloatProperty) p; + if (dp.getDefault() != null) { + return dp.getDefault().toString() + "f"; + } + return "null"; } else if (p instanceof BooleanProperty) { BooleanProperty bp = (BooleanProperty) p; if (bp.getDefault() != null) { return bp.getDefault().toString(); } + return "null"; } else if (p instanceof StringProperty) { StringProperty sp = (StringProperty) p; if (sp.getDefault() != null) { @@ -371,6 +393,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { return _default; } } + return "null"; } return super.toDefaultValue(p); } From 6008664ff8370dfc864367a83039b480542db381 Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Tue, 27 Oct 2015 16:38:18 +0300 Subject: [PATCH 012/142] processOptions tests have been added for Android, Ruby, nodeJS, php, python, csharp, CsharpDotNet2, dart, flash --- .../io/swagger/codegen/CodegenConstants.java | 2 + .../io/swagger/codegen/DefaultCodegen.java | 3 +- .../languages/AndroidClientCodegen.java | 12 +-- .../languages/CSharpClientCodegen.java | 24 ++++-- .../languages/CsharpDotNet2ClientCodegen.java | 34 ++++++--- .../codegen/languages/DartClientCodegen.java | 44 ++++++----- .../codegen/languages/FlashClientCodegen.java | 58 ++++++++------ .../codegen/languages/JavaClientCodegen.java | 2 +- .../codegen/languages/PhpClientCodegen.java | 57 +++++++------- .../languages/PythonClientCodegen.java | 18 +++-- .../codegen/languages/RubyClientCodegen.java | 27 ++++--- .../android/AndroidClientOptionsTest.java | 71 ++++++++++++++++++ .../csharp/CSharpClientOptionsTest.java | 43 +++++++++++ .../CsharpDotNet2ClientOptionsTest.java | 47 ++++++++++++ .../codegen/dart/DartClientOptionsTest.java | 68 +++++++++++++++++ .../codegen/flash/FlashClienOptionsTest.java | 51 +++++++++++++ .../nodejs/NodeJSServerOptionsTest.java | 48 ++++++++++++ .../codegen/php/PhpClientOptionsTest.java | 75 +++++++++++++++++++ .../python/PythonClientOptionsTest.java | 43 +++++++++++ .../codegen/ruby/RubyClientOptionsTest.java | 46 ++++++++++++ 20 files changed, 657 insertions(+), 116 deletions(-) create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index b2ada4a1981..62659530a82 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -40,4 +40,6 @@ public class CodegenConstants { public static final String SORT_PARAMS_BY_REQUIRED_FLAG = "sortParamsByRequiredFlag"; public static final String SORT_PARAMS_BY_REQUIRED_FLAG_DESC = "Sort method arguments to place required parameters before optional parameters. Default: true"; + public static final String PACKAGE_NAME = "packageName"; + public static final String PACKAGE_VERSION = "packageVersion"; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index eb77efa3456..6085aee7781 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -105,7 +105,8 @@ public class DefaultCodegen { } if (additionalProperties.containsKey(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG)) { - this.setSortParamsByRequiredFlag(Boolean.valueOf((String)additionalProperties.get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG).toString())); + this.setSortParamsByRequiredFlag(Boolean.valueOf(additionalProperties + .get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG).toString())); } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java index 9c55053e59c..aeb73136776 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java @@ -17,6 +17,7 @@ import java.util.HashSet; import org.apache.commons.lang.StringUtils; public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String USE_ANDROID_MAVEN_GRADLE_PLUGIN = "useAndroidMavenGradlePlugin"; protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; protected String artifactId = "swagger-android-client"; @@ -64,7 +65,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, "artifactId for use in the generated build.gradle and pom.xml")); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "artifact version for use in the generated build.gradle and pom.xml")); cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC)); - cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true.")); + cliOptions.add(new CliOption(USE_ANDROID_MAVEN_GRADLE_PLUGIN, "A flag to toggle android-maven gradle plugin. Default is true.")); } public CodegenType getTag() { @@ -220,14 +221,15 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER)); } - if (additionalProperties.containsKey("useAndroidMavenGradlePlugin")) { - this.setUseAndroidMavenGradlePlugin((Boolean) additionalProperties.get("useAndroidMavenGradlePlugin")); + if (additionalProperties.containsKey(USE_ANDROID_MAVEN_GRADLE_PLUGIN)) { + this.setUseAndroidMavenGradlePlugin(Boolean.valueOf((String) additionalProperties + .get(USE_ANDROID_MAVEN_GRADLE_PLUGIN))); } else { - additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin); + additionalProperties.put(USE_ANDROID_MAVEN_GRADLE_PLUGIN, useAndroidMavenGradlePlugin); } supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin); + additionalProperties.put(USE_ANDROID_MAVEN_GRADLE_PLUGIN, useAndroidMavenGradlePlugin); supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index bd3487d06df..7156df2d4e6 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -1,6 +1,7 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; @@ -79,8 +80,8 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("object", "Object"); cliOptions.clear(); - cliOptions.add(new CliOption("packageName", "C# package name (convention: Camel.Case), default: IO.Swagger")); - cliOptions.add(new CliOption("packageVersion", "C# package version, default: 1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case), default: IO.Swagger")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version, default: 1.0.0")); } @@ -88,19 +89,19 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("packageVersion")) { - packageVersion = (String) additionalProperties.get("packageVersion"); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { + setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION)); } else { - additionalProperties.put("packageVersion", packageVersion); + additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion); } - if (additionalProperties.containsKey("packageName")) { - packageName = (String) additionalProperties.get("packageName"); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { + setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); apiPackage = packageName + ".Api"; modelPackage = packageName + ".Model"; clientPackage = packageName + ".Client"; } else { - additionalProperties.put("packageName", packageName); + additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName); } additionalProperties.put("clientPackage", clientPackage); @@ -252,4 +253,11 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig return camelize(sanitizeName(operationId)); } + public void setPackageName(String packageName) { + this.packageName = packageName; + } + + public void setPackageVersion(String packageVersion) { + this.packageVersion = packageVersion; + } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java index 9d9757a9131..9dc8202ce7f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java @@ -1,6 +1,7 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; @@ -15,6 +16,7 @@ import java.util.HashMap; import java.util.HashSet; public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String CLIENT_PACKAGE = "clientPackage"; protected String packageName = "IO.Swagger"; protected String packageVersion = "1.0.0"; protected String clientPackage = "IO.Swagger.Client"; @@ -77,34 +79,34 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege typeMapping.put("object", "Object"); cliOptions.clear(); - cliOptions.add(new CliOption("packageName", "C# package name (convention: Camel.Case), default: IO.Swagger")); - cliOptions.add(new CliOption("packageVersion", "C# package version, default: 1.0.0")); - + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case), default: IO.Swagger")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version, default: 1.0.0")); + cliOptions.add(new CliOption(CLIENT_PACKAGE, "C# client package name (convention: Camel.Case), default: IO.Swagger.Client")); } @Override public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("packageVersion")) { - packageVersion = (String) additionalProperties.get("packageVersion"); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { + setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION)); } else { - additionalProperties.put("packageVersion", packageVersion); + additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion); } - if (additionalProperties.containsKey("packageName")) { - packageName = (String) additionalProperties.get("packageName"); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { + setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); apiPackage = packageName + ".Api"; modelPackage = packageName + ".Model"; clientPackage = packageName + ".Client"; } else { - additionalProperties.put("packageName", packageName); + additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName); } - if (additionalProperties.containsKey("clientPackage")) { - this.setClientPackage((String) additionalProperties.get("clientPackage")); + if (additionalProperties.containsKey(CLIENT_PACKAGE)) { + this.setClientPackage((String) additionalProperties.get(CLIENT_PACKAGE)); } else { - additionalProperties.put("clientPackage", clientPackage); + additionalProperties.put(CLIENT_PACKAGE, clientPackage); } supportingFiles.add(new SupportingFile("Configuration.mustache", @@ -123,6 +125,14 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege this.clientPackage = clientPackage; } + public void setPackageName(String packageName) { + this.packageName = packageName; + } + + public void setPackageVersion(String packageVersion) { + this.packageVersion = packageVersion; + } + public CodegenType getTag() { return CodegenType.CLIENT; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java index ede4505d4dd..201db359f6f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java @@ -2,6 +2,7 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; @@ -15,6 +16,10 @@ import java.util.HashSet; import java.util.HashMap; public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String BROWSER_CLIENT = "browserClient"; + public static final String PUB_NAME = "pubName"; + public static final String PUB_VERSION = "pubVersion"; + public static final String PUB_DESCRIPTION = "pubDescription"; protected boolean browserClient = true; protected String pubName = "swagger"; protected String pubVersion = "1.0.0"; @@ -72,10 +77,11 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("date", "DateTime"); typeMapping.put("File", "MultipartFile"); - cliOptions.add(new CliOption("browserClient", "Is the client browser based")); - cliOptions.add(new CliOption("pubName", "Name in generated pubspec")); - cliOptions.add(new CliOption("pubVersion", "Version in generated pubspec")); - cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); + cliOptions.add(new CliOption(BROWSER_CLIENT, "Is the client browser based")); + cliOptions.add(new CliOption(PUB_NAME, "Name in generated pubspec")); + cliOptions.add(new CliOption(PUB_VERSION, "Version in generated pubspec")); + cliOptions.add(new CliOption(PUB_DESCRIPTION, "Description in generated pubspec")); + cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, "source folder for generated code")); } public CodegenType getTag() { @@ -94,37 +100,37 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("browserClient")) { - this.setBrowserClient(Boolean.parseBoolean((String) additionalProperties.get("browserClient"))); - additionalProperties.put("browserClient", browserClient); + if (additionalProperties.containsKey(BROWSER_CLIENT)) { + this.setBrowserClient(Boolean.parseBoolean((String) additionalProperties.get(BROWSER_CLIENT))); + additionalProperties.put(BROWSER_CLIENT, browserClient); } else { //not set, use to be passed to template - additionalProperties.put("browserClient", browserClient); + additionalProperties.put(BROWSER_CLIENT, browserClient); } - if (additionalProperties.containsKey("pubName")) { - this.setPubName((String) additionalProperties.get("pubName")); + if (additionalProperties.containsKey(PUB_NAME)) { + this.setPubName((String) additionalProperties.get(PUB_NAME)); } else { //not set, use to be passed to template - additionalProperties.put("pubName", pubName); + additionalProperties.put(PUB_NAME, pubName); } - if (additionalProperties.containsKey("pubVersion")) { - this.setPubVersion((String) additionalProperties.get("pubVersion")); + if (additionalProperties.containsKey(PUB_VERSION)) { + this.setPubVersion((String) additionalProperties.get(PUB_VERSION)); } else { //not set, use to be passed to template - additionalProperties.put("pubVersion", pubVersion); + additionalProperties.put(PUB_VERSION, pubVersion); } - if (additionalProperties.containsKey("pubDescription")) { - this.setPubDescription((String) additionalProperties.get("pubDescription")); + if (additionalProperties.containsKey(PUB_DESCRIPTION)) { + this.setPubDescription((String) additionalProperties.get(PUB_DESCRIPTION)); } else { //not set, use to be passed to template - additionalProperties.put("pubDescription", pubDescription); + additionalProperties.put(PUB_DESCRIPTION, pubDescription); } - if (additionalProperties.containsKey("sourceFolder")) { - this.setSourceFolder((String) additionalProperties.get("sourceFolder")); + if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) { + this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER)); } final String libFolder = sourceFolder + File.separator + "lib"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java index 7c484c38a0b..ff4acb41f19 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java @@ -68,15 +68,19 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig importMapping.put("File", "flash.filesystem.File"); // from - reservedWords = new HashSet( - Arrays.asList( -"add", "for", "lt", "tellTarget", "and", "function", "ne", "this", "break", "ge", "new", "typeof", "continue", "gt", "not", "var", "delete", "if", "on", "void", "do", "ifFrameLoaded", "onClipEvent", "while", "else", "in", "or", "with", "eq", "le", "return")); + reservedWords = new HashSet(Arrays.asList("add", "for", "lt", "tellTarget", "and", + "function", "ne", "this", "break", "ge", "new", "typeof", "continue", "gt", "not", + "var", "delete", "if", "on", "void", "do", "ifFrameLoaded", "onClipEvent", "while", + "else", "in", "or", "with", "eq", "le", "return")); cliOptions.clear(); - cliOptions.add(new CliOption("packageName", "flash package name (convention: package.name), default: io.swagger")); - cliOptions.add(new CliOption("packageVersion", "flash package version, default: 1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "flash package name (convention:" + + " package.name), default: io.swagger")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "flash package version, " + + "default: 1.0.0")); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); - cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, "source folder for generated code. e.g. src/main/flex")); + cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, "source folder for generated " + + "code. e.g. src/main/flex")); } @@ -95,8 +99,8 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER)); } - if (additionalProperties.containsKey("packageName")) { - setPackageName((String) additionalProperties.get("packageName")); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { + setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); apiPackage = packageName + ".client.api"; modelPackage = packageName + ".client.model"; } @@ -104,20 +108,21 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig setPackageName("io.swagger"); } - if (additionalProperties.containsKey("packageVersion")) { - setPackageVersion((String) additionalProperties.get("packageVersion")); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { + setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION)); } else { setPackageVersion("1.0.0"); } - additionalProperties.put("packageName", packageName); - additionalProperties.put("packageVersion", packageVersion); + additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName); + additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion); //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model"; //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api"; - final String invokerFolder = (sourceFolder + File.separator + invokerPackage + File.separator + "swagger" + File.separator).replace(".", File.separator).replace('.', File.separatorChar); + final String invokerFolder = (sourceFolder + File.separator + invokerPackage + File.separator + + "swagger" + File.separator).replace(".", File.separator).replace('.', File.separatorChar); supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as")); supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as")); @@ -131,13 +136,20 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig supportingFiles.add(new SupportingFile("Response.as", invokerFolder + "event", "Response.as")); supportingFiles.add(new SupportingFile("build.properties", sourceFolder, "build.properties")); supportingFiles.add(new SupportingFile("build.xml", sourceFolder, "build.xml")); - supportingFiles.add(new SupportingFile("AirExecutorApp-app.xml", sourceFolder + File.separatorChar + "bin", "AirExecutorApp-app.xml")); - supportingFiles.add(new SupportingFile("ASAXB-0.1.1.swc", sourceFolder + File.separatorChar + "lib", "ASAXB-0.1.1.swc")); - supportingFiles.add(new SupportingFile("as3corelib.swc", sourceFolder + File.separatorChar + "lib", "as3corelib.swc")); - supportingFiles.add(new SupportingFile("flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc", sourceFolder + File.separator + "lib" + File.separator + "ext", "flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc")); - supportingFiles.add(new SupportingFile("flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc", sourceFolder + File.separator + "lib" + File.separator + "ext", "flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc")); - supportingFiles.add(new SupportingFile("flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc", sourceFolder + File.separator + "lib" + File.separator + "ext", "flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc")); - supportingFiles.add(new SupportingFile("flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc", sourceFolder + File.separator + "lib" + File.separator + "ext", "flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc")); + supportingFiles.add(new SupportingFile("AirExecutorApp-app.xml", sourceFolder + File.separatorChar + + "bin", "AirExecutorApp-app.xml")); + supportingFiles.add(new SupportingFile("ASAXB-0.1.1.swc", sourceFolder + File.separatorChar + + "lib", "ASAXB-0.1.1.swc")); + supportingFiles.add(new SupportingFile("as3corelib.swc", sourceFolder + File.separatorChar + + "lib", "as3corelib.swc")); + supportingFiles.add(new SupportingFile("flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc", sourceFolder + + File.separator + "lib" + File.separator + "ext", "flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc")); + supportingFiles.add(new SupportingFile("flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc", sourceFolder + + File.separator + "lib" + File.separator + "ext", "flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc")); + supportingFiles.add(new SupportingFile("flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc", sourceFolder + + File.separator + "lib" + File.separator + "ext", "flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc")); + supportingFiles.add(new SupportingFile("flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc", sourceFolder + + File.separator + "lib" + File.separator + "ext", "flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc")); } private static String dropDots(String str) { @@ -163,11 +175,13 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String apiFileFolder() { - return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); + return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); } public String modelFileFolder() { - return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); + return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); } @Override diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index e236b7ac400..0949afb5d0e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -151,7 +151,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { } if (additionalProperties.containsKey(CodegenConstants.SERIALIZABLE_MODEL)) { - this.setSerializableModel(Boolean.valueOf((String)additionalProperties.get(CodegenConstants.SERIALIZABLE_MODEL).toString())); + this.setSerializableModel(Boolean.valueOf(additionalProperties.get(CodegenConstants.SERIALIZABLE_MODEL).toString())); } if (additionalProperties.containsKey(CodegenConstants.LIBRARY)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 538a5c494a6..a1c5b985b30 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -19,6 +19,11 @@ import java.util.HashSet; import org.apache.commons.lang3.StringUtils; public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention"; + public static final String PACKAGE_PATH = "packagePath"; + public static final String SRC_BASE_PATH = "srcBasePath"; + public static final String COMPOSER_VENDOR_NAME = "composerVendorName"; + public static final String COMPOSER_PROJECT_NAME = "composerProjectName"; protected String invokerPackage = "Swagger\\Client"; protected String composerVendorName = "swagger"; protected String composerProjectName = "swagger-client"; @@ -86,12 +91,12 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("object", "object"); typeMapping.put("DateTime", "\\DateTime"); - cliOptions.add(new CliOption("variableNamingConvention", "naming convention of variable name, e.g. camelCase. Default: snake_case")); + cliOptions.add(new CliOption(VARIABLE_NAMING_CONVENTION, "naming convention of variable name, e.g. camelCase. Default: snake_case")); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); - cliOptions.add(new CliOption("packagePath", "The main package name for classes. e.g. GeneratedPetstore")); - cliOptions.add(new CliOption("srcBasePath", "The directory under packagePath to serve as source root.")); - cliOptions.add(new CliOption("composerVendorName", "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets")); - cliOptions.add(new CliOption("composerProjectName", "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client")); + cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore")); + cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root.")); + cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets")); + cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client")); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3")); } @@ -144,16 +149,16 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("packagePath")) { - this.setPackagePath((String) additionalProperties.get("packagePath")); + if (additionalProperties.containsKey(PACKAGE_PATH)) { + this.setPackagePath((String) additionalProperties.get(PACKAGE_PATH)); } else { - additionalProperties.put("packagePath", packagePath); + additionalProperties.put(PACKAGE_PATH, packagePath); } - if (additionalProperties.containsKey("srcBasePath")) { - this.setSrcBasePath((String) additionalProperties.get("srcBasePath")); + if (additionalProperties.containsKey(SRC_BASE_PATH)) { + this.setSrcBasePath((String) additionalProperties.get(SRC_BASE_PATH)); } else { - additionalProperties.put("srcBasePath", srcBasePath); + additionalProperties.put(SRC_BASE_PATH, srcBasePath); } if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { @@ -162,28 +167,24 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); } - if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { - this.setModelPackage((String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE)); - } else { + if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); } - if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { - this.setApiPackage((String) additionalProperties.get(CodegenConstants.API_PACKAGE)); - } else { + if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); } - if (additionalProperties.containsKey("composerProjectName")) { - this.setComposerProjectName((String) additionalProperties.get("composerProjectName")); + if (additionalProperties.containsKey(COMPOSER_PROJECT_NAME)) { + this.setComposerProjectName((String) additionalProperties.get(COMPOSER_PROJECT_NAME)); } else { - additionalProperties.put("composerProjectName", composerProjectName); + additionalProperties.put(COMPOSER_PROJECT_NAME, composerProjectName); } - if (additionalProperties.containsKey("composerVendorName")) { - this.setComposerVendorName((String) additionalProperties.get("composerVendorName")); + if (additionalProperties.containsKey(COMPOSER_VENDOR_NAME)) { + this.setComposerVendorName((String) additionalProperties.get(COMPOSER_VENDOR_NAME)); } else { - additionalProperties.put("composerVendorName", composerVendorName); + additionalProperties.put(COMPOSER_VENDOR_NAME, composerVendorName); } if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) { @@ -191,6 +192,10 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } else { additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); } + + if (additionalProperties.containsKey(VARIABLE_NAMING_CONVENTION)) { + this.setParameterNamingConvention((String) additionalProperties.get(VARIABLE_NAMING_CONVENTION)); + } additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\")); @@ -286,7 +291,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { this.variableNamingConvention = variableNamingConvention; } - private void setComposerVendorName(String composerVendorName) { + public void setComposerVendorName(String composerVendorName) { this.composerVendorName = composerVendorName; } @@ -296,10 +301,6 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toVarName(String name) { - if (additionalProperties.containsKey("variableNamingConvention")) { - this.setParameterNamingConvention((String) additionalProperties.get("variableNamingConvention")); - } - // sanitize name name = sanitizeName(name); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index 6d9982cf78c..8277aa20f10 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -2,6 +2,7 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; @@ -62,30 +63,31 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig "return", "def", "for", "lambda", "try")); cliOptions.clear(); - cliOptions.add(new CliOption("packageName", "python package name (convention: snake_case), default: swagger_client")); - cliOptions.add(new CliOption("packageVersion", "python package version, default: 1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "python package name (convention: snake_case)," + + " default: swagger_client")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "python package version, default: 1.0.0")); } @Override public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("packageName")) { - setPackageName((String) additionalProperties.get("packageName")); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { + setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); } else { setPackageName("swagger_client"); } - if (additionalProperties.containsKey("packageVersion")) { - setPackageVersion((String) additionalProperties.get("packageVersion")); + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { + setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION)); } else { setPackageVersion("1.0.0"); } - additionalProperties.put("packageName", packageName); - additionalProperties.put("packageVersion", packageVersion); + additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName); + additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion); String swaggerFolder = packageName; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java index 4aac683b6ef..0856f24b690 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -16,6 +16,9 @@ import java.util.HashSet; import org.apache.commons.lang.StringUtils; public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String GEM_NAME = "gemName"; + public static final String MODULE_NAME = "moduleName"; + public static final String GEM_VERSION = "gemVersion"; protected String gemName = null; protected String moduleName = null; protected String gemVersion = "1.0.0"; @@ -68,20 +71,20 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { // remove modelPackage and apiPackage added by default cliOptions.clear(); - cliOptions.add(new CliOption("gemName", "gem name (convention: underscore_case), default: swagger_client")); - cliOptions.add(new CliOption("moduleName", "top module name (convention: CamelCase, usually corresponding to gem name), default: SwaggerClient")); - cliOptions.add(new CliOption("gemVersion", "gem version, default: 1.0.0")); + cliOptions.add(new CliOption(GEM_NAME, "gem name (convention: underscore_case), default: swagger_client")); + cliOptions.add(new CliOption(MODULE_NAME, "top module name (convention: CamelCase, usually corresponding to gem name), default: SwaggerClient")); + cliOptions.add(new CliOption(GEM_VERSION, "gem version, default: 1.0.0")); } @Override public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("gemName")) { - setGemName((String) additionalProperties.get("gemName")); + if (additionalProperties.containsKey(GEM_NAME)) { + setGemName((String) additionalProperties.get(GEM_NAME)); } - if (additionalProperties.containsKey("moduleName")) { - setModuleName((String) additionalProperties.get("moduleName")); + if (additionalProperties.containsKey(MODULE_NAME)) { + setModuleName((String) additionalProperties.get(MODULE_NAME)); } if (gemName == null && moduleName == null) { @@ -93,14 +96,14 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { setModuleName(generateModuleName(gemName)); } - additionalProperties.put("gemName", gemName); - additionalProperties.put("moduleName", moduleName); + additionalProperties.put(GEM_NAME, gemName); + additionalProperties.put(MODULE_NAME, moduleName); - if (additionalProperties.containsKey("gemVersion")) { - setGemVersion((String) additionalProperties.get("gemVersion")); + if (additionalProperties.containsKey(GEM_VERSION)) { + setGemVersion((String) additionalProperties.get(GEM_VERSION)); } else { // not set, pass the default value to template - additionalProperties.put("gemVersion", gemVersion); + additionalProperties.put(GEM_VERSION, gemVersion); } // use constant model/api package (folder path) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java new file mode 100644 index 00000000000..4ea24aeca98 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java @@ -0,0 +1,71 @@ +package io.swagger.codegen.android; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.AndroidClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class AndroidClientOptionsTest extends AbstractOptionsTest { + protected static final String ARTIFACT_ID_VALUE = "swagger-java-client-test"; + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; + protected static final String SORT_PARAMS_VALUE = "false"; + protected static final String GROUP_ID_VALUE = "io.swagger.test"; + protected static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; + protected static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; + protected static final String ANDROID_MAVEN_GRADLE_PLUGIN_VALUE = "true"; + + @Tested + private AndroidClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setGroupId(GROUP_ID_VALUE); + times = 1; + clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + times = 1; + clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + clientCodegen.setUseAndroidMavenGradlePlugin(Boolean.valueOf(ANDROID_MAVEN_GRADLE_PLUGIN_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) + .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .put(AndroidClientCodegen.USE_ANDROID_MAVEN_GRADLE_PLUGIN, ANDROID_MAVEN_GRADLE_PLUGIN_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java new file mode 100644 index 00000000000..5a64e676dcb --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java @@ -0,0 +1,43 @@ +package io.swagger.codegen.csharp; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.CSharpClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class CSharpClientOptionsTest extends AbstractOptionsTest { + protected static final String PACKAGE_NAME_VALUE = "swagger_client_csharp"; + protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Tested + private CSharpClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + times = 1; + clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java new file mode 100644 index 00000000000..d9455103576 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.csharpdotnettwo; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.CsharpDotNet2ClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class CsharpDotNet2ClientOptionsTest extends AbstractOptionsTest { + protected static final String PACKAGE_NAME_VALUE = "swagger_client_csharp_dotnet"; + protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + protected static final String CLIENT_PACKAGE_VALUE = "IO.Swagger.Client.Test"; + + @Tested + private CsharpDotNet2ClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + times = 1; + clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + times = 1; + clientCodegen.setClientPackage(CLIENT_PACKAGE_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .put(CsharpDotNet2ClientCodegen.CLIENT_PACKAGE, CLIENT_PACKAGE_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java new file mode 100644 index 00000000000..6a63754d646 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java @@ -0,0 +1,68 @@ +package io.swagger.codegen.dart; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.DartClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class DartClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "packagedart"; + protected static final String API_PACKAGE_VALUE = "apiPackageDart"; + protected static final String SORT_PARAMS_VALUE = "false"; + protected static final String BROWSER_CLIENT_VALUE = "true"; + protected static final String PUB_NAME_VALUE = "swagger"; + protected static final String PUB_VERSION_VALUE = "1.0.0-SNAPSHOT"; + protected static final String PUB_DESCRIPTION_VALUE = "Swagger API client dart"; + protected static final String SOURCE_FOLDER_VALUE = "src"; + + @Tested + private DartClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setBrowserClient(Boolean.valueOf(BROWSER_CLIENT_VALUE)); + times = 1; + clientCodegen.setPubName(PUB_NAME_VALUE); + times = 1; + clientCodegen.setPubVersion(PUB_VERSION_VALUE); + times = 1; + clientCodegen.setPubDescription(PUB_DESCRIPTION_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(DartClientCodegen.BROWSER_CLIENT, BROWSER_CLIENT_VALUE) + .put(DartClientCodegen.PUB_NAME, PUB_NAME_VALUE) + .put(DartClientCodegen.PUB_VERSION, PUB_VERSION_VALUE) + .put(DartClientCodegen.PUB_DESCRIPTION, PUB_DESCRIPTION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .build(); + } +} + diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java new file mode 100644 index 00000000000..75a9df65e40 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java @@ -0,0 +1,51 @@ +package io.swagger.codegen.flash; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.FlashClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class FlashClienOptionsTest extends AbstractOptionsTest { + protected static final String PACKAGE_NAME_VALUE = "io.swagger.flash"; + protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + protected static final String INVOKER_PACKAGE_VALUE = "io.swagger.flash"; + protected static final String SOURCE_FOLDER_VALUE = "src/main/flex/test"; + + @Tested + private FlashClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + times = 1; + clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java new file mode 100644 index 00000000000..5ad3eb33f2a --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java @@ -0,0 +1,48 @@ +package io.swagger.codegen.nodejs; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.JavaClientCodegen; +import io.swagger.codegen.languages.NodeJSServerCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class NodeJSServerOptionsTest extends AbstractOptionsTest { + private static final String MODEL_PACKAGE_VALUE = "package"; + private static final String API_PACKAGE_VALUE = "apiPackage"; + private static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private NodeJSServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java new file mode 100644 index 00000000000..413ee538053 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java @@ -0,0 +1,75 @@ +package io.swagger.codegen.php; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.PhpClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class PhpClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + protected static final String VARIABLE_NAMING_CONVENTION_VALUE = "snake_case"; + protected static final String INVOKER_PACKAGE_VALUE = "Swagger\\Client\\Php"; + protected static final String PACKAGE_PATH_VALUE = "SwaggerClient-php"; + protected static final String SRC_BASE_PATH_VALUE = "libPhp"; + protected static final String COMPOSER_VENDOR_NAME_VALUE = "swaggerPhp"; + protected static final String COMPOSER_PROJECT_NAME_VALUE = "swagger-client-php"; + protected static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Tested + private PhpClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setParameterNamingConvention(VARIABLE_NAMING_CONVENTION_VALUE); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setPackagePath(PACKAGE_PATH_VALUE); + times = 1; + clientCodegen.setSrcBasePath(SRC_BASE_PATH_VALUE); + times = 1; + clientCodegen.setComposerVendorName(COMPOSER_VENDOR_NAME_VALUE); + times = 1; + clientCodegen.setComposerProjectName(COMPOSER_PROJECT_NAME_VALUE); + times = 1; + clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(PhpClientCodegen.VARIABLE_NAMING_CONVENTION, VARIABLE_NAMING_CONVENTION_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(PhpClientCodegen.PACKAGE_PATH, PACKAGE_PATH_VALUE) + .put(PhpClientCodegen.SRC_BASE_PATH, SRC_BASE_PATH_VALUE) + .put(PhpClientCodegen.COMPOSER_VENDOR_NAME, COMPOSER_VENDOR_NAME_VALUE) + .put(PhpClientCodegen.COMPOSER_PROJECT_NAME, COMPOSER_PROJECT_NAME_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java new file mode 100644 index 00000000000..645471789e8 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java @@ -0,0 +1,43 @@ +package io.swagger.codegen.python; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.PythonClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class PythonClientOptionsTest extends AbstractOptionsTest { + protected static final String PACKAGE_NAME_VALUE = "swagger_client_python"; + protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Tested + private PythonClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + times = 1; + clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java new file mode 100644 index 00000000000..ca2ea19a2d9 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java @@ -0,0 +1,46 @@ +package io.swagger.codegen.ruby; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.languages.RubyClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class RubyClientOptionsTest extends AbstractOptionsTest { + private static final String GEM_NAME_VALUE = "swagger_client_ruby"; + private static final String MODULE_NAME_VALUE = "SwaggerClientRuby"; + private static final String GEM_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Tested + private RubyClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setGemName(GEM_NAME_VALUE); + times = 1; + clientCodegen.setModuleName(MODULE_NAME_VALUE); + times = 1; + clientCodegen.setGemVersion(GEM_VERSION_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(RubyClientCodegen.GEM_NAME, GEM_NAME_VALUE) + .put(RubyClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) + .put(RubyClientCodegen.GEM_VERSION, GEM_VERSION_VALUE) + .build(); + } +} From 67815ed5f2933ec7bc8a737dde70d76b4ccc1ec3 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 27 Oct 2015 19:22:25 +0800 Subject: [PATCH 013/142] add oauth support for php --- .../codegen/languages/PhpClientCodegen.java | 3 ++ .../src/main/resources/php/api.mustache | 4 +-- .../main/resources/php/configuration.mustache | 30 +++++++++++++++++++ .../php/SwaggerClient-php/lib/Api/PetApi.php | 14 ++++----- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 538a5c494a6..7ce5a034474 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -333,6 +333,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { // Note: backslash ("\\") is allowed for e.g. "\\DateTime" name = name.replaceAll("[^\\w\\\\]+", "_"); + // remove dollar sign + name = name.replaceAll("$", ""); + // model name cannot use reserved keyword if (reservedWords.contains(name)) { escapeReservedWord(name); // e.g. return => _return diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache index 78eaeb7cc6b..39c469e9851 100644 --- a/modules/swagger-codegen/src/main/resources/php/api.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api.mustache @@ -170,8 +170,8 @@ use \{{invokerPackage}}\ObjectSerializer; if (isset($apiKey)) { {{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $apiKey;{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $apiKey;{{/isKeyInQuery}} }{{/isApiKey}} - {{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode($this->apiClient->getConfig()->getUsername().":".$this->apiClient->getConfig()->getPassword());{{/isBasic}} - {{#isOAuth}}//TODO support oauth{{/isOAuth}} + {{#isBasic}}$headerParams['Authorization'] = 'Basic ' . base64_encode($this->apiClient->getConfig()->getUsername(). ":" .$this->apiClient->getConfig()->getPassword());{{/isBasic}} + {{#isOAuth}}$headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken();{{/isOAuth}} {{/authMethods}} // make the API Call try diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache index 96bc8a1b660..286ac8e2898 100644 --- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache @@ -63,6 +63,13 @@ class Configuration */ protected $apiKeyPrefixes = array(); + /** + * Token for OAuth + * + * @var string + */ + protected $authToken = ''; + /** * Username for HTTP basic authentication * @@ -195,6 +202,29 @@ class Configuration return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null; } + /** + * Sets the token for OAuth + * + * @param string $authToken Token for OAuth + * + * @return Configuration + */ + public function setAuthToken($authToken) + { + $this->$authToken = $authToken; + return $this; + } + + /** + * Gets the token for OAuth + * + * @return string Token for OAuth + */ + public function getAuthToken() + { + return $this->authToken; + } + /** * Sets the username for HTTP basic authentication * diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php index bcd91f4ffb8..cd2a3001052 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php @@ -136,7 +136,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try @@ -201,7 +201,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try @@ -265,7 +265,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try @@ -341,7 +341,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try @@ -527,7 +527,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try @@ -603,7 +603,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try @@ -695,7 +695,7 @@ class PetApi } - //TODO support oauth + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); // make the API Call try From 964850a8de099ab9122e6fcb8d38181dde3469d6 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 28 Oct 2015 14:42:02 +0800 Subject: [PATCH 014/142] rename authToken to accessToken --- .../src/main/resources/php/api.mustache | 4 ++-- .../main/resources/php/configuration.mustache | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache index 39c469e9851..e3a9749c423 100644 --- a/modules/swagger-codegen/src/main/resources/php/api.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api.mustache @@ -170,8 +170,8 @@ use \{{invokerPackage}}\ObjectSerializer; if (isset($apiKey)) { {{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $apiKey;{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $apiKey;{{/isKeyInQuery}} }{{/isApiKey}} - {{#isBasic}}$headerParams['Authorization'] = 'Basic ' . base64_encode($this->apiClient->getConfig()->getUsername(). ":" .$this->apiClient->getConfig()->getPassword());{{/isBasic}} - {{#isOAuth}}$headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken();{{/isOAuth}} + {{#isBasic}}$headerParams['Authorization'] = 'Basic ' . base64_encode($this->apiClient->getConfig()->getUsername() . ":" . $this->apiClient->getConfig()->getPassword());{{/isBasic}} + {{#isOAuth}}$headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();{{/isOAuth}} {{/authMethods}} // make the API Call try diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache index 286ac8e2898..14d7957fe54 100644 --- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache @@ -64,11 +64,11 @@ class Configuration protected $apiKeyPrefixes = array(); /** - * Token for OAuth + * Access token for OAuth * * @var string */ - protected $authToken = ''; + protected $accessToken = ''; /** * Username for HTTP basic authentication @@ -203,26 +203,26 @@ class Configuration } /** - * Sets the token for OAuth + * Sets the access token for OAuth * - * @param string $authToken Token for OAuth + * @param string $accessToken Token for OAuth * * @return Configuration */ - public function setAuthToken($authToken) + public function setAccessToken($accessToken) { - $this->$authToken = $authToken; + $this->$accessToken = $accessToken; return $this; } /** - * Gets the token for OAuth + * Gets the access token for OAuth * - * @return string Token for OAuth + * @return string Access token for OAuth */ - public function getAuthToken() + public function getAccessToken() { - return $this->authToken; + return $this->accessToken; } /** From 6c12e5ac8bdc072375ed8edc556ecc0fc9c45198 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 28 Oct 2015 15:22:46 +0800 Subject: [PATCH 015/142] update php sample --- .../php/SwaggerClient-php/lib/Api/PetApi.php | 14 ++++----- .../SwaggerClient-php/lib/Configuration.php | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php index cd2a3001052..a418ac90b43 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php @@ -136,7 +136,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try @@ -201,7 +201,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try @@ -265,7 +265,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try @@ -341,7 +341,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try @@ -527,7 +527,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try @@ -603,7 +603,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try @@ -695,7 +695,7 @@ class PetApi } - $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAuthToken(); + $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken(); // make the API Call try diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php index ad715e75994..1fdac785bfd 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php @@ -63,6 +63,13 @@ class Configuration */ protected $apiKeyPrefixes = array(); + /** + * Access token for OAuth + * + * @var string + */ + protected $accessToken = ''; + /** * Username for HTTP basic authentication * @@ -195,6 +202,29 @@ class Configuration return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null; } + /** + * Sets the access token for OAuth + * + * @param string $accessToken Token for OAuth + * + * @return Configuration + */ + public function setAccessToken($accessToken) + { + $this->$accessToken = $accessToken; + return $this; + } + + /** + * Gets the access token for OAuth + * + * @return string Access token for OAuth + */ + public function getAccessToken() + { + return $this->accessToken; + } + /** * Sets the username for HTTP basic authentication * From 953edc940f451a145257ef5715680a893932595a Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 29 Oct 2015 09:40:07 +0800 Subject: [PATCH 016/142] Java jersey2: use a shared Client instance --- .../Java/libraries/jersey2/ApiClient.mustache | 20 ++++++++++------ .../java/io/swagger/client/ApiClient.java | 24 ++++++++++++------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache index fffd5fc824f..adaee9fde89 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache @@ -45,6 +45,7 @@ import {{invokerPackage}}.auth.OAuth; {{>generatedAnnotation}} public class ApiClient { + private Client client; private Map hostMap = new HashMap(); private Map defaultHeaderMap = new HashMap(); private boolean debugging = false; @@ -69,6 +70,8 @@ public class ApiClient { // Set default User-Agent. setUserAgent("Java-Swagger"); + buildClient(); + // Setup authentications (key: authentication name, value: authentication). authentications = new HashMap();{{#authMethods}}{{#isBasic}} authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}} @@ -203,6 +206,7 @@ public class ApiClient { */ public ApiClient setDebugging(boolean debugging) { this.debugging = debugging; + buildClient(); return this; } @@ -419,13 +423,6 @@ public class ApiClient { public T invokeAPI(String path, String method, List queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames, TypeRef returnType) throws ApiException { updateParamsForAuth(authNames, queryParams, headerParams); - final ClientConfig clientConfig = new ClientConfig(); - clientConfig.register(MultiPartFeature.class); - if (debugging) { - clientConfig.register(LoggingFilter.class); - } - Client client = ClientBuilder.newClient(clientConfig); - WebTarget target = client.target(this.basePath).path(path); if (queryParams != null) { @@ -537,6 +534,15 @@ public class ApiClient { } } + private void buildClient() { + final ClientConfig clientConfig = new ClientConfig(); + clientConfig.register(MultiPartFeature.class); + if (debugging) { + clientConfig.register(LoggingFilter.class); + } + this.client = ClientBuilder.newClient(clientConfig); + } + private Map> buildResponseHeaders(Response response) { Map> responseHeaders = new HashMap>(); for (Entry> entry: response.getHeaders().entrySet()) { diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java index 4734b5d5077..01c0888ee90 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java @@ -43,8 +43,9 @@ import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-29T09:31:27.804+08:00") public class ApiClient { + private Client client; private Map hostMap = new HashMap(); private Map defaultHeaderMap = new HashMap(); private boolean debugging = false; @@ -69,10 +70,12 @@ public class ApiClient { // Set default User-Agent. setUserAgent("Java-Swagger"); + buildClient(); + // Setup authentications (key: authentication name, value: authentication). authentications = new HashMap(); - authentications.put("api_key", new ApiKeyAuth("header", "api_key")); authentications.put("petstore_auth", new OAuth()); + authentications.put("api_key", new ApiKeyAuth("header", "api_key")); // Prevent the authentications from being modified. authentications = Collections.unmodifiableMap(authentications); } @@ -202,6 +205,7 @@ public class ApiClient { */ public ApiClient setDebugging(boolean debugging) { this.debugging = debugging; + buildClient(); return this; } @@ -418,13 +422,6 @@ public class ApiClient { public T invokeAPI(String path, String method, List queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames, TypeRef returnType) throws ApiException { updateParamsForAuth(authNames, queryParams, headerParams); - final ClientConfig clientConfig = new ClientConfig(); - clientConfig.register(MultiPartFeature.class); - if (debugging) { - clientConfig.register(LoggingFilter.class); - } - Client client = ClientBuilder.newClient(clientConfig); - WebTarget target = client.target(this.basePath).path(path); if (queryParams != null) { @@ -536,6 +533,15 @@ public class ApiClient { } } + private void buildClient() { + final ClientConfig clientConfig = new ClientConfig(); + clientConfig.register(MultiPartFeature.class); + if (debugging) { + clientConfig.register(LoggingFilter.class); + } + this.client = ClientBuilder.newClient(clientConfig); + } + private Map> buildResponseHeaders(Response response) { Map> responseHeaders = new HashMap>(); for (Entry> entry: response.getHeaders().entrySet()) { From 2b24aa8f915a5040d528914d4f51cf87a87866b7 Mon Sep 17 00:00:00 2001 From: aersamkull Date: Thu, 29 Oct 2015 09:15:18 +0100 Subject: [PATCH 017/142] adds default headers --- .../src/main/resources/TypeScript-Angular/api.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index 9681634a765..18c325fa422 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -13,6 +13,7 @@ namespace {{package}} { {{/description}} export class {{classname}} { private basePath = '{{basePath}}'; + public defaultHeaders : any = {}; static $inject: string[] = ['$http', '$httpParamSerializer']; @@ -31,7 +32,7 @@ namespace {{package}} { {{/pathParams}} let queryParameters: any = {}; - let headerParams: any = {}; + let headerParams: any = this.defaultHeaders; {{#hasFormParams}} let formParams: any = {}; From faf79be4772a4deb54e368a48cd99042db9fb9ca Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Wed, 28 Oct 2015 15:34:28 +0300 Subject: [PATCH 018/142] processOptions tests have been added for Objc, perl, spring-mvc, swift, scala, async-scala, qt5cpp, html, dynamic-html, swagger, swagger-yaml, tizen, typescript-angular, typescript-node, akka-scala, inflector, scalatra, silex and sinatra --- .../io/swagger/codegen/CodegenConstants.java | 1 + .../codegen/languages/ObjcClientCodegen.java | 63 +++++++------- .../codegen/languages/PerlClientCodegen.java | 24 ++++-- .../languages/SpringMVCServerCodegen.java | 10 +-- .../codegen/languages/SwiftCodegen.java | 77 +++++++++++------ .../akkascala/AkkaScalaClientOptionsTest.java | 47 +++++++++++ .../AsyncScalaClientOptionsTest.java | 47 +++++++++++ .../JavaInflectorServerOptionsTest.java | 49 +++++++++++ .../codegen/objc/ObjcClientOptionsTest.java | 63 ++++++++++++++ .../codegen/perl/PerlClientOptionsTest.java | 43 ++++++++++ .../codegen/qtfivecpp/Qt5CPPOptionsTest.java | 47 +++++++++++ .../codegen/scala/ScalaClientOptionsTest.java | 47 +++++++++++ .../scalatra/ScalatraServerOptionsTest.java | 47 +++++++++++ .../codegen/silex/SilexServerOptionsTest.java | 47 +++++++++++ .../sinatra/SinatraServerOptionsTest.java | 34 ++++++++ .../springmvc/SpringMVCServerOptionsTest.java | 66 +++++++++++++++ .../staticDocs/StaticDocOptionsTest.java | 47 +++++++++++ .../statichtml/StaticHtmlOptionsTest.java | 47 +++++++++++ .../codegen/swagger/SwaggerOptionsTest.java | 47 +++++++++++ .../swaggeryaml/SwaggerYamlOptionsTest.java | 47 +++++++++++ .../codegen/swift/SwiftOptionsTest.java | 82 +++++++++++++++++++ .../codegen/tizen/TizenClientOptionsTest.java | 47 +++++++++++ .../TypeScriptAngularClientOptionsTest.java | 47 +++++++++++ .../TypeScriptNodeClientOptionsTest.java | 47 +++++++++++ 24 files changed, 1056 insertions(+), 67 deletions(-) create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index 62659530a82..2e53ab42797 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -42,4 +42,5 @@ public class CodegenConstants { public static final String PACKAGE_NAME = "packageName"; public static final String PACKAGE_VERSION = "packageVersion"; + public static final String POD_VERSION = "podVersion"; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java index ef369169827..c33283292f8 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -2,6 +2,7 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenProperty; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; @@ -19,6 +20,12 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String CLASS_PREFIX = "classPrefix"; + public static final String POD_NAME = "podName"; + public static final String AUTHOR_NAME = "authorName"; + public static final String AUTHOR_EMAIL = "authorEmail"; + public static final String GIT_REPO_URL = "gitRepoURL"; + public static final String LICENSE = "license"; protected Set foundationClasses = new HashSet(); protected String podName = "SwaggerClient"; protected String podVersion = "1.0.0"; @@ -113,13 +120,13 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { instantiationTypes.put("map", "NSMutableDictionary"); cliOptions.clear(); - cliOptions.add(new CliOption("classPrefix", "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`), default: `SWG`")); - cliOptions.add(new CliOption("podName", "cocoapods package name (convention: CameCase), default: `SwaggerClient`")); - cliOptions.add(new CliOption("podVersion", "cocoapods package version, default: `1.0.0`")); - cliOptions.add(new CliOption("authorName", "Name to use in the podspec file, default: `Swagger`")); - cliOptions.add(new CliOption("authorEmail", "Email to use in the podspec file, default: `apiteam@swagger.io`")); - cliOptions.add(new CliOption("gitRepoURL", "URL for the git repo where this podspec should point to, default: `https://github.com/swagger-api/swagger-codegen`")); - cliOptions.add(new CliOption("license", "License to use in the podspec file, default: `MIT`")); + cliOptions.add(new CliOption(CLASS_PREFIX, "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`), default: `SWG`")); + cliOptions.add(new CliOption(POD_NAME, "cocoapods package name (convention: CameCase), default: `SwaggerClient`")); + cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "cocoapods package version, default: `1.0.0`")); + cliOptions.add(new CliOption(AUTHOR_NAME, "Name to use in the podspec file, default: `Swagger`")); + cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file, default: `apiteam@swagger.io`")); + cliOptions.add(new CliOption(GIT_REPO_URL, "URL for the git repo where this podspec should point to, default: `https://github.com/swagger-api/swagger-codegen`")); + cliOptions.add(new CliOption(LICENSE, "License to use in the podspec file, default: `MIT`")); } public CodegenType getTag() { @@ -138,41 +145,41 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("podName")) { - setPodName((String) additionalProperties.get("podName")); + if (additionalProperties.containsKey(POD_NAME)) { + setPodName((String) additionalProperties.get(POD_NAME)); } - if (additionalProperties.containsKey("podVersion")) { - setPodVersion((String) additionalProperties.get("podVersion")); + if (additionalProperties.containsKey(CodegenConstants.POD_VERSION)) { + setPodVersion((String) additionalProperties.get(CodegenConstants.POD_VERSION)); } - if (additionalProperties.containsKey("classPrefix")) { - setClassPrefix((String) additionalProperties.get("classPrefix")); + if (additionalProperties.containsKey(CLASS_PREFIX)) { + setClassPrefix((String) additionalProperties.get(CLASS_PREFIX)); } - if (additionalProperties.containsKey("authorName")) { - setAuthorName((String) additionalProperties.get("authorName")); + if (additionalProperties.containsKey(AUTHOR_NAME)) { + setAuthorName((String) additionalProperties.get(AUTHOR_NAME)); } - if (additionalProperties.containsKey("authorEmail")) { - setAuthorEmail((String) additionalProperties.get("authorEmail")); + if (additionalProperties.containsKey(AUTHOR_EMAIL)) { + setAuthorEmail((String) additionalProperties.get(AUTHOR_EMAIL)); } - if (additionalProperties.containsKey("gitRepoURL")) { - setGitRepoURL((String) additionalProperties.get("gitRepoURL")); + if (additionalProperties.containsKey(GIT_REPO_URL)) { + setGitRepoURL((String) additionalProperties.get(GIT_REPO_URL)); } - if (additionalProperties.containsKey("license")) { - setLicense((String) additionalProperties.get("license")); + if (additionalProperties.containsKey(LICENSE)) { + setLicense((String) additionalProperties.get(LICENSE)); } - additionalProperties.put("podName", podName); - additionalProperties.put("podVersion", podVersion); - additionalProperties.put("classPrefix", classPrefix); - additionalProperties.put("authorName", authorName); - additionalProperties.put("authorEmail", authorEmail); - additionalProperties.put("gitRepoURL", gitRepoURL); - additionalProperties.put("license", license); + additionalProperties.put(POD_NAME, podName); + additionalProperties.put(CodegenConstants.POD_VERSION, podVersion); + additionalProperties.put(CLASS_PREFIX, classPrefix); + additionalProperties.put(AUTHOR_NAME, authorName); + additionalProperties.put(AUTHOR_EMAIL, authorEmail); + additionalProperties.put(GIT_REPO_URL, gitRepoURL); + additionalProperties.put(LICENSE, license); String swaggerFolder = podName; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index d54c44a9bdd..46903629d53 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -16,6 +16,8 @@ import java.util.HashSet; import org.apache.commons.lang.StringUtils; public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { + public static final String MODULE_NAME = "moduleName"; + public static final String MODULE_VERSION = "moduleVersion"; protected String moduleName = "SwaggerClient"; protected String moduleVersion = "1.0.0"; @@ -68,8 +70,8 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("object", "object"); cliOptions.clear(); - cliOptions.add(new CliOption("moduleName", "perl module name (convention: CamelCase), default: SwaggerClient")); - cliOptions.add(new CliOption("moduleVersion", "perl module version, default: 1.0.0")); + cliOptions.add(new CliOption(MODULE_NAME, "perl module name (convention: CamelCase), default: SwaggerClient")); + cliOptions.add(new CliOption(MODULE_VERSION, "perl module version, default: 1.0.0")); } @@ -77,16 +79,16 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("moduleVersion")) { - moduleVersion = (String) additionalProperties.get("moduleVersion"); + if (additionalProperties.containsKey(MODULE_VERSION)) { + setModuleVersion((String) additionalProperties.get(MODULE_VERSION)); } else { - additionalProperties.put("moduleVersion", moduleVersion); + additionalProperties.put(MODULE_VERSION, moduleVersion); } - if (additionalProperties.containsKey("moduleName")) { - moduleName = (String) additionalProperties.get("moduleName"); + if (additionalProperties.containsKey(MODULE_NAME)) { + setModuleName((String) additionalProperties.get(MODULE_NAME)); } else { - additionalProperties.put("moduleName", moduleName); + additionalProperties.put(MODULE_NAME, moduleName); } supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiClient.pm")); @@ -229,5 +231,11 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { return underscore(operationId); } + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + public void setModuleVersion(String moduleVersion) { + this.moduleVersion = moduleVersion; + } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java index 82aa15b0d64..ba452a95256 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.Iterator; public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig { + public static final String CONFIG_PACKAGE = "configPackage"; protected String title = "Petstore Server"; protected String configPackage = ""; @@ -36,7 +37,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); additionalProperties.put("title", title); additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); - additionalProperties.put("configPackage", configPackage); + additionalProperties.put(CONFIG_PACKAGE, configPackage); languageSpecificPrimitives = new HashSet( Arrays.asList( @@ -49,8 +50,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen "Float") ); - cliOptions.add(new CliOption("configPackage", "configuration package for generated code")); - + cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code")); } public CodegenType getTag() { @@ -69,8 +69,8 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey("configPackage")) { - this.setConfigPackage((String) additionalProperties.get("configPackage")); + if (additionalProperties.containsKey(CONFIG_PACKAGE)) { + this.setConfigPackage((String) additionalProperties.get(CONFIG_PACKAGE)); } supportingFiles.clear(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java index db0b0fc24eb..54f4152bedb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java @@ -24,13 +24,26 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { - private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}"); + public static final String PROJECT_NAME = "projectName"; + public static final String RESPONSE_AS = "responseAs"; + public static final String UNWRAP_REQUIRED = "unwrapRequired"; + public static final String POD_SOURCE = "podSource"; + public static final String POD_AUTHORS = "podAuthors"; + public static final String POD_SOCIAL_MEDIA_URL = "podSocialMediaURL"; + public static final String POD_DOCSET_URL = "podDocsetURL"; + public static final String POD_LICENSE = "podLicense"; + public static final String POD_HOMEPAGE = "podHomepage"; + public static final String POD_SUMMARY = "podSummary"; + public static final String POD_DESCRIPTION = "podDescription"; + public static final String POD_SCREENSHOTS = "podScreenshots"; + public static final String POD_DOCUMENTATION_URL = "podDocumentationURL"; protected static final String LIBRARY_PROMISE_KIT = "PromiseKit"; protected static final String[] RESPONSE_LIBRARIES = { LIBRARY_PROMISE_KIT }; protected String projectName = "SwaggerClient"; protected boolean unwrapRequired = false; protected String[] responseAs = new String[0]; protected String sourceFolder = "Classes" + File.separator + "Swaggers"; + private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}"); public CodegenType getTag() { return CodegenType.CLIENT; @@ -107,22 +120,22 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { importMapping = new HashMap(); - cliOptions.add(new CliOption("projectName", "Project name in Xcode")); - cliOptions.add(new CliOption("responseAs", "Optionally use libraries to manage response. Currently " + + cliOptions.add(new CliOption(PROJECT_NAME, "Project name in Xcode")); + cliOptions.add(new CliOption(RESPONSE_AS, "Optionally use libraries to manage response. Currently " + StringUtils.join(RESPONSE_LIBRARIES, ", ") + " are available.")); - cliOptions.add(new CliOption("unwrapRequired", "Treat 'required' properties in response as non-optional " + + cliOptions.add(new CliOption(UNWRAP_REQUIRED, "Treat 'required' properties in response as non-optional " + "(which would crash the app if api returns null as opposed to required option specified in json schema")); - cliOptions.add(new CliOption("podSource", "Source information used for Podspec")); - cliOptions.add(new CliOption("podVersion", "Version used for Podspec")); - cliOptions.add(new CliOption("podAuthors", "Authors used for Podspec")); - cliOptions.add(new CliOption("podSocialMediaURL", "Social Media URL used for Podspec")); - cliOptions.add(new CliOption("podDocsetURL", "Docset URL used for Podspec")); - cliOptions.add(new CliOption("podLicense", "License used for Podspec")); - cliOptions.add(new CliOption("podHomepage", "Homepage used for Podspec")); - cliOptions.add(new CliOption("podSummary", "Summary used for Podspec")); - cliOptions.add(new CliOption("podDescription", "Description used for Podspec")); - cliOptions.add(new CliOption("podScreenshots", "Screenshots used for Podspec")); - cliOptions.add(new CliOption("podDocumentationURL", "Documentation URL used for Podspec")); + cliOptions.add(new CliOption(POD_SOURCE, "Source information used for Podspec")); + cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "Version used for Podspec")); + cliOptions.add(new CliOption(POD_AUTHORS, "Authors used for Podspec")); + cliOptions.add(new CliOption(POD_SOCIAL_MEDIA_URL, "Social Media URL used for Podspec")); + cliOptions.add(new CliOption(POD_DOCSET_URL, "Docset URL used for Podspec")); + cliOptions.add(new CliOption(POD_LICENSE, "License used for Podspec")); + cliOptions.add(new CliOption(POD_HOMEPAGE, "Homepage used for Podspec")); + cliOptions.add(new CliOption(POD_SUMMARY, "Summary used for Podspec")); + cliOptions.add(new CliOption(POD_DESCRIPTION, "Description used for Podspec")); + cliOptions.add(new CliOption(POD_SCREENSHOTS, "Screenshots used for Podspec")); + cliOptions.add(new CliOption(POD_DOCUMENTATION_URL, "Documentation URL used for Podspec")); } @Override @@ -130,29 +143,29 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { super.processOpts(); // Setup project name - if (additionalProperties.containsKey("projectName")) { - projectName = (String) additionalProperties.get("projectName"); + if (additionalProperties.containsKey(PROJECT_NAME)) { + setProjectName((String) additionalProperties.get(PROJECT_NAME)); } else { - additionalProperties.put("projectName", projectName); + additionalProperties.put(PROJECT_NAME, projectName); } sourceFolder = projectName + File.separator + sourceFolder; // Setup unwrapRequired option, which makes all the properties with "required" non-optional - if (additionalProperties.containsKey("unwrapRequired")) { - unwrapRequired = Boolean.parseBoolean(String.valueOf(additionalProperties.get("unwrapRequired"))); + if (additionalProperties.containsKey(UNWRAP_REQUIRED)) { + setUnwrapRequired(Boolean.parseBoolean(String.valueOf(additionalProperties.get(UNWRAP_REQUIRED)))); } - additionalProperties.put("unwrapRequired", unwrapRequired); + additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired); // Setup unwrapRequired option, which makes all the properties with "required" non-optional - if (additionalProperties.containsKey("responseAs")) { - Object responseAsObject = additionalProperties.get("responseAs"); + if (additionalProperties.containsKey(RESPONSE_AS)) { + Object responseAsObject = additionalProperties.get(RESPONSE_AS); if (responseAsObject instanceof String) { - responseAs = ((String)responseAsObject).split(","); + setResponseAs(((String)responseAsObject).split(",")); } else { - responseAs = (String[]) responseAsObject; + setResponseAs((String[]) responseAsObject); } } - additionalProperties.put("responseAs", responseAs); + additionalProperties.put(RESPONSE_AS, responseAs); if (ArrayUtils.contains(responseAs, LIBRARY_PROMISE_KIT)) { additionalProperties.put("usePromiseKit", true); } @@ -308,4 +321,16 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { return builder.toString(); } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public void setUnwrapRequired(boolean unwrapRequired) { + this.unwrapRequired = unwrapRequired; + } + + public void setResponseAs(String[] responseAs) { + this.responseAs = responseAs; + } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java new file mode 100644 index 00000000000..ef4de047848 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.akkascala; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.AkkaScalaClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class AkkaScalaClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private AkkaScalaClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java new file mode 100644 index 00000000000..5de44c1ee44 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.asyncscala; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.AsyncScalaClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class AsyncScalaClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private AsyncScalaClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java new file mode 100644 index 00000000000..6e06939bfd6 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java @@ -0,0 +1,49 @@ +package io.swagger.codegen.inflector; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.java.JavaClientOptionsTest; +import io.swagger.codegen.languages.JavaInflectorServerCodegen; + +import mockit.Expectations; +import mockit.Tested; + +public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest { + + @Tested + private JavaInflectorServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setGroupId(GROUP_ID_VALUE); + times = 1; + clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + times = 1; + clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + times = 1; + clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + times = 1; + clientCodegen.setLibrary(LIBRARY_VALUE); + times = 1; + clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + times = 1; + }}; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java new file mode 100644 index 00000000000..f5108f6a620 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java @@ -0,0 +1,63 @@ +package io.swagger.codegen.objc; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.ObjcClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class ObjcClientOptionsTest extends AbstractOptionsTest { + private static final String CLASS_PREFIX_VALUE = "SWGObjc"; + private static final String POD_NAME_VALUE = "SwaggerClientObjc"; + private static final String POD_VERSION_VALUE = "1.0.0-SNAPSHOT"; + private static final String AUTHOR_NAME_VALUE = "SwaggerObjc"; + private static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io"; + private static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen"; + private static final String LICENSE_VALUE = "MIT"; + + @Tested + private ObjcClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setClassPrefix(CLASS_PREFIX_VALUE); + times = 1; + clientCodegen.setPodName(POD_NAME_VALUE); + times = 1; + clientCodegen.setPodVersion(POD_VERSION_VALUE); + times = 1; + clientCodegen.setAuthorName(AUTHOR_NAME_VALUE); + times = 1; + clientCodegen.setAuthorEmail(AUTHOR_EMAIL_VALUE); + times = 1; + clientCodegen.setGitRepoURL(GIT_REPO_URL_VALUE); + times = 1; + clientCodegen.setLicense(LICENSE_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(ObjcClientCodegen.CLASS_PREFIX, CLASS_PREFIX_VALUE) + .put(ObjcClientCodegen.POD_NAME, POD_NAME_VALUE) + .put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE) + .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE) + .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE) + .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE) + .put(ObjcClientCodegen.LICENSE, LICENSE_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java new file mode 100644 index 00000000000..ccef4929d8d --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java @@ -0,0 +1,43 @@ +package io.swagger.codegen.perl; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.PerlClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class PerlClientOptionsTest extends AbstractOptionsTest { + private static final String MODULE_NAME_VALUE = ""; + private static final String MODULE_VERSION_VALUE = ""; + + @Tested + private PerlClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModuleName(MODULE_NAME_VALUE); + times = 1; + clientCodegen.setModuleVersion(MODULE_VERSION_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(PerlClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) + .put(PerlClientCodegen.MODULE_VERSION, MODULE_VERSION_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java new file mode 100644 index 00000000000..8a578e86416 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.qtfivecpp; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.Qt5CPPGenerator; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class Qt5CPPOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private Qt5CPPGenerator clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java new file mode 100644 index 00000000000..91f961f8d7c --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.scala; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.ScalaClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class ScalaClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private ScalaClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java new file mode 100644 index 00000000000..0f85a2f9450 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.scalatra; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.ScalatraServerCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class ScalatraServerOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private ScalatraServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java new file mode 100644 index 00000000000..073c274b6ca --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.silex; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.SilexServerCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class SilexServerOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private SilexServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java new file mode 100644 index 00000000000..854b9f05341 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java @@ -0,0 +1,34 @@ +package io.swagger.codegen.sinatra; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.languages.SinatraServerCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class SinatraServerOptionsTest extends AbstractOptionsTest { + + @Tested + private SinatraServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + }}; + } + + @Override + protected Map getAvaliableOptions() { + //SinatraServerCodegen doesn't have its own options and base options are cleared + return ImmutableMap.of(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java new file mode 100644 index 00000000000..8781ffebb53 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java @@ -0,0 +1,66 @@ +package io.swagger.codegen.springmvc; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.java.JavaClientOptionsTest; +import io.swagger.codegen.languages.JavaClientCodegen; +import io.swagger.codegen.languages.SpringMVCServerCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.HashMap; +import java.util.Map; + +public class SpringMVCServerOptionsTest extends JavaClientOptionsTest { + protected static final String CONFIG_PACKAGE_VALUE = "configPackage"; + + @Tested + private SpringMVCServerCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + times = 1; + clientCodegen.setGroupId(GROUP_ID_VALUE); + times = 1; + clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + times = 1; + clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + times = 1; + clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + times = 1; + clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + times = 1; + clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + times = 1; + clientCodegen.setLibrary(LIBRARY_VALUE); + times = 1; + clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + times = 1; + clientCodegen.setConfigPackage(CONFIG_PACKAGE_VALUE); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + Map options = new HashMap(super.getAvaliableOptions()); + options.put(SpringMVCServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE); + return options; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java new file mode 100644 index 00000000000..58b9da82828 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.staticDocs; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.StaticDocCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class StaticDocOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private StaticDocCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java new file mode 100644 index 00000000000..c3857b9a014 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.statichtml; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.StaticHtmlGenerator; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class StaticHtmlOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private StaticHtmlGenerator clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java new file mode 100644 index 00000000000..62e25b20d74 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.swagger; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.SwaggerGenerator; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class SwaggerOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private SwaggerGenerator clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java new file mode 100644 index 00000000000..b86ac712b2a --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.swaggeryaml; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.SwaggerYamlGenerator; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class SwaggerYamlOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private SwaggerYamlGenerator clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java new file mode 100644 index 00000000000..82ff69e8590 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java @@ -0,0 +1,82 @@ +package io.swagger.codegen.swift; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.SwiftCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class SwiftOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + protected static final String PROJECT_NAME_VALUE = "Swagger"; + protected static final String RESPONSE_AS_VALUE = "test"; + protected static final String UNWRAP_REQUIRED_VALUE = "true"; + protected static final String POD_SOURCE_VALUE = "{ :git => 'git@github.com:swagger-api/swagger-mustache.git'," + + " :tag => 'v1.0.0-SNAPSHOT' }"; + protected static final String POD_VERSION_VALUE = "v1.0.0-SNAPSHOT"; + protected static final String POD_AUTHORS_VALUE = "podAuthors"; + protected static final String POD_SOCIAL_MEDIA_URL_VALUE = "podSocialMediaURL"; + protected static final String POD_DOCSET_URL_VALUE = "podDocsetURL"; + protected static final String POD_LICENSE_VALUE = "'Apache License, Version 2.0'"; + protected static final String POD_HOMEPAGE_VALUE = "podHomepage"; + protected static final String POD_SUMMARY_VALUE = "podSummary"; + protected static final String POD_DESCRIPTION_VALUE = "podDescription"; + protected static final String POD_SCREENSHOTS_VALUE = "podScreenshots"; + protected static final String POD_DOCUMENTATION_URL_VALUE = "podDocumentationURL"; + + @Tested + private SwiftCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + clientCodegen.setProjectName(PROJECT_NAME_VALUE); + times = 1; + clientCodegen.setResponseAs(RESPONSE_AS_VALUE.split(",")); + times = 1; + clientCodegen.setUnwrapRequired(Boolean.valueOf(UNWRAP_REQUIRED_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(SwiftCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) + .put(SwiftCodegen.RESPONSE_AS, RESPONSE_AS_VALUE) + .put(SwiftCodegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE) + .put(SwiftCodegen.POD_SOURCE, POD_SOURCE_VALUE) + .put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE) + .put(SwiftCodegen.POD_AUTHORS, POD_AUTHORS_VALUE) + .put(SwiftCodegen.POD_SOCIAL_MEDIA_URL, POD_SOCIAL_MEDIA_URL_VALUE) + .put(SwiftCodegen.POD_DOCSET_URL, POD_DOCSET_URL_VALUE) + .put(SwiftCodegen.POD_LICENSE, POD_LICENSE_VALUE) + .put(SwiftCodegen.POD_HOMEPAGE, POD_HOMEPAGE_VALUE) + .put(SwiftCodegen.POD_SUMMARY, POD_SUMMARY_VALUE) + .put(SwiftCodegen.POD_DESCRIPTION, POD_DESCRIPTION_VALUE) + .put(SwiftCodegen.POD_SCREENSHOTS, POD_SCREENSHOTS_VALUE) + .put(SwiftCodegen.POD_DOCUMENTATION_URL, POD_DOCUMENTATION_URL_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java new file mode 100644 index 00000000000..4d7038b9683 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.tizen; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.TizenClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class TizenClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private TizenClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java new file mode 100644 index 00000000000..cfd63578997 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.typescriptangular; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.TypeScriptAngularClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class TypeScriptAngularClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private TypeScriptAngularClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java new file mode 100644 index 00000000000..f23c01bf753 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.typescriptnode; + +import io.swagger.codegen.AbstractOptionsTest; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.TypeScriptNodeClientCodegen; + +import com.google.common.collect.ImmutableMap; +import mockit.Expectations; +import mockit.Tested; + +import java.util.Map; + +public class TypeScriptNodeClientOptionsTest extends AbstractOptionsTest { + protected static final String MODEL_PACKAGE_VALUE = "package"; + protected static final String API_PACKAGE_VALUE = "apiPackage"; + protected static final String SORT_PARAMS_VALUE = "false"; + + @Tested + private TypeScriptNodeClientCodegen clientCodegen; + + @Override + protected CodegenConfig getCodegenConfig() { + return clientCodegen; + } + + @Override + protected void setExpectations() { + new Expectations(clientCodegen) {{ + clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + times = 1; + clientCodegen.setApiPackage(API_PACKAGE_VALUE); + times = 1; + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + times = 1; + }}; + } + + @Override + protected Map getAvaliableOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } +} From 4438c63f6b3b2e15431e50dd7d6d62b0baf3da38 Mon Sep 17 00:00:00 2001 From: Richard Baverstock Date: Thu, 29 Oct 2015 10:50:07 -0700 Subject: [PATCH 019/142] Issue #1461 Add float and double to languageSpecificPrimitives --- .../java/io/swagger/codegen/languages/Qt5CPPGenerator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java index ff58dbd9440..13efbc300cf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java @@ -97,7 +97,9 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { Arrays.asList( "bool", "qint32", - "qint64") + "qint64", + "float", + "double") ); supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h")); @@ -321,4 +323,4 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { public String toApiName(String type) { return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1) + "Api"; } -} \ No newline at end of file +} From f23370774b570cbf1c505c938938c92220695237 Mon Sep 17 00:00:00 2001 From: Thorsten Rinne Date: Fri, 30 Oct 2015 11:10:38 +0100 Subject: [PATCH 020/142] Added missing visibility for constructor --- .../swagger-codegen/src/main/resources/php/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache index e2193b1d754..11fe3827d48 100644 --- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache @@ -69,7 +69,7 @@ class ApiClient * Constructor of the class * @param Configuration $config config for this ApiClient */ - function __construct(Configuration $config = null) + public function __construct(Configuration $config = null) { if ($config == null) { $config = Configuration::getDefaultConfiguration(); From afcf90798ad22f042b54bb07070681dc52a24bc6 Mon Sep 17 00:00:00 2001 From: dvz5 Date: Fri, 30 Oct 2015 14:32:10 +0100 Subject: [PATCH 021/142] Update BaseObject.mustache Fix deserialization --- .../swagger-codegen/src/main/resources/perl/BaseObject.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index e740ea593ab..f58c180dbf6 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -49,7 +49,7 @@ sub from_hash { } $self->{$_key} = \@_array; } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime - $self->{$_key} = $self->_deserialize($_type, $hash->{$_key}); + $self->{$_key} = $self->_deserialize($_type, $hash->{$self->get_attribute_map->{$_key}}); } else { $log->debugf("warning: %s not defined\n", $_key); } From 81090bb4e2137e72baeb366035dedd87b2565084 Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Thu, 29 Oct 2015 18:00:58 +0300 Subject: [PATCH 022/142] Test data were moved to the separete classes and OnlineGeneratorOptionsTest has been refactored --- modules/swagger-codegen/pom.xml | 12 +++ .../swagger/codegen/AbstractOptionsTest.java | 16 ++-- .../akkascala/AkkaScalaClientOptionsTest.java | 27 ++----- .../android/AndroidClientOptionsTest.java | 51 ++++-------- .../AsyncScalaClientOptionsTest.java | 27 ++----- .../csharp/CSharpClientOptionsTest.java | 23 ++---- .../CsharpDotNet2ClientOptionsTest.java | 27 ++----- .../codegen/dart/DartClientOptionsTest.java | 47 ++++------- .../codegen/flash/FlashClienOptionsTest.java | 29 +++---- .../JavaInflectorServerOptionsTest.java | 30 +++++--- .../codegen/java/JavaClientOptionsTest.java | 69 ++++++----------- .../codegen/jaxrs/JaxRSServerOptionsTest.java | 29 ++++--- .../nodejs/NodeJSServerOptionsTest.java | 28 ++----- .../codegen/objc/ObjcClientOptionsTest.java | 43 +++-------- .../AkkaScalaClientOptionsProvider.java | 32 ++++++++ .../options/AndroidClientOptionsProvider.java | 45 +++++++++++ .../AsyncScalaClientOptionsProvider.java | 32 ++++++++ .../options/CSharpClientOptionsProvider.java | 30 ++++++++ .../CsharpDotNet2ClientOptionsProvider.java | 33 ++++++++ .../options/DartClientOptionsProvider.java | 43 +++++++++++ .../options/FlashClienOptionsProvider.java | 34 ++++++++ .../JavaInflectorServerOptionsProvider.java | 13 ++++ .../codegen/options/JavaOptionsProvider.java | 51 ++++++++++++ .../options/JaxRSServerOptionsProvider.java | 13 ++++ .../options/NodeJSServerOptionsProvider.java | 32 ++++++++ .../options/ObjcClientOptionsProvider.java | 41 ++++++++++ .../codegen/options/OptionsProvider.java | 9 +++ .../options/PerlClientOptionsProvider.java | 30 ++++++++ .../options/PhpClientOptionsProvider.java | 47 +++++++++++ .../options/PythonClientOptionsProvider.java | 30 ++++++++ .../options/Qt5CPPOptionsProvider.java | 32 ++++++++ .../options/RubyClientOptionsProvider.java | 32 ++++++++ .../options/ScalaClientOptionsProvider.java | 32 ++++++++ .../ScalatraServerOptionsProvider.java | 32 ++++++++ .../options/SilexServerOptionsProvider.java | 32 ++++++++ .../options/SinatraServerOptionsProvider.java | 23 ++++++ .../SpringMVCServerOptionsProvider.java | 27 +++++++ .../options/StaticDocOptionsProvider.java | 32 ++++++++ .../options/StaticHtmlOptionsProvider.java | 32 ++++++++ .../options/SwaggerOptionsProvider.java | 32 ++++++++ .../options/SwaggerYamlOptionsProvider.java | 32 ++++++++ .../codegen/options/SwiftOptionsProvider.java | 62 +++++++++++++++ .../options/TizenClientOptionsProvider.java | 32 ++++++++ ...ypeScriptAngularClientOptionsProvider.java | 32 ++++++++ .../TypeScriptNodeClientOptionsProvider.java | 32 ++++++++ .../codegen/perl/PerlClientOptionsTest.java | 23 ++---- .../codegen/php/PhpClientOptionsTest.java | 55 ++++--------- .../python/PythonClientOptionsTest.java | 23 ++---- .../codegen/qtfivecpp/Qt5CPPOptionsTest.java | 27 ++----- .../codegen/ruby/RubyClientOptionsTest.java | 26 ++----- .../codegen/scala/ScalaClientOptionsTest.java | 27 ++----- .../scalatra/ScalatraServerOptionsTest.java | 27 ++----- .../codegen/silex/SilexServerOptionsTest.java | 27 ++----- .../sinatra/SinatraServerOptionsTest.java | 14 ++-- .../springmvc/SpringMVCServerOptionsTest.java | 46 +++++------ .../staticDocs/StaticDocOptionsTest.java | 27 ++----- .../statichtml/StaticHtmlOptionsTest.java | 27 ++----- .../codegen/swagger/SwaggerOptionsTest.java | 27 ++----- .../swaggeryaml/SwaggerYamlOptionsTest.java | 27 ++----- .../codegen/swift/SwiftOptionsTest.java | 62 +++------------ .../codegen/tizen/TizenClientOptionsTest.java | 27 ++----- .../TypeScriptAngularClientOptionsTest.java | 27 ++----- .../TypeScriptNodeClientOptionsTest.java | 27 ++----- modules/swagger-generator/pom.xml | 7 ++ .../swagger/generator/online/Generator.java | 1 - .../online/OnlineGeneratorOptionsTest.java | 77 +++++++++++++++---- .../online/OnlineJavaClientOptionsTest.java | 34 -------- .../online/OnlineJaxRSServerOptionsTest.java | 9 --- 68 files changed, 1404 insertions(+), 739 deletions(-) create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CsharpDotNet2ClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/FlashClienOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaInflectorServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/OptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PythonClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SinatraServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java delete mode 100644 modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java delete mode 100644 modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJaxRSServerOptionsTest.java diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml index 116d6c0c986..fc51a41fcdf 100644 --- a/modules/swagger-codegen/pom.xml +++ b/modules/swagger-codegen/pom.xml @@ -103,6 +103,18 @@ maven-release-plugin 2.1 + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + + test-jar + + + + diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java index 8aa497417e9..7bc2a86bc6b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java @@ -1,22 +1,30 @@ package io.swagger.codegen; +import io.swagger.codegen.options.OptionsProvider; + import com.google.common.base.Function; import com.google.common.collect.Lists; + import mockit.FullVerifications; + import org.apache.commons.lang3.StringUtils; import org.testng.Assert; import org.testng.annotations.Test; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; public abstract class AbstractOptionsTest { + private final OptionsProvider optionsProvider; + + protected AbstractOptionsTest(OptionsProvider optionsProvider) { + this.optionsProvider = optionsProvider; + } @Test public void checkOptionsProcessing() { - getCodegenConfig().additionalProperties().putAll(getAvaliableOptions()); + getCodegenConfig().additionalProperties().putAll(optionsProvider.createOptions()); setExpectations(); getCodegenConfig().processOpts(); @@ -28,7 +36,7 @@ public abstract class AbstractOptionsTest { @Test(description = "check if all options described in documentation are presented in test case") public void checkOptionsHelp() { final List cliOptions = Lists.transform(getCodegenConfig().cliOptions(), getCliOptionTransformer()); - final Set testOptions = getAvaliableOptions().keySet(); + final Set testOptions = optionsProvider.createOptions().keySet(); final Set skipped = new HashSet(cliOptions); skipped.removeAll(testOptions); if (!skipped.isEmpty()) { @@ -52,6 +60,4 @@ public abstract class AbstractOptionsTest { protected abstract CodegenConfig getCodegenConfig(); protected abstract void setExpectations(); - - protected abstract Map getAvaliableOptions(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java index ef4de047848..1b6f878b512 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.akkascala; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.AkkaScalaClientCodegen; +import io.swagger.codegen.options.AkkaScalaClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class AkkaScalaClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private AkkaScalaClientCodegen clientCodegen; + public AkkaScalaClientOptionsTest() { + super(new AkkaScalaClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class AkkaScalaClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(AkkaScalaClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(AkkaScalaClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(AkkaScalaClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java index 4ea24aeca98..c36c5453d98 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java @@ -2,29 +2,21 @@ package io.swagger.codegen.android; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.AndroidClientCodegen; +import io.swagger.codegen.options.AndroidClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class AndroidClientOptionsTest extends AbstractOptionsTest { - protected static final String ARTIFACT_ID_VALUE = "swagger-java-client-test"; - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; - protected static final String SORT_PARAMS_VALUE = "false"; - protected static final String GROUP_ID_VALUE = "io.swagger.test"; - protected static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; - protected static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; - protected static final String ANDROID_MAVEN_GRADLE_PLUGIN_VALUE = "true"; @Tested private AndroidClientCodegen clientCodegen; + public AndroidClientOptionsTest() { + super(new AndroidClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -33,39 +25,24 @@ public class AndroidClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(AndroidClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(AndroidClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(AndroidClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(AndroidClientOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setGroupId(GROUP_ID_VALUE); + clientCodegen.setGroupId(AndroidClientOptionsProvider.GROUP_ID_VALUE); times = 1; - clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + clientCodegen.setArtifactId(AndroidClientOptionsProvider.ARTIFACT_ID_VALUE); times = 1; - clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + clientCodegen.setArtifactVersion(AndroidClientOptionsProvider.ARTIFACT_VERSION_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(AndroidClientOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; - clientCodegen.setUseAndroidMavenGradlePlugin(Boolean.valueOf(ANDROID_MAVEN_GRADLE_PLUGIN_VALUE)); + clientCodegen.setUseAndroidMavenGradlePlugin(Boolean.valueOf(AndroidClientOptionsProvider.ANDROID_MAVEN_GRADLE_PLUGIN_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) - .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) - .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) - .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) - .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) - .put(AndroidClientCodegen.USE_ANDROID_MAVEN_GRADLE_PLUGIN, ANDROID_MAVEN_GRADLE_PLUGIN_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java index 5de44c1ee44..b6b90ae7a7c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.asyncscala; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.AsyncScalaClientCodegen; +import io.swagger.codegen.options.AsyncScalaClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class AsyncScalaClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private AsyncScalaClientCodegen clientCodegen; + public AsyncScalaClientOptionsTest() { + super(new AsyncScalaClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class AsyncScalaClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(AsyncScalaClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(AsyncScalaClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(AsyncScalaClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java index 5a64e676dcb..4c0d5f366a1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java @@ -2,22 +2,21 @@ package io.swagger.codegen.csharp; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.CSharpClientCodegen; +import io.swagger.codegen.options.CSharpClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class CSharpClientOptionsTest extends AbstractOptionsTest { - protected static final String PACKAGE_NAME_VALUE = "swagger_client_csharp"; - protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; @Tested private CSharpClientCodegen clientCodegen; + public CSharpClientOptionsTest() { + super(new CSharpClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -26,18 +25,10 @@ public class CSharpClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + clientCodegen.setPackageName(CSharpClientOptionsProvider.PACKAGE_NAME_VALUE); times = 1; - clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + clientCodegen.setPackageVersion(CSharpClientOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) - .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java index d9455103576..7e30e2b1cd0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.csharpdotnettwo; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.CsharpDotNet2ClientCodegen; +import io.swagger.codegen.options.CsharpDotNet2ClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class CsharpDotNet2ClientOptionsTest extends AbstractOptionsTest { - protected static final String PACKAGE_NAME_VALUE = "swagger_client_csharp_dotnet"; - protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; - protected static final String CLIENT_PACKAGE_VALUE = "IO.Swagger.Client.Test"; @Tested private CsharpDotNet2ClientCodegen clientCodegen; + public CsharpDotNet2ClientOptionsTest() { + super(new CsharpDotNet2ClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class CsharpDotNet2ClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + clientCodegen.setPackageName(CsharpDotNet2ClientOptionsProvider.PACKAGE_NAME_VALUE); times = 1; - clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + clientCodegen.setPackageVersion(CsharpDotNet2ClientOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; - clientCodegen.setClientPackage(CLIENT_PACKAGE_VALUE); + clientCodegen.setClientPackage(CsharpDotNet2ClientOptionsProvider.CLIENT_PACKAGE_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) - .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) - .put(CsharpDotNet2ClientCodegen.CLIENT_PACKAGE, CLIENT_PACKAGE_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java index 6a63754d646..b4ac84be47f 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java @@ -2,28 +2,21 @@ package io.swagger.codegen.dart; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.DartClientCodegen; +import io.swagger.codegen.options.DartClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class DartClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "packagedart"; - protected static final String API_PACKAGE_VALUE = "apiPackageDart"; - protected static final String SORT_PARAMS_VALUE = "false"; - protected static final String BROWSER_CLIENT_VALUE = "true"; - protected static final String PUB_NAME_VALUE = "swagger"; - protected static final String PUB_VERSION_VALUE = "1.0.0-SNAPSHOT"; - protected static final String PUB_DESCRIPTION_VALUE = "Swagger API client dart"; - protected static final String SOURCE_FOLDER_VALUE = "src"; @Tested private DartClientCodegen clientCodegen; + public DartClientOptionsTest() { + super(new DartClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -32,37 +25,23 @@ public class DartClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(DartClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(DartClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(DartClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setBrowserClient(Boolean.valueOf(BROWSER_CLIENT_VALUE)); + clientCodegen.setBrowserClient(Boolean.valueOf(DartClientOptionsProvider.BROWSER_CLIENT_VALUE)); times = 1; - clientCodegen.setPubName(PUB_NAME_VALUE); + clientCodegen.setPubName(DartClientOptionsProvider.PUB_NAME_VALUE); times = 1; - clientCodegen.setPubVersion(PUB_VERSION_VALUE); + clientCodegen.setPubVersion(DartClientOptionsProvider.PUB_VERSION_VALUE); times = 1; - clientCodegen.setPubDescription(PUB_DESCRIPTION_VALUE); + clientCodegen.setPubDescription(DartClientOptionsProvider.PUB_DESCRIPTION_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(DartClientOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .put(DartClientCodegen.BROWSER_CLIENT, BROWSER_CLIENT_VALUE) - .put(DartClientCodegen.PUB_NAME, PUB_NAME_VALUE) - .put(DartClientCodegen.PUB_VERSION, PUB_VERSION_VALUE) - .put(DartClientCodegen.PUB_DESCRIPTION, PUB_DESCRIPTION_VALUE) - .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java index 75a9df65e40..21a9cb5e03b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java @@ -2,24 +2,23 @@ package io.swagger.codegen.flash; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.FlashClientCodegen; +import io.swagger.codegen.options.FlashClienOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; import java.util.Map; public class FlashClienOptionsTest extends AbstractOptionsTest { - protected static final String PACKAGE_NAME_VALUE = "io.swagger.flash"; - protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; - protected static final String INVOKER_PACKAGE_VALUE = "io.swagger.flash"; - protected static final String SOURCE_FOLDER_VALUE = "src/main/flex/test"; @Tested private FlashClientCodegen clientCodegen; + public FlashClienOptionsTest() { + super(new FlashClienOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -28,24 +27,14 @@ public class FlashClienOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + clientCodegen.setPackageName(FlashClienOptionsProvider.PACKAGE_NAME_VALUE); times = 1; - clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + clientCodegen.setPackageVersion(FlashClienOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(FlashClienOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(FlashClienOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) - .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) - .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) - .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java index 6e06939bfd6..d7046dda9b2 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java @@ -3,6 +3,8 @@ package io.swagger.codegen.inflector; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.JavaInflectorServerCodegen; +import io.swagger.codegen.options.JavaInflectorServerOptionsProvider; +import io.swagger.codegen.options.JavaOptionsProvider; import mockit.Expectations; import mockit.Tested; @@ -12,6 +14,10 @@ public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest { @Tested private JavaInflectorServerCodegen clientCodegen; + public JavaInflectorServerOptionsTest() { + super(new JavaInflectorServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -20,29 +26,29 @@ public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(JavaInflectorServerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(JavaInflectorServerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(JavaInflectorServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(JavaInflectorServerOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setGroupId(GROUP_ID_VALUE); + clientCodegen.setGroupId(JavaInflectorServerOptionsProvider.GROUP_ID_VALUE); times = 1; - clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + clientCodegen.setArtifactId(JavaInflectorServerOptionsProvider.ARTIFACT_ID_VALUE); times = 1; - clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + clientCodegen.setArtifactVersion(JavaInflectorServerOptionsProvider.ARTIFACT_VERSION_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(JavaInflectorServerOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; - clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + clientCodegen.setLocalVariablePrefix(JavaInflectorServerOptionsProvider.LOCAL_PREFIX_VALUE); times = 1; - clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + clientCodegen.setSerializableModel(Boolean.valueOf(JavaInflectorServerOptionsProvider.SERIALIZABLE_MODEL_VALUE)); times = 1; - clientCodegen.setLibrary(LIBRARY_VALUE); + clientCodegen.setLibrary(JavaInflectorServerOptionsProvider.LIBRARY_VALUE); times = 1; - clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + clientCodegen.setFullJavaUtil(Boolean.valueOf(JavaInflectorServerOptionsProvider.FULL_JAVA_UTIL_VALUE)); times = 1; }}; } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java index 9cdac7d394b..29166bc8750 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java @@ -2,33 +2,26 @@ package io.swagger.codegen.java; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.options.JavaOptionsProvider; import io.swagger.codegen.languages.JavaClientCodegen; +import io.swagger.codegen.options.OptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class JavaClientOptionsTest extends AbstractOptionsTest { - protected static final String ARTIFACT_ID_VALUE = "swagger-java-client-test"; - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; - protected static final String SORT_PARAMS_VALUE = "false"; - protected static final String GROUP_ID_VALUE = "io.swagger.test"; - protected static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; - protected static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; - protected static final String LOCAL_PREFIX_VALUE = "tst"; - protected static final String LIBRARY_VALUE = "jersey2"; - protected static final String SERIALIZABLE_MODEL_VALUE = "false"; - protected static final String FULL_JAVA_UTIL_VALUE = "true"; - @Tested private JavaClientCodegen clientCodegen; + public JavaClientOptionsTest() { + super(new JavaOptionsProvider()); + } + + protected JavaClientOptionsTest(OptionsProvider optionsProvider) { + super(optionsProvider); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -37,48 +30,30 @@ public class JavaClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(JavaOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(JavaOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(JavaOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(JavaOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setGroupId(GROUP_ID_VALUE); + clientCodegen.setGroupId(JavaOptionsProvider.GROUP_ID_VALUE); times = 1; - clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + clientCodegen.setArtifactId(JavaOptionsProvider.ARTIFACT_ID_VALUE); times = 1; - clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + clientCodegen.setArtifactVersion(JavaOptionsProvider.ARTIFACT_VERSION_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(JavaOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; - clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + clientCodegen.setLocalVariablePrefix(JavaOptionsProvider.LOCAL_PREFIX_VALUE); times = 1; - clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + clientCodegen.setSerializableModel(Boolean.valueOf(JavaOptionsProvider.SERIALIZABLE_MODEL_VALUE)); times = 1; - clientCodegen.setLibrary(LIBRARY_VALUE); + clientCodegen.setLibrary(JavaOptionsProvider.LIBRARY_VALUE); times = 1; - clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + clientCodegen.setFullJavaUtil(Boolean.valueOf(JavaOptionsProvider.FULL_JAVA_UTIL_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) - .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) - .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) - .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) - .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) - .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE) - .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE) - .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) - .put(CodegenConstants.LIBRARY, LIBRARY_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java index 00f09ad036b..ac6288b7f1e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java @@ -3,6 +3,7 @@ package io.swagger.codegen.jaxrs; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.JaxRSServerCodegen; +import io.swagger.codegen.options.JaxRSServerOptionsProvider; import mockit.Expectations; import mockit.Tested; @@ -12,6 +13,10 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest { @Tested private JaxRSServerCodegen clientCodegen; + public JaxRSServerOptionsTest() { + super(new JaxRSServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -20,29 +25,29 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(JaxRSServerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(JaxRSServerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(JaxRSServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(JaxRSServerOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setGroupId(GROUP_ID_VALUE); + clientCodegen.setGroupId(JaxRSServerOptionsProvider.GROUP_ID_VALUE); times = 1; - clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + clientCodegen.setArtifactId(JaxRSServerOptionsProvider.ARTIFACT_ID_VALUE); times = 1; - clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + clientCodegen.setArtifactVersion(JaxRSServerOptionsProvider.ARTIFACT_VERSION_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(JaxRSServerOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; - clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + clientCodegen.setLocalVariablePrefix(JaxRSServerOptionsProvider.LOCAL_PREFIX_VALUE); times = 1; - clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + clientCodegen.setSerializableModel(Boolean.valueOf(JaxRSServerOptionsProvider.SERIALIZABLE_MODEL_VALUE)); times = 1; - clientCodegen.setLibrary(LIBRARY_VALUE); + clientCodegen.setLibrary(JaxRSServerOptionsProvider.LIBRARY_VALUE); times = 1; - clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + clientCodegen.setFullJavaUtil(Boolean.valueOf(JaxRSServerOptionsProvider.FULL_JAVA_UTIL_VALUE)); times = 1; }}; } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java index 5ad3eb33f2a..6b24bc6f251 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java @@ -2,24 +2,21 @@ package io.swagger.codegen.nodejs; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; -import io.swagger.codegen.languages.JavaClientCodegen; import io.swagger.codegen.languages.NodeJSServerCodegen; +import io.swagger.codegen.options.NodeJSServerOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class NodeJSServerOptionsTest extends AbstractOptionsTest { - private static final String MODEL_PACKAGE_VALUE = "package"; - private static final String API_PACKAGE_VALUE = "apiPackage"; - private static final String SORT_PARAMS_VALUE = "false"; @Tested private NodeJSServerCodegen clientCodegen; + public NodeJSServerOptionsTest() { + super(new NodeJSServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -28,21 +25,12 @@ public class NodeJSServerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(NodeJSServerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(NodeJSServerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(NodeJSServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java index f5108f6a620..33f20625e16 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java @@ -2,27 +2,21 @@ package io.swagger.codegen.objc; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.ObjcClientCodegen; +import io.swagger.codegen.options.ObjcClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class ObjcClientOptionsTest extends AbstractOptionsTest { - private static final String CLASS_PREFIX_VALUE = "SWGObjc"; - private static final String POD_NAME_VALUE = "SwaggerClientObjc"; - private static final String POD_VERSION_VALUE = "1.0.0-SNAPSHOT"; - private static final String AUTHOR_NAME_VALUE = "SwaggerObjc"; - private static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io"; - private static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen"; - private static final String LICENSE_VALUE = "MIT"; @Tested private ObjcClientCodegen clientCodegen; + public ObjcClientOptionsTest() { + super(new ObjcClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -31,33 +25,20 @@ public class ObjcClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setClassPrefix(CLASS_PREFIX_VALUE); + clientCodegen.setClassPrefix(ObjcClientOptionsProvider.CLASS_PREFIX_VALUE); times = 1; - clientCodegen.setPodName(POD_NAME_VALUE); + clientCodegen.setPodName(ObjcClientOptionsProvider.POD_NAME_VALUE); times = 1; - clientCodegen.setPodVersion(POD_VERSION_VALUE); + clientCodegen.setPodVersion(ObjcClientOptionsProvider.POD_VERSION_VALUE); times = 1; - clientCodegen.setAuthorName(AUTHOR_NAME_VALUE); + clientCodegen.setAuthorName(ObjcClientOptionsProvider.AUTHOR_NAME_VALUE); times = 1; - clientCodegen.setAuthorEmail(AUTHOR_EMAIL_VALUE); + clientCodegen.setAuthorEmail(ObjcClientOptionsProvider.AUTHOR_EMAIL_VALUE); times = 1; - clientCodegen.setGitRepoURL(GIT_REPO_URL_VALUE); + clientCodegen.setGitRepoURL(ObjcClientOptionsProvider.GIT_REPO_URL_VALUE); times = 1; - clientCodegen.setLicense(LICENSE_VALUE); + clientCodegen.setLicense(ObjcClientOptionsProvider.LICENSE_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(ObjcClientCodegen.CLASS_PREFIX, CLASS_PREFIX_VALUE) - .put(ObjcClientCodegen.POD_NAME, POD_NAME_VALUE) - .put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE) - .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE) - .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE) - .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE) - .put(ObjcClientCodegen.LICENSE, LICENSE_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java new file mode 100644 index 00000000000..6cd8e83467b --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class AkkaScalaClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "akka-scala"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java new file mode 100644 index 00000000000..12752d7b636 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java @@ -0,0 +1,45 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.AndroidClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class AndroidClientOptionsProvider implements OptionsProvider { + public static final String ARTIFACT_ID_VALUE = "swagger-java-client-test"; + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String GROUP_ID_VALUE = "io.swagger.test"; + public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; + public static final String ANDROID_MAVEN_GRADLE_PLUGIN_VALUE = "true"; + + @Override + public String getLanguage() { + return "android"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) + .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .put(AndroidClientCodegen.USE_ANDROID_MAVEN_GRADLE_PLUGIN, ANDROID_MAVEN_GRADLE_PLUGIN_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java new file mode 100644 index 00000000000..3a5daca3ba2 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class AsyncScalaClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "async-scala"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java new file mode 100644 index 00000000000..d7309b7baec --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java @@ -0,0 +1,30 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class CSharpClientOptionsProvider implements OptionsProvider { + public static final String PACKAGE_NAME_VALUE = "swagger_client_csharp"; + public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Override + public String getLanguage() { + return "csharp"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CsharpDotNet2ClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CsharpDotNet2ClientOptionsProvider.java new file mode 100644 index 00000000000..cbbd7b2f093 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CsharpDotNet2ClientOptionsProvider.java @@ -0,0 +1,33 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.CsharpDotNet2ClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class CsharpDotNet2ClientOptionsProvider implements OptionsProvider { + public static final String PACKAGE_NAME_VALUE = "swagger_client_csharp_dotnet"; + public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String CLIENT_PACKAGE_VALUE = "IO.Swagger.Client.Test"; + + @Override + public String getLanguage() { + return "CsharpDotNet2"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .put(CsharpDotNet2ClientCodegen.CLIENT_PACKAGE, CLIENT_PACKAGE_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java new file mode 100644 index 00000000000..07689da66da --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java @@ -0,0 +1,43 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.DartClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class DartClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "packagedart"; + public static final String API_PACKAGE_VALUE = "apiPackageDart"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String BROWSER_CLIENT_VALUE = "true"; + public static final String PUB_NAME_VALUE = "swagger"; + public static final String PUB_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String PUB_DESCRIPTION_VALUE = "Swagger API client dart"; + public static final String SOURCE_FOLDER_VALUE = "src"; + + @Override + public String getLanguage() { + return "dart"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(DartClientCodegen.BROWSER_CLIENT, BROWSER_CLIENT_VALUE) + .put(DartClientCodegen.PUB_NAME, PUB_NAME_VALUE) + .put(DartClientCodegen.PUB_VERSION, PUB_VERSION_VALUE) + .put(DartClientCodegen.PUB_DESCRIPTION, PUB_DESCRIPTION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/FlashClienOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/FlashClienOptionsProvider.java new file mode 100644 index 00000000000..1fcdc86271b --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/FlashClienOptionsProvider.java @@ -0,0 +1,34 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class FlashClienOptionsProvider implements OptionsProvider { + public static final String PACKAGE_NAME_VALUE = "io.swagger.flash"; + public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String INVOKER_PACKAGE_VALUE = "io.swagger.flash"; + public static final String SOURCE_FOLDER_VALUE = "src/main/flex/test"; + + @Override + public String getLanguage() { + return "flash"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaInflectorServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaInflectorServerOptionsProvider.java new file mode 100644 index 00000000000..25842a6fd7e --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaInflectorServerOptionsProvider.java @@ -0,0 +1,13 @@ +package io.swagger.codegen.options; + +public class JavaInflectorServerOptionsProvider extends JavaOptionsProvider { + @Override + public String getLanguage() { + return "inflector"; + } + + @Override + public boolean isServer() { + return true; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java new file mode 100644 index 00000000000..26d4c893236 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java @@ -0,0 +1,51 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.JavaClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class JavaOptionsProvider implements OptionsProvider { + public static final String ARTIFACT_ID_VALUE = "swagger-java-client-test"; + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String GROUP_ID_VALUE = "io.swagger.test"; + public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; + public static final String LOCAL_PREFIX_VALUE = "tst"; + public static final String LIBRARY_VALUE = "jersey2"; + public static final String SERIALIZABLE_MODEL_VALUE = "false"; + public static final String FULL_JAVA_UTIL_VALUE = "true"; + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) + .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE) + .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE) + .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) + .put(CodegenConstants.LIBRARY, LIBRARY_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } + + @Override + public String getLanguage() { + return "java"; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java new file mode 100644 index 00000000000..0b735363b77 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java @@ -0,0 +1,13 @@ +package io.swagger.codegen.options; + +public class JaxRSServerOptionsProvider extends JavaOptionsProvider { + @Override + public boolean isServer() { + return true; + } + + @Override + public String getLanguage() { + return "jaxrs"; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java new file mode 100644 index 00000000000..09500bd65ea --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class NodeJSServerOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "nodejs"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return true; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java new file mode 100644 index 00000000000..2f76199e4f3 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java @@ -0,0 +1,41 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.ObjcClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class ObjcClientOptionsProvider implements OptionsProvider { + public static final String CLASS_PREFIX_VALUE = "SWGObjc"; + public static final String POD_NAME_VALUE = "SwaggerClientObjc"; + public static final String POD_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String AUTHOR_NAME_VALUE = "SwaggerObjc"; + public static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io"; + public static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen"; + public static final String LICENSE_VALUE = "MIT"; + + @Override + public String getLanguage() { + return "objc"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(ObjcClientCodegen.CLASS_PREFIX, CLASS_PREFIX_VALUE) + .put(ObjcClientCodegen.POD_NAME, POD_NAME_VALUE) + .put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE) + .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE) + .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE) + .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE) + .put(ObjcClientCodegen.LICENSE, LICENSE_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/OptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/OptionsProvider.java new file mode 100644 index 00000000000..5521a78432b --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/OptionsProvider.java @@ -0,0 +1,9 @@ +package io.swagger.codegen.options; + +import java.util.Map; + +public interface OptionsProvider { + String getLanguage(); + Map createOptions(); + boolean isServer(); +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java new file mode 100644 index 00000000000..5bf55f4d160 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java @@ -0,0 +1,30 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.languages.PerlClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class PerlClientOptionsProvider implements OptionsProvider { + public static final String MODULE_NAME_VALUE = ""; + public static final String MODULE_VERSION_VALUE = ""; + + @Override + public String getLanguage() { + return "perl"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(PerlClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) + .put(PerlClientCodegen.MODULE_VERSION, MODULE_VERSION_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java new file mode 100644 index 00000000000..fd1fbabbe5d --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java @@ -0,0 +1,47 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.PhpClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class PhpClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String VARIABLE_NAMING_CONVENTION_VALUE = "snake_case"; + public static final String INVOKER_PACKAGE_VALUE = "Swagger\\Client\\Php"; + public static final String PACKAGE_PATH_VALUE = "SwaggerClient-php"; + public static final String SRC_BASE_PATH_VALUE = "libPhp"; + public static final String COMPOSER_VENDOR_NAME_VALUE = "swaggerPhp"; + public static final String COMPOSER_PROJECT_NAME_VALUE = "swagger-client-php"; + public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Override + public String getLanguage() { + return "php"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(PhpClientCodegen.VARIABLE_NAMING_CONVENTION, VARIABLE_NAMING_CONVENTION_VALUE) + .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) + .put(PhpClientCodegen.PACKAGE_PATH, PACKAGE_PATH_VALUE) + .put(PhpClientCodegen.SRC_BASE_PATH, SRC_BASE_PATH_VALUE) + .put(PhpClientCodegen.COMPOSER_VENDOR_NAME, COMPOSER_VENDOR_NAME_VALUE) + .put(PhpClientCodegen.COMPOSER_PROJECT_NAME, COMPOSER_PROJECT_NAME_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PythonClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PythonClientOptionsProvider.java new file mode 100644 index 00000000000..1d89933a746 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PythonClientOptionsProvider.java @@ -0,0 +1,30 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class PythonClientOptionsProvider implements OptionsProvider { + public static final String PACKAGE_NAME_VALUE = "swagger_client_python"; + public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Override + public String getLanguage() { + return "python"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java new file mode 100644 index 00000000000..1deb7a99afc --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class Qt5CPPOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "qt5cpp"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java new file mode 100644 index 00000000000..94f15cc1def --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.languages.RubyClientCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class RubyClientOptionsProvider implements OptionsProvider { + public static final String GEM_NAME_VALUE = "swagger_client_ruby"; + public static final String MODULE_NAME_VALUE = "SwaggerClientRuby"; + public static final String GEM_VERSION_VALUE = "1.0.0-SNAPSHOT"; + + @Override + public String getLanguage() { + return "ruby"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(RubyClientCodegen.GEM_NAME, GEM_NAME_VALUE) + .put(RubyClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) + .put(RubyClientCodegen.GEM_VERSION, GEM_VERSION_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java new file mode 100644 index 00000000000..5d9b80b2670 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class ScalaClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "scala"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java new file mode 100644 index 00000000000..0e237f1b1e9 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class ScalatraServerOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "scalatra"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return true; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java new file mode 100644 index 00000000000..35d290ada7a --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class SilexServerOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "silex-PHP"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return true; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SinatraServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SinatraServerOptionsProvider.java new file mode 100644 index 00000000000..d4a830dc203 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SinatraServerOptionsProvider.java @@ -0,0 +1,23 @@ +package io.swagger.codegen.options; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class SinatraServerOptionsProvider implements OptionsProvider { + @Override + public String getLanguage() { + return "sinatra"; + } + + @Override + public Map createOptions() { + //SinatraServerCodegen doesn't have its own options and base options are cleared + return ImmutableMap.of(); + } + + @Override + public boolean isServer() { + return true; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java new file mode 100644 index 00000000000..13a3600918d --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java @@ -0,0 +1,27 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.languages.SpringMVCServerCodegen; + +import java.util.HashMap; +import java.util.Map; + +public class SpringMVCServerOptionsProvider extends JavaOptionsProvider { + public static final String CONFIG_PACKAGE_VALUE = "configPackage"; + + @Override + public String getLanguage() { + return "spring-mvc"; + } + + @Override + public Map createOptions() { + Map options = new HashMap(super.createOptions()); + options.put(SpringMVCServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE); + return options; + } + + @Override + public boolean isServer() { + return true; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java new file mode 100644 index 00000000000..fcef6a436cf --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class StaticDocOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "dynamic-html"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java new file mode 100644 index 00000000000..d0067b60117 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class StaticHtmlOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "html"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java new file mode 100644 index 00000000000..81b8059b9e9 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class SwaggerOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "swagger"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java new file mode 100644 index 00000000000..f611dc9c88c --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class SwaggerYamlOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "swagger-yaml"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java new file mode 100644 index 00000000000..c5600d4f590 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java @@ -0,0 +1,62 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.SwiftCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class SwiftOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String PROJECT_NAME_VALUE = "Swagger"; + public static final String RESPONSE_AS_VALUE = "test"; + public static final String UNWRAP_REQUIRED_VALUE = "true"; + public static final String POD_SOURCE_VALUE = "{ :git => 'git@github.com:swagger-api/swagger-mustache.git'," + + " :tag => 'v1.0.0-SNAPSHOT' }"; + public static final String POD_VERSION_VALUE = "v1.0.0-SNAPSHOT"; + public static final String POD_AUTHORS_VALUE = "podAuthors"; + public static final String POD_SOCIAL_MEDIA_URL_VALUE = "podSocialMediaURL"; + public static final String POD_DOCSET_URL_VALUE = "podDocsetURL"; + public static final String POD_LICENSE_VALUE = "'Apache License, Version 2.0'"; + public static final String POD_HOMEPAGE_VALUE = "podHomepage"; + public static final String POD_SUMMARY_VALUE = "podSummary"; + public static final String POD_DESCRIPTION_VALUE = "podDescription"; + public static final String POD_SCREENSHOTS_VALUE = "podScreenshots"; + public static final String POD_DOCUMENTATION_URL_VALUE = "podDocumentationURL"; + + @Override + public String getLanguage() { + return "swift"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(SwiftCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) + .put(SwiftCodegen.RESPONSE_AS, RESPONSE_AS_VALUE) + .put(SwiftCodegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE) + .put(SwiftCodegen.POD_SOURCE, POD_SOURCE_VALUE) + .put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE) + .put(SwiftCodegen.POD_AUTHORS, POD_AUTHORS_VALUE) + .put(SwiftCodegen.POD_SOCIAL_MEDIA_URL, POD_SOCIAL_MEDIA_URL_VALUE) + .put(SwiftCodegen.POD_DOCSET_URL, POD_DOCSET_URL_VALUE) + .put(SwiftCodegen.POD_LICENSE, POD_LICENSE_VALUE) + .put(SwiftCodegen.POD_HOMEPAGE, POD_HOMEPAGE_VALUE) + .put(SwiftCodegen.POD_SUMMARY, POD_SUMMARY_VALUE) + .put(SwiftCodegen.POD_DESCRIPTION, POD_DESCRIPTION_VALUE) + .put(SwiftCodegen.POD_SCREENSHOTS, POD_SCREENSHOTS_VALUE) + .put(SwiftCodegen.POD_DOCUMENTATION_URL, POD_DOCUMENTATION_URL_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java new file mode 100644 index 00000000000..796aabc6b31 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class TizenClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "tizen"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java new file mode 100644 index 00000000000..24ce25b4578 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class TypeScriptAngularClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "typescript-angular"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java new file mode 100644 index 00000000000..5da5c01c991 --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java @@ -0,0 +1,32 @@ +package io.swagger.codegen.options; + +import io.swagger.codegen.CodegenConstants; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class TypeScriptNodeClientOptionsProvider implements OptionsProvider { + public static final String MODEL_PACKAGE_VALUE = "package"; + public static final String API_PACKAGE_VALUE = "apiPackage"; + public static final String SORT_PARAMS_VALUE = "false"; + + @Override + public String getLanguage() { + return "typescript-node"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) + .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java index ccef4929d8d..d85b0c9dbc1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java @@ -2,22 +2,21 @@ package io.swagger.codegen.perl; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.PerlClientCodegen; +import io.swagger.codegen.options.PerlClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class PerlClientOptionsTest extends AbstractOptionsTest { - private static final String MODULE_NAME_VALUE = ""; - private static final String MODULE_VERSION_VALUE = ""; @Tested private PerlClientCodegen clientCodegen; + public PerlClientOptionsTest() { + super(new PerlClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -26,18 +25,10 @@ public class PerlClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModuleName(MODULE_NAME_VALUE); + clientCodegen.setModuleName(PerlClientOptionsProvider.MODULE_NAME_VALUE); times = 1; - clientCodegen.setModuleVersion(MODULE_VERSION_VALUE); + clientCodegen.setModuleVersion(PerlClientOptionsProvider.MODULE_VERSION_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(PerlClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) - .put(PerlClientCodegen.MODULE_VERSION, MODULE_VERSION_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java index 413ee538053..e50185a3e8d 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java @@ -2,30 +2,21 @@ package io.swagger.codegen.php; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.PhpClientCodegen; +import io.swagger.codegen.options.PhpClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class PhpClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; - protected static final String VARIABLE_NAMING_CONVENTION_VALUE = "snake_case"; - protected static final String INVOKER_PACKAGE_VALUE = "Swagger\\Client\\Php"; - protected static final String PACKAGE_PATH_VALUE = "SwaggerClient-php"; - protected static final String SRC_BASE_PATH_VALUE = "libPhp"; - protected static final String COMPOSER_VENDOR_NAME_VALUE = "swaggerPhp"; - protected static final String COMPOSER_PROJECT_NAME_VALUE = "swagger-client-php"; - protected static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; @Tested private PhpClientCodegen clientCodegen; + public PhpClientOptionsTest() { + super(new PhpClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -34,42 +25,26 @@ public class PhpClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(PhpClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(PhpClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(PhpClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setParameterNamingConvention(VARIABLE_NAMING_CONVENTION_VALUE); + clientCodegen.setParameterNamingConvention(PhpClientOptionsProvider.VARIABLE_NAMING_CONVENTION_VALUE); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(PhpClientOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setPackagePath(PACKAGE_PATH_VALUE); + clientCodegen.setPackagePath(PhpClientOptionsProvider.PACKAGE_PATH_VALUE); times = 1; - clientCodegen.setSrcBasePath(SRC_BASE_PATH_VALUE); + clientCodegen.setSrcBasePath(PhpClientOptionsProvider.SRC_BASE_PATH_VALUE); times = 1; - clientCodegen.setComposerVendorName(COMPOSER_VENDOR_NAME_VALUE); + clientCodegen.setComposerVendorName(PhpClientOptionsProvider.COMPOSER_VENDOR_NAME_VALUE); times = 1; - clientCodegen.setComposerProjectName(COMPOSER_PROJECT_NAME_VALUE); + clientCodegen.setComposerProjectName(PhpClientOptionsProvider.COMPOSER_PROJECT_NAME_VALUE); times = 1; - clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + clientCodegen.setArtifactVersion(PhpClientOptionsProvider.ARTIFACT_VERSION_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .put(PhpClientCodegen.VARIABLE_NAMING_CONVENTION, VARIABLE_NAMING_CONVENTION_VALUE) - .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) - .put(PhpClientCodegen.PACKAGE_PATH, PACKAGE_PATH_VALUE) - .put(PhpClientCodegen.SRC_BASE_PATH, SRC_BASE_PATH_VALUE) - .put(PhpClientCodegen.COMPOSER_VENDOR_NAME, COMPOSER_VENDOR_NAME_VALUE) - .put(PhpClientCodegen.COMPOSER_PROJECT_NAME, COMPOSER_PROJECT_NAME_VALUE) - .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java index 645471789e8..fc68a9e92e1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java @@ -2,22 +2,21 @@ package io.swagger.codegen.python; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.PythonClientCodegen; +import io.swagger.codegen.options.PythonClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class PythonClientOptionsTest extends AbstractOptionsTest { - protected static final String PACKAGE_NAME_VALUE = "swagger_client_python"; - protected static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; @Tested private PythonClientCodegen clientCodegen; + public PythonClientOptionsTest() { + super(new PythonClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -26,18 +25,10 @@ public class PythonClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setPackageName(PACKAGE_NAME_VALUE); + clientCodegen.setPackageName(PythonClientOptionsProvider.PACKAGE_NAME_VALUE); times = 1; - clientCodegen.setPackageVersion(PACKAGE_VERSION_VALUE); + clientCodegen.setPackageVersion(PythonClientOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) - .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java index 8a578e86416..c7bb169de21 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.qtfivecpp; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.Qt5CPPGenerator; +import io.swagger.codegen.options.Qt5CPPOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class Qt5CPPOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private Qt5CPPGenerator clientCodegen; + public Qt5CPPOptionsTest() { + super(new Qt5CPPOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class Qt5CPPOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(Qt5CPPOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(Qt5CPPOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(Qt5CPPOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java index ca2ea19a2d9..b679de923c8 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java @@ -3,21 +3,20 @@ package io.swagger.codegen.ruby; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.languages.RubyClientCodegen; +import io.swagger.codegen.options.RubyClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class RubyClientOptionsTest extends AbstractOptionsTest { - private static final String GEM_NAME_VALUE = "swagger_client_ruby"; - private static final String MODULE_NAME_VALUE = "SwaggerClientRuby"; - private static final String GEM_VERSION_VALUE = "1.0.0-SNAPSHOT"; @Tested private RubyClientCodegen clientCodegen; + public RubyClientOptionsTest() { + super(new RubyClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -26,21 +25,12 @@ public class RubyClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setGemName(GEM_NAME_VALUE); + clientCodegen.setGemName(RubyClientOptionsProvider.GEM_NAME_VALUE); times = 1; - clientCodegen.setModuleName(MODULE_NAME_VALUE); + clientCodegen.setModuleName(RubyClientOptionsProvider.MODULE_NAME_VALUE); times = 1; - clientCodegen.setGemVersion(GEM_VERSION_VALUE); + clientCodegen.setGemVersion(RubyClientOptionsProvider.GEM_VERSION_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(RubyClientCodegen.GEM_NAME, GEM_NAME_VALUE) - .put(RubyClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) - .put(RubyClientCodegen.GEM_VERSION, GEM_VERSION_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java index 91f961f8d7c..0e916aebd76 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.scala; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.ScalaClientCodegen; +import io.swagger.codegen.options.ScalaClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class ScalaClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private ScalaClientCodegen clientCodegen; + public ScalaClientOptionsTest() { + super(new ScalaClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class ScalaClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(ScalaClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(ScalaClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(ScalaClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java index 0f85a2f9450..49bbe4373b6 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.scalatra; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.ScalatraServerCodegen; +import io.swagger.codegen.options.ScalatraServerOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class ScalatraServerOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private ScalatraServerCodegen clientCodegen; + public ScalatraServerOptionsTest() { + super(new ScalatraServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class ScalatraServerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(ScalatraServerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(ScalatraServerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(ScalatraServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java index 073c274b6ca..54635f02799 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.silex; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.SilexServerCodegen; +import io.swagger.codegen.options.SilexServerOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class SilexServerOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private SilexServerCodegen clientCodegen; + public SilexServerOptionsTest() { + super(new SilexServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class SilexServerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(SilexServerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(SilexServerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SilexServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java index 854b9f05341..6691cf27f86 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java @@ -3,18 +3,20 @@ package io.swagger.codegen.sinatra; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.languages.SinatraServerCodegen; +import io.swagger.codegen.options.SinatraServerOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class SinatraServerOptionsTest extends AbstractOptionsTest { @Tested private SinatraServerCodegen clientCodegen; + public SinatraServerOptionsTest() { + super(new SinatraServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -25,10 +27,4 @@ public class SinatraServerOptionsTest extends AbstractOptionsTest { new Expectations(clientCodegen) {{ }}; } - - @Override - protected Map getAvaliableOptions() { - //SinatraServerCodegen doesn't have its own options and base options are cleared - return ImmutableMap.of(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java index 8781ffebb53..d4b984ffcd2 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java @@ -1,25 +1,22 @@ package io.swagger.codegen.springmvc; -import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.java.JavaClientOptionsTest; -import io.swagger.codegen.languages.JavaClientCodegen; import io.swagger.codegen.languages.SpringMVCServerCodegen; +import io.swagger.codegen.options.SpringMVCServerOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.HashMap; -import java.util.Map; - public class SpringMVCServerOptionsTest extends JavaClientOptionsTest { - protected static final String CONFIG_PACKAGE_VALUE = "configPackage"; @Tested private SpringMVCServerCodegen clientCodegen; + public SpringMVCServerOptionsTest() { + super(new SpringMVCServerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -28,39 +25,32 @@ public class SpringMVCServerOptionsTest extends JavaClientOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(SpringMVCServerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(SpringMVCServerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SpringMVCServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setInvokerPackage(INVOKER_PACKAGE_VALUE); + clientCodegen.setInvokerPackage(SpringMVCServerOptionsProvider.INVOKER_PACKAGE_VALUE); times = 1; - clientCodegen.setGroupId(GROUP_ID_VALUE); + clientCodegen.setGroupId(SpringMVCServerOptionsProvider.GROUP_ID_VALUE); times = 1; - clientCodegen.setArtifactId(ARTIFACT_ID_VALUE); + clientCodegen.setArtifactId(SpringMVCServerOptionsProvider.ARTIFACT_ID_VALUE); times = 1; - clientCodegen.setArtifactVersion(ARTIFACT_VERSION_VALUE); + clientCodegen.setArtifactVersion(SpringMVCServerOptionsProvider.ARTIFACT_VERSION_VALUE); times = 1; - clientCodegen.setSourceFolder(SOURCE_FOLDER_VALUE); + clientCodegen.setSourceFolder(SpringMVCServerOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; - clientCodegen.setLocalVariablePrefix(LOCAL_PREFIX_VALUE); + clientCodegen.setLocalVariablePrefix(SpringMVCServerOptionsProvider.LOCAL_PREFIX_VALUE); times = 1; - clientCodegen.setSerializableModel(Boolean.valueOf(SERIALIZABLE_MODEL_VALUE)); + clientCodegen.setSerializableModel(Boolean.valueOf(SpringMVCServerOptionsProvider.SERIALIZABLE_MODEL_VALUE)); times = 1; - clientCodegen.setLibrary(LIBRARY_VALUE); + clientCodegen.setLibrary(SpringMVCServerOptionsProvider.LIBRARY_VALUE); times = 1; - clientCodegen.setFullJavaUtil(Boolean.valueOf(FULL_JAVA_UTIL_VALUE)); + clientCodegen.setFullJavaUtil(Boolean.valueOf(SpringMVCServerOptionsProvider.FULL_JAVA_UTIL_VALUE)); times = 1; - clientCodegen.setConfigPackage(CONFIG_PACKAGE_VALUE); + clientCodegen.setConfigPackage(SpringMVCServerOptionsProvider.CONFIG_PACKAGE_VALUE); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - Map options = new HashMap(super.getAvaliableOptions()); - options.put(SpringMVCServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE); - return options; - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java index 58b9da82828..5ae4064c4ec 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.staticDocs; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.StaticDocCodegen; +import io.swagger.codegen.options.StaticDocOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class StaticDocOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private StaticDocCodegen clientCodegen; + public StaticDocOptionsTest() { + super(new StaticDocOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class StaticDocOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(StaticDocOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(StaticDocOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(StaticDocOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java index c3857b9a014..c09ada506f0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.statichtml; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.StaticHtmlGenerator; +import io.swagger.codegen.options.StaticHtmlOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class StaticHtmlOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private StaticHtmlGenerator clientCodegen; + public StaticHtmlOptionsTest() { + super(new StaticHtmlOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class StaticHtmlOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(StaticHtmlOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(StaticHtmlOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(StaticHtmlOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java index 62e25b20d74..85368a44486 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.swagger; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.SwaggerGenerator; +import io.swagger.codegen.options.SwaggerOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class SwaggerOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private SwaggerGenerator clientCodegen; + public SwaggerOptionsTest() { + super(new SwaggerOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class SwaggerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(SwaggerOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(SwaggerOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SwaggerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java index b86ac712b2a..5ea5a7c346b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.swaggeryaml; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.SwaggerYamlGenerator; +import io.swagger.codegen.options.SwaggerYamlOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class SwaggerYamlOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private SwaggerYamlGenerator clientCodegen; + public SwaggerYamlOptionsTest() { + super(new SwaggerYamlOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class SwaggerYamlOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(SwaggerYamlOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(SwaggerYamlOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SwaggerYamlOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java index 82ff69e8590..f76f1500f8b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java @@ -2,38 +2,21 @@ package io.swagger.codegen.swift; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.SwiftCodegen; +import io.swagger.codegen.options.SwiftOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class SwiftOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; - protected static final String PROJECT_NAME_VALUE = "Swagger"; - protected static final String RESPONSE_AS_VALUE = "test"; - protected static final String UNWRAP_REQUIRED_VALUE = "true"; - protected static final String POD_SOURCE_VALUE = "{ :git => 'git@github.com:swagger-api/swagger-mustache.git'," + - " :tag => 'v1.0.0-SNAPSHOT' }"; - protected static final String POD_VERSION_VALUE = "v1.0.0-SNAPSHOT"; - protected static final String POD_AUTHORS_VALUE = "podAuthors"; - protected static final String POD_SOCIAL_MEDIA_URL_VALUE = "podSocialMediaURL"; - protected static final String POD_DOCSET_URL_VALUE = "podDocsetURL"; - protected static final String POD_LICENSE_VALUE = "'Apache License, Version 2.0'"; - protected static final String POD_HOMEPAGE_VALUE = "podHomepage"; - protected static final String POD_SUMMARY_VALUE = "podSummary"; - protected static final String POD_DESCRIPTION_VALUE = "podDescription"; - protected static final String POD_SCREENSHOTS_VALUE = "podScreenshots"; - protected static final String POD_DOCUMENTATION_URL_VALUE = "podDocumentationURL"; @Tested private SwiftCodegen clientCodegen; + public SwiftOptionsTest() { + super(new SwiftOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -42,41 +25,18 @@ public class SwiftOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(SwiftOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(SwiftOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SwiftOptionsProvider.SORT_PARAMS_VALUE)); times = 1; - clientCodegen.setProjectName(PROJECT_NAME_VALUE); + clientCodegen.setProjectName(SwiftOptionsProvider.PROJECT_NAME_VALUE); times = 1; - clientCodegen.setResponseAs(RESPONSE_AS_VALUE.split(",")); + clientCodegen.setResponseAs(SwiftOptionsProvider.RESPONSE_AS_VALUE.split(",")); times = 1; - clientCodegen.setUnwrapRequired(Boolean.valueOf(UNWRAP_REQUIRED_VALUE)); + clientCodegen.setUnwrapRequired(Boolean.valueOf(SwiftOptionsProvider.UNWRAP_REQUIRED_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .put(SwiftCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) - .put(SwiftCodegen.RESPONSE_AS, RESPONSE_AS_VALUE) - .put(SwiftCodegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE) - .put(SwiftCodegen.POD_SOURCE, POD_SOURCE_VALUE) - .put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE) - .put(SwiftCodegen.POD_AUTHORS, POD_AUTHORS_VALUE) - .put(SwiftCodegen.POD_SOCIAL_MEDIA_URL, POD_SOCIAL_MEDIA_URL_VALUE) - .put(SwiftCodegen.POD_DOCSET_URL, POD_DOCSET_URL_VALUE) - .put(SwiftCodegen.POD_LICENSE, POD_LICENSE_VALUE) - .put(SwiftCodegen.POD_HOMEPAGE, POD_HOMEPAGE_VALUE) - .put(SwiftCodegen.POD_SUMMARY, POD_SUMMARY_VALUE) - .put(SwiftCodegen.POD_DESCRIPTION, POD_DESCRIPTION_VALUE) - .put(SwiftCodegen.POD_SCREENSHOTS, POD_SCREENSHOTS_VALUE) - .put(SwiftCodegen.POD_DOCUMENTATION_URL, POD_DOCUMENTATION_URL_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java index 4d7038b9683..670c32017de 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.tizen; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.TizenClientCodegen; +import io.swagger.codegen.options.TizenClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class TizenClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private TizenClientCodegen clientCodegen; + public TizenClientOptionsTest() { + super(new TizenClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class TizenClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(TizenClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(TizenClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TizenClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java index cfd63578997..d8e6589f17a 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.typescriptangular; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.TypeScriptAngularClientCodegen; +import io.swagger.codegen.options.TypeScriptAngularClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class TypeScriptAngularClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private TypeScriptAngularClientCodegen clientCodegen; + public TypeScriptAngularClientOptionsTest() { + super(new TypeScriptAngularClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class TypeScriptAngularClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(TypeScriptAngularClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(TypeScriptAngularClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TypeScriptAngularClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java index f23c01bf753..7d94f21f048 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java @@ -2,23 +2,21 @@ package io.swagger.codegen.typescriptnode; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.TypeScriptNodeClientCodegen; +import io.swagger.codegen.options.TypeScriptNodeClientOptionsProvider; -import com.google.common.collect.ImmutableMap; import mockit.Expectations; import mockit.Tested; -import java.util.Map; - public class TypeScriptNodeClientOptionsTest extends AbstractOptionsTest { - protected static final String MODEL_PACKAGE_VALUE = "package"; - protected static final String API_PACKAGE_VALUE = "apiPackage"; - protected static final String SORT_PARAMS_VALUE = "false"; @Tested private TypeScriptNodeClientCodegen clientCodegen; + public TypeScriptNodeClientOptionsTest() { + super(new TypeScriptNodeClientOptionsProvider()); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; @@ -27,21 +25,12 @@ public class TypeScriptNodeClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(MODEL_PACKAGE_VALUE); + clientCodegen.setModelPackage(TypeScriptNodeClientOptionsProvider.MODEL_PACKAGE_VALUE); times = 1; - clientCodegen.setApiPackage(API_PACKAGE_VALUE); + clientCodegen.setApiPackage(TypeScriptNodeClientOptionsProvider.API_PACKAGE_VALUE); times = 1; - clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SORT_PARAMS_VALUE)); + clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TypeScriptNodeClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; } - - @Override - protected Map getAvaliableOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - .build(); - } } diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index 4f8794c331b..bfdb17e9f0e 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -149,6 +149,13 @@ swagger-codegen ${project.parent.version} + + io.swagger + swagger-codegen + ${project.parent.version} + test-jar + test + ch.qos.logback logback-classic diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index 18e883effbf..fd095e6c198 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.Map; public class Generator { static Logger LOGGER = LoggerFactory.getLogger(Generator.class); diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java index e6eb42abb35..31262a24a9a 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java @@ -2,14 +2,45 @@ package io.swagger.generator.online; import static org.testng.Assert.assertNotEquals; +import io.swagger.codegen.options.AkkaScalaClientOptionsProvider; +import io.swagger.codegen.options.AndroidClientOptionsProvider; +import io.swagger.codegen.options.AsyncScalaClientOptionsProvider; +import io.swagger.codegen.options.CSharpClientOptionsProvider; +import io.swagger.codegen.options.CsharpDotNet2ClientOptionsProvider; +import io.swagger.codegen.options.DartClientOptionsProvider; +import io.swagger.codegen.options.FlashClienOptionsProvider; +import io.swagger.codegen.options.JavaInflectorServerOptionsProvider; +import io.swagger.codegen.options.JavaOptionsProvider; +import io.swagger.codegen.options.JaxRSServerOptionsProvider; +import io.swagger.codegen.options.NodeJSServerOptionsProvider; +import io.swagger.codegen.options.ObjcClientOptionsProvider; +import io.swagger.codegen.options.OptionsProvider; +import io.swagger.codegen.options.PerlClientOptionsProvider; +import io.swagger.codegen.options.PhpClientOptionsProvider; +import io.swagger.codegen.options.PythonClientOptionsProvider; +import io.swagger.codegen.options.Qt5CPPOptionsProvider; +import io.swagger.codegen.options.RubyClientOptionsProvider; +import io.swagger.codegen.options.ScalaClientOptionsProvider; +import io.swagger.codegen.options.ScalatraServerOptionsProvider; +import io.swagger.codegen.options.SilexServerOptionsProvider; +import io.swagger.codegen.options.SinatraServerOptionsProvider; +import io.swagger.codegen.options.SpringMVCServerOptionsProvider; +import io.swagger.codegen.options.StaticDocOptionsProvider; +import io.swagger.codegen.options.StaticHtmlOptionsProvider; +import io.swagger.codegen.options.SwaggerOptionsProvider; +import io.swagger.codegen.options.SwaggerYamlOptionsProvider; +import io.swagger.codegen.options.SwiftOptionsProvider; +import io.swagger.codegen.options.TizenClientOptionsProvider; +import io.swagger.codegen.options.TypeScriptAngularClientOptionsProvider; +import io.swagger.codegen.options.TypeScriptNodeClientOptionsProvider; import io.swagger.generator.exception.ApiException; import io.swagger.generator.model.GeneratorInput; -import io.swagger.generator.online.Generator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import java.io.File; @@ -19,19 +50,33 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -public abstract class OnlineGeneratorOptionsTest { - private final boolean isServer; - private final String language; +public class OnlineGeneratorOptionsTest { + private static final String OPTIONS_PROVIDER = "optionsProvider"; - protected OnlineGeneratorOptionsTest(String language, boolean isServer) { - this.language = language; - this.isServer = isServer; + @DataProvider(name = OPTIONS_PROVIDER) + private Object[][] listOptions() { + return new Object[][]{{new AkkaScalaClientOptionsProvider()}, {new AndroidClientOptionsProvider()}, + {new AsyncScalaClientOptionsProvider()}, {new CSharpClientOptionsProvider()}, + {new CsharpDotNet2ClientOptionsProvider()}, {new DartClientOptionsProvider()}, + {new FlashClienOptionsProvider()}, {new JavaInflectorServerOptionsProvider()}, + {new JavaOptionsProvider()}, {new JaxRSServerOptionsProvider()}, + {new NodeJSServerOptionsProvider()}, {new ObjcClientOptionsProvider()}, + {new PerlClientOptionsProvider()}, {new PhpClientOptionsProvider()}, + {new PythonClientOptionsProvider()}, {new Qt5CPPOptionsProvider()}, + {new RubyClientOptionsProvider()}, {new ScalaClientOptionsProvider()}, + {new ScalatraServerOptionsProvider()}, {new SilexServerOptionsProvider()}, + {new SinatraServerOptionsProvider()}, {new SpringMVCServerOptionsProvider()}, + {new StaticDocOptionsProvider()}, {new StaticHtmlOptionsProvider()}, + {new SwaggerOptionsProvider()}, {new SwaggerYamlOptionsProvider()}, + {new SwiftOptionsProvider()}, {new TizenClientOptionsProvider()}, + {new TypeScriptAngularClientOptionsProvider()}, {new TypeScriptNodeClientOptionsProvider()}, + }; } - @Test - public void optionsTest() throws ApiException, IOException { + @Test(dataProvider = OPTIONS_PROVIDER) + public void optionsTest(OptionsProvider provider) throws ApiException, IOException { final GeneratorInput input = new GeneratorInput(); - final HashMap options = convertOptions(); + final HashMap options = convertOptions(provider); final Maps.EntryTransformer transformer = new Maps.EntryTransformer() { @@ -44,10 +89,10 @@ public abstract class OnlineGeneratorOptionsTest { final ObjectMapper mapper = new ObjectMapper(); input.setSpec(mapper.readTree(loadClassResource(getClass(), "petstore.json"))); String outputFilename; - if (isServer) { - outputFilename = Generator.generateServer(language, input); + if (provider.isServer()) { + outputFilename = Generator.generateServer(provider.getLanguage(), input); } else { - outputFilename = Generator.generateClient(language, input); + outputFilename = Generator.generateClient(provider.getLanguage(), input); } final File dir = new File(new File(outputFilename).getParent()); FileUtils.deleteDirectory(dir); @@ -57,11 +102,9 @@ public abstract class OnlineGeneratorOptionsTest { } } - protected abstract Map getOptions(); - - private HashMap convertOptions() { + private HashMap convertOptions(OptionsProvider provider) { HashMap options = new HashMap(); - for (Map.Entry entry : getOptions().entrySet()) { + for (Map.Entry entry : provider.createOptions().entrySet()) { options.put(entry.getKey(), new InvocationCounter(entry.getValue())); } return options; diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java deleted file mode 100644 index 50605cff110..00000000000 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.swagger.generator.online; - -import com.google.common.collect.ImmutableMap; - -import java.util.Map; - -public class OnlineJavaClientOptionsTest extends OnlineGeneratorOptionsTest { - - public OnlineJavaClientOptionsTest() { - super("java", false); - } - - protected OnlineJavaClientOptionsTest(String language, boolean isServer) { - super(language, isServer); - } - - @Override - protected Map getOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put("modelPackage", "package") - .put("apiPackage", "apiPackage") - .put("sortParamsByRequiredFlag", "false") - .put("invokerPackage", "io.swagger.client.test") - .put("groupId", "io.swagger.test") - .put("artifactId", "swagger-java-client-test") - .put("artifactVersion", "1.0.0-SNAPSHOT") - .put("sourceFolder", "src/main/java/test") - .put("localVariablePrefix", "tst") - .put("serializableModel", "false") - .put("fullJavaUtil", "true") - .put("library", "jersey2") - .build(); - } -} diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJaxRSServerOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJaxRSServerOptionsTest.java deleted file mode 100644 index c64466fe696..00000000000 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJaxRSServerOptionsTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.swagger.generator.online; - -public class OnlineJaxRSServerOptionsTest extends OnlineJavaClientOptionsTest{ - - public OnlineJaxRSServerOptionsTest() { - super("jaxrs", true); - } - -} From 8565975b9998f8c30b6db1e3c31dfd7fc8d0caa1 Mon Sep 17 00:00:00 2001 From: Richard Baverstock Date: Fri, 30 Oct 2015 11:44:55 -0700 Subject: [PATCH 023/142] Issue 1461 Add float and double handling to functions in SWGHelpers.cpp --- .../src/main/resources/qt5cpp/helpers-body.mustache | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache index 7f4d748c2dc..c96e30666a8 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache @@ -25,6 +25,14 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) { qint64 *val = static_cast(value); *val = obj.toVariant().toLongLong(); } + else if(QStringLiteral("float").compare(type) == 0) { + float *val = static_cast(value); + *val = obj.toDouble(); + } + else if(QStringLiteral("double").compare(type) == 0) { + double *val = static_cast(value); + *val = obj.toDouble(); + } else if (QStringLiteral("QString").compare(type) == 0) { QString **val = static_cast(value); From 97a28165c71141013cfa3e5d92b231740f668264 Mon Sep 17 00:00:00 2001 From: Richard Baverstock Date: Fri, 30 Oct 2015 11:48:48 -0700 Subject: [PATCH 024/142] Additional locations where float/double handling is needed --- .../resources/qt5cpp/helpers-body.mustache | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache index c96e30666a8..7bd9b3f46cc 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache @@ -94,6 +94,16 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) { setValue(&val, jval, QStringLiteral("bool"), QStringLiteral("")); output->append((void*)&val); } + else if(QStringLiteral("float").compare(complexType) == 0) { + float val; + setValue(&val, jval, QStringLiteral("float"), QStringLiteral("")); + output->append((void*)&val); + } + else if(QStringLiteral("double").compare(complexType) == 0) { + double val; + setValue(&val, jval, QStringLiteral("double"), QStringLiteral("")); + output->append((void*)&val); + } } } QList **val = static_cast**>(value); @@ -139,6 +149,14 @@ toJsonValue(QString name, void* value, QJsonObject* output, QString type) { bool* str = static_cast(value); output->insert(name, QJsonValue(*str)); } + else if(QStringLiteral("float").compare(type) == 0) { + float* str = static_cast(value); + output->insert(name, QJsonValue((double)*str)); + } + else if(QStringLiteral("double").compare(type) == 0) { + double* str = static_cast(value); + output->insert(name, QJsonValue(*str)); + } } void From 5da0b96f17ae4bcbfd90f6a2f70e2e424f8247c5 Mon Sep 17 00:00:00 2001 From: Steffen Furholm Date: Sat, 31 Oct 2015 01:14:17 +0100 Subject: [PATCH 025/142] Added support for sortParamsByRequiredFlag config option to C# and Python --- .../io/swagger/codegen/DefaultGenerator.java | 7 ++++++ .../languages/CSharpClientCodegen.java | 2 +- .../languages/PythonClientCodegen.java | 1 + .../src/main/resources/python/api.mustache | 22 ++++++++++++------- .../csharp/CSharpClientOptionsTest.java | 1 + .../python/PythonClientOptionsTest.java | 1 + 6 files changed, 25 insertions(+), 9 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 9a2a47853ea..e6e1499a2ee 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 @@ -262,6 +262,13 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { operation.put("classVarName", config.toApiVarName(tag)); operation.put("importPath", config.toApiImport(tag)); + // Pass sortParamsByRequiredFlag through to the Mustache template... + boolean sortParamsByRequiredFlag = true; + if (this.config.additionalProperties().containsKey(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG)) { + sortParamsByRequiredFlag = Boolean.valueOf((String)this.config.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG).toString()); + } + operation.put("sortParamsByRequiredFlag", sortParamsByRequiredFlag); + processMimeTypes(swagger.getConsumes(), operation, "consumes"); processMimeTypes(swagger.getProduces(), operation, "produces"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index 7156df2d4e6..30ab4c2382a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -82,7 +82,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig cliOptions.clear(); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case), default: IO.Swagger")); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version, default: 1.0.0")); - + cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); } @Override diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index 8277aa20f10..55bde048155 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -66,6 +66,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "python package name (convention: snake_case)," + " default: swagger_client")); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "python package version, default: 1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); } @Override diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache index b076fa5d3ea..474cf84f356 100644 --- a/modules/swagger-codegen/src/main/resources/python/api.mustache +++ b/modules/swagger-codegen/src/main/resources/python/api.mustache @@ -47,7 +47,7 @@ class {{classname}}(object): self.api_client = config.api_client {{#operation}} - def {{nickname}}(self, {{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}**kwargs): + def {{nickname}}(self, {{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs): """ {{{summary}}} {{{notes}}} @@ -58,7 +58,12 @@ class {{classname}}(object): >>> def callback_function(response): >>> pprint(response) >>> +{{#sortParamsByRequiredFlag}} >>> thread = api.{{nickname}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}callback=callback_function) +{{/sortParamsByRequiredFlag}} +{{^sortParamsByRequiredFlag}} + >>> thread = api.{{nickname}}({{#allParams}}{{#required}}{{paramName}}={{paramName}}_value, {{/required}}{{/allParams}}callback=callback_function) +{{/sortParamsByRequiredFlag}} :param callback function: The callback function for asynchronous request. (optional) @@ -69,13 +74,6 @@ class {{classname}}(object): If the method is called asynchronously, returns the request thread. """ -{{#allParams}} -{{#required}} - # verify the required parameter '{{paramName}}' is set - if {{paramName}} is None: - raise ValueError("Missing the required parameter `{{paramName}}` when calling `{{nickname}}`") -{{/required}} -{{/allParams}} all_params = [{{#allParams}}'{{paramName}}'{{#hasMore}}, {{/hasMore}}{{/allParams}}] all_params.append('callback') @@ -90,6 +88,14 @@ class {{classname}}(object): params[key] = val del params['kwargs'] +{{#allParams}} +{{#required}} + # verify the required parameter '{{paramName}}' is set + if ('{{paramName}}' not in params) or (params['{{paramName}}'] is None): + raise ValueError("Missing the required parameter `{{paramName}}` when calling `{{nickname}}`") +{{/required}} +{{/allParams}} + resource_path = '{{path}}'.replace('{format}', 'json') method = '{{httpMethod}}' diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java index 5a64e676dcb..5fc990fabcf 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java @@ -38,6 +38,7 @@ public class CSharpClientOptionsTest extends AbstractOptionsTest { ImmutableMap.Builder builder = new ImmutableMap.Builder(); return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "true") .build(); } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java index 645471789e8..6a96efd5c75 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java @@ -38,6 +38,7 @@ public class PythonClientOptionsTest extends AbstractOptionsTest { ImmutableMap.Builder builder = new ImmutableMap.Builder(); return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "true") .build(); } } From a4426cf2de9f088de861eb4b57e3e93f48b1a8d2 Mon Sep 17 00:00:00 2001 From: dvz5 Date: Sat, 31 Oct 2015 09:01:40 +0100 Subject: [PATCH 026/142] Update BaseObject.mustache Fix deserialization. --- .../src/main/resources/perl/BaseObject.mustache | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index f58c180dbf6..57a3e5e5fd0 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -36,28 +36,30 @@ sub TO_JSON { return $_data; } -# from json string +# from Perl hashref sub from_hash { my ($self, $hash) = @_; + # loop through attributes and use swagger_types to deserialize the data while ( my ($_key, $_type) = each %{$self->get_swagger_types} ) { + my $_json_attribute = $self->get_attribute_map->{$_key}; if ($_type =~ /^array\[/i) { # array my $_subclass = substr($_type, 6, -1); my @_array = (); - foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) { + foreach my $_element (@{$hash->{$_json_attribute}}) { push @_array, $self->_deserialize($_subclass, $_element); } $self->{$_key} = \@_array; - } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime - $self->{$_key} = $self->_deserialize($_type, $hash->{$self->get_attribute_map->{$_key}}); + } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime + $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute}); } else { - $log->debugf("warning: %s not defined\n", $_key); + $log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute); } } return $self; } - + # deserialize non-array data sub _deserialize { my ($self, $type, $data) = @_; From ad590793e7f900de50f6ec9901e7567f07063710 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sat, 31 Oct 2015 23:17:58 +0800 Subject: [PATCH 027/142] Update server generator --- README.md | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a13c194837a..e4329d3fda0 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,12 @@ Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additi - [Generating dynamic html api documentation](#generating-dynamic-html-api-documentation) - [Generating static html api documentation](#generating-static-html-api-documentation) - [To build a server stub](#to-build-a-server-stub) - - [node.js](#nodejs) - - [rails-grape](#rails-grape) - - [scala scalatra](#scala-scalatra) - - [java jax-rs](#java-jax-rs) - - [java spring-mvc](#java-spring-mvc) + - [Node.js](#nodejs) + - [PHP Silex](#php-silex) + - [Ruby Sinatra](#ruby-sinatra) + - [Scala Scalatra](#scala-scalatra) + - [Java JAX-RS](#java-jax-rs) + - [Java Spring MVC](#java-spring-mvc) - [To build the codegen library](#to-build-the-codegen-library) - [License](#license) @@ -406,7 +407,7 @@ open index.html You can also use the codegen to generate a server for a couple different frameworks. Take a look here: -### node.js +### Node.js ``` java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ @@ -415,11 +416,25 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/server/petstore/nodejs ``` -### rails-grape +### PHP Silex -*Not yet migrated to this branch* +``` +java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ + -i http://petstore.swagger.io/v2/swagger.json \ + -l silex \ + -o samples/server/petstore/silex +``` -### scala scalatra +### Ruby Sinatra + +``` +java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ + -i http://petstore.swagger.io/v2/swagger.json \ + -l sinatra \ + -o samples/server/petstore/sinatra +``` + +### Scala Scalatra ``` java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -i http://petstore.swagger.io/v2/swagger.json \ @@ -427,7 +442,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/server/petstore/scalatra ``` -### java jax-rs +### Java JAX-RS ``` java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ @@ -436,7 +451,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/server/petstore/jaxrs ``` -### java spring-mvc +### Java Spring MVC ``` java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ @@ -444,6 +459,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -l spring-mvc \ -o samples/server/petstore/spring-mvc ``` + ### To build the codegen library This will create the swagger-codegen library from source. From 48bf89cb1dce4acfd301147708d17f4678e1b322 Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sat, 31 Oct 2015 16:35:14 +0100 Subject: [PATCH 028/142] Fix path typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4329d3fda0..cd737e8bb97 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ You can look at `modules/swagger-codegen/src/main/resources/${your-language}` fo If you're starting a project with a new language and don't see what you need, swagger-codegen can help you create a project to generate your own libraries: ``` -java -jar modules/swagger-codegen-distribution/target/swagger-codegen-cli.jar meta \ +java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar meta \ -o output/myLibrary -n myClientCodegen -p com.my.company.codegen ``` From c3a98c2fb17911ca911c0226525265282512139d Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 1 Nov 2015 00:02:08 +0800 Subject: [PATCH 029/142] add online generators --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index cd737e8bb97..cdcd2f95bfd 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additi - [Java JAX-RS](#java-jax-rs) - [Java Spring MVC](#java-spring-mvc) - [To build the codegen library](#to-build-the-codegen-library) + - [Online Generators](#online-generators) - [License](#license) ## Build and run using docker @@ -470,6 +471,16 @@ mvn package Note! The templates are included in the library generated. If you want to modify the templates, you'll need to either repackage the library OR specify a path to your scripts +## Online generators + +One can also generate API client or sever using the online generators (https://generator.swagger.io) + +For example, to generate Ruby API client, simply send the following HTTP request using curl: +``` +curl -X POST -H "content-type:application/json" -d '{"swaggerUrl":"http://petstore.swagger.io/v2/swagger.json"}' https://generator.swagger.io/api/gen/clients/ruby +``` +Then you will receieve a JSON response with the URL to download the zipped code. + License ------- From 2e03ecc4b83de919b374d77aa32faacd5e2fff93 Mon Sep 17 00:00:00 2001 From: dvz5 Date: Sun, 1 Nov 2015 23:10:20 +0100 Subject: [PATCH 030/142] Update 01_pet_api.t Add tests for photoUrls, to check correct mapping from object attribute name to JSON attribute name. --- samples/client/petstore/perl/t/01_pet_api.t | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t index 6b731b846fe..bb5f163bd82 100644 --- a/samples/client/petstore/perl/t/01_pet_api.t +++ b/samples/client/petstore/perl/t/01_pet_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 33; +use Test::More tests => 35; use Test::Exception; use lib 'lib'; @@ -59,6 +59,9 @@ is $get_pet_hash->{category}->{id}, '22', 'get the proper category id from get_p is $get_pet_hash->{category}->{name}, 'perl', 'get the proper category from get_pet_by_id'; is $get_pet_hash->{tags}[0]->{name}, 'just kidding', 'get the proper tag from get_pet_by_id'; is $get_pet_hash->{tags}[0]->{id}, '11', 'get the proper tag id from get_pet_by_id'; +is $get_pet_hash->{photoUrls}->[0], '123', 'get the proper photoUrl from get_pet_by_id'; +is $get_pet_hash->{photoUrls}->[1], 'oop', 'get the proper photoUrl from get_pet_by_id'; + my $update_pet_with_form = $api->update_pet_with_form(pet_id => $pet_id, name => 'test_name', status => 'sold'); is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form'; From 08f424824c1231b0ba8595f21c53e66163766a2a Mon Sep 17 00:00:00 2001 From: dvz5 Date: Sun, 1 Nov 2015 23:14:22 +0100 Subject: [PATCH 031/142] Update 02_store_api.t --- samples/client/petstore/perl/t/02_store_api.t | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/samples/client/petstore/perl/t/02_store_api.t b/samples/client/petstore/perl/t/02_store_api.t index f4687daad41..c731273271d 100644 --- a/samples/client/petstore/perl/t/02_store_api.t +++ b/samples/client/petstore/perl/t/02_store_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 22; +use Test::More tests => 42; use Test::Exception; use lib 'lib'; @@ -12,6 +12,8 @@ use_ok('WWW::SwaggerClient::ApiClient'); use_ok('WWW::SwaggerClient::Object::Pet'); use_ok('WWW::SwaggerClient::Object::Tag'); use_ok('WWW::SwaggerClient::Object::Category'); +use_ok('WWW::SwaggerClient::Object::User'); + my $api_client = WWW::SwaggerClient::ApiClient->new(); my $store_api = WWW::SwaggerClient::StoreApi->new('api_client' => $api_client); @@ -53,6 +55,7 @@ is $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{category}->{ is ref $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{category}, "WWW::SwaggerClient::Object::Category", "get the Category the Pet object"; is ref $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{tags}[0], "WWW::SwaggerClient::Object::Tag", "get the Tag of the Pet object"; is $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{tags}[0]->{name}, "tag string", "get the Tag name of the Pet object"; +is $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{photo_urls}->[0], "string", "get the photoUrl from the Pet object"; my $array_json = <deserialize("ARRAY[Pet]", $array_json)->[0]->{category}->{name}, is ref $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{category}, "WWW::SwaggerClient::Object::Category", "get the Category the Pet object"; is ref $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{tags}->[0], "WWW::SwaggerClient::Object::Tag", "get the Tag[0] the Pet object"; is $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{tags}->[0]->{name}, "tag string", "get the tag name the Pet object"; +is $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{photo_urls}->[0], "string", "get the photoUrl from the Pet object"; + +my $pet_json_nopet = <deserialize("Pet", $pet_json_nopet), "WWW::SwaggerClient::Object::Pet", "get Pet object via from_hash()"; +is $api_client->deserialize("Pet", $pet_json_nopet)->{name}, "doggie", "get the name of the Pet object"; +is $api_client->deserialize("Pet", $pet_json_nopet)->{category}->{name}, "string", "get the category name of the Pet object"; +is ref $api_client->deserialize("Pet", $pet_json_nopet)->{category}, "WWW::SwaggerClient::Object::Category", "get the Category the Pet object"; +is ref $api_client->deserialize("Pet", $pet_json_nopet)->{tags}->[0], "WWW::SwaggerClient::Object::Tag", "get the Tag[0] the Pet object"; +is $api_client->deserialize("Pet", $pet_json_nopet)->{tags}->[0]->{name}, "tag string", "get the tag name the Pet object"; +is $api_client->deserialize("Pet", $pet_json_nopet)->{photo_urls}->[0], "string", "get the photoUrl from the Pet object"; + + +my %userdata = ( + id => 4000, + username => "tony", + firstName => "Tony", + lastName => "Tiger", + email => 'tony@fail.com', + password => "XXXXXXXXXXX", + phone => "408-867-5309", + userStatus => 1, + ); + +my $user = WWW::SwaggerClient::Object::User->new->from_hash(\%userdata); +is ref $user, 'WWW::SwaggerClient::Object::User', "built a User object via from_hash()"; +is $user->{id}, $userdata{id}, "got the id of the User object"; +is $user->{username}, $userdata{username}, "got the username of the User object"; +is $user->{first_name}, $userdata{firstName}, "got the firstName of the User object"; +is $user->{last_name}, $userdata{lastName}, "got the lastName of the User object"; +is $user->{email}, $userdata{email}, "got the email of the User object"; +is $user->{password}, $userdata{password}, "got the password of the User object"; +is $user->{phone}, $userdata{phone}, "got the phone of the User object"; +is $user->{user_status}, $userdata{userStatus}, "got the userStatus of the User object"; From 1c3dc28c6792e2f8ba210e3a7c915c7a78271103 Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 2 Nov 2015 12:50:23 +0800 Subject: [PATCH 032/142] Add oauth support for Ruby client --- .../src/main/resources/ruby/configuration.mustache | 12 ++++++++++++ .../petstore/ruby/lib/petstore/configuration.rb | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache b/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache index 0385aaffd83..89bf133b22c 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache @@ -44,6 +44,9 @@ module {{moduleName}} # @return [String] attr_accessor :password + # Defines the access token (Bearer) used with OAuth2. + attr_accessor :access_token + # Set this to enable/disable debugging. When enabled (set to true), HTTP request/response # details will be logged with `logger.debug` (see the `logger` attribute). # Default to false. @@ -179,6 +182,15 @@ module {{moduleName}} value: basic_auth_token }, {{/isBasic}} +{{#isOAuth}} + '{{name}}' => + { + type: 'oauth2', + in: 'header', + key: 'Authorization', + value: "Bearer #{access_token}" + }, +{{/isOAuth}} {{/authMethods}} } end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index 04479b53db0..4f7bd1c1b80 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -44,6 +44,9 @@ module Petstore # @return [String] attr_accessor :password + # Defines the access token (Bearer) used with OAuth2. + attr_accessor :access_token + # Set this to enable/disable debugging. When enabled (set to true), HTTP request/response # details will be logged with `logger.debug` (see the `logger` attribute). # Default to false. @@ -160,6 +163,13 @@ module Petstore # Returns Auth Settings hash for api client. def auth_settings { + 'petstore_auth' => + { + type: 'oauth2', + in: 'header', + key: 'Authorization', + value: "Bearer #{access_token}" + }, 'api_key' => { type: 'api_key', From d28737ffd235111db59e0a64525b9471466e1983 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Mon, 2 Nov 2015 08:24:06 +0100 Subject: [PATCH 033/142] Fix misleading comment --- .../swagger-codegen/src/main/resources/perl/BaseObject.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index 57a3e5e5fd0..4e9a4699ed3 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -19,7 +19,7 @@ use DateTime; # -# return json string +# return perl hash sub to_hash { return decode_json(JSON->new->convert_blessed->encode( shift )); } From 3762ea472d01902441d31105f4e541f1facb98f5 Mon Sep 17 00:00:00 2001 From: aersamkull Date: Mon, 2 Nov 2015 08:28:46 +0100 Subject: [PATCH 034/142] Adds default headers --- .../resources/TypeScript-Angular/api.mustache | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index 18c325fa422..b49026b8991 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -22,17 +22,24 @@ namespace {{package}} { this.basePath = basePath; } } + + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } + {{#operation}} public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> { - let path = this.basePath + '{{path}}'; + const path = this.basePath + '{{path}}'{{#pathParams}} + .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; -{{#pathParams}} - path = path.replace('{' + '{{baseName}}' + '}', String({{paramName}})); - -{{/pathParams}} let queryParameters: any = {}; - let headerParams: any = this.defaultHeaders; + let headerParams: any = this.extendObj({}, this.defaultHeaders); {{#hasFormParams}} let formParams: any = {}; @@ -43,7 +50,6 @@ namespace {{package}} { if (!{{paramName}}) { throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}'); } - {{/required}} {{/allParams}} {{#queryParams}} @@ -77,11 +83,7 @@ namespace {{package}} { }; if (extraHttpRequestParams) { - for (let k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); From 3559a8bd09e5b7179526f1b48154f55e8ec6611d Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Mon, 2 Nov 2015 10:47:46 +0100 Subject: [PATCH 035/142] Fix array query param processing A couple of PHP functions that don't exist in Perl were being called to process array query parameters. --- .../src/main/resources/perl/ApiClient.mustache | 4 ++-- .../client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm | 5 ++--- samples/client/petstore/perl/t/01_pet_api.t | 6 +++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index fa88dbd0333..3a36ce14073 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -146,8 +146,8 @@ sub to_path_value { # @return string the serialized object sub to_query_value { my ($self, $object) = @_; - if (is_array($object)) { - return implode(',', $object); + if (ref($object) eq 'ARRAY') { + return join(',', @$object); } else { return $self->to_string($object); } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index 9987a46ef76..6245329197a 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -146,14 +146,13 @@ sub to_path_value { # @return string the serialized object sub to_query_value { my ($self, $object) = @_; - if (is_array($object)) { - return implode(',', $object); + if (ref($object) eq 'ARRAY') { + return join(',', @$object); } else { return $self->to_string($object); } } - # Take value and turn it into a string suitable for inclusion in # the header. If it's a string, pass through unchanged # If it's a datetime object, format it in ISO8601 diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t index 6b731b846fe..8815d7ffccc 100644 --- a/samples/client/petstore/perl/t/01_pet_api.t +++ b/samples/client/petstore/perl/t/01_pet_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 33; +use Test::More tests => 35; use Test::Exception; use lib 'lib'; @@ -74,3 +74,7 @@ is $delete_pet, undef, 'get the null response from delete_pet'; throws_ok{$api->get_pet_by_id(pet_id => $pet_id)} qr/API Exception\(404\): Not Found/, "throw 404 error about pet not found after delete"; #is $get_pet_after_delete->{status}, undef, 'get the updated status after update_pet_with_form'; +my $pets; +lives_ok {$pets = $api->find_pets_by_status(status => [qw(sold available)])} 'array query param processed correctly'; +isa_ok($pets->[0], 'WWW::SwaggerClient::Object::Pet'); + From 884b853e1f21815b3e1f39691e634c08354c3642 Mon Sep 17 00:00:00 2001 From: Tomek Cejner Date: Mon, 2 Nov 2015 14:20:15 +0100 Subject: [PATCH 036/142] Custom headers in Swift; base URL is nor modifyable --- .../src/main/resources/swift/APIs.mustache | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache index 495752f624d..dbe41eb9c0a 100644 --- a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache @@ -7,8 +7,9 @@ import Foundation public class {{projectName}}API { - static let basePath = "{{basePath}}" - static var credential: NSURLCredential? + public static var basePath = "{{basePath}}" + public static var credential: NSURLCredential? + public static var customHeaders: [String:String] = [:] static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory() } @@ -41,6 +42,14 @@ public class RequestBuilder { self.URLString = URLString self.parameters = parameters self.isBody = isBody + + addHeaders({{projectName}}API.customHeaders) + } + + public func addHeaders(aHeaders:[String:String]) { + for (header, value) in aHeaders { + headers[header] = value + } } public func execute(completion: (response: Response?, erorr: ErrorType?) -> Void) { } From b27931cd8ce2f8db3e80b740631d2f8d8af7023c Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 2 Nov 2015 21:27:53 +0800 Subject: [PATCH 037/142] Add oauth support for Java client --- .../src/main/resources/Java/ApiClient.mustache | 13 +++++++++++++ .../src/main/resources/Java/auth/OAuth.mustache | 14 +++++++++++++- .../main/java/io/swagger/client/ApiClient.java | 17 +++++++++++++++-- .../main/java/io/swagger/client/auth/OAuth.java | 16 ++++++++++++++-- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache index 18d27ede7c3..c81b75d73db 100644 --- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache @@ -166,6 +166,19 @@ public class ApiClient { throw new RuntimeException("No API key authentication configured!"); } + /** + * Helper method to set access token for the first OAuth2 authentication. + */ + public void setAccessToken(String accessToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof OAuth) { + ((OAuth) auth).setAccessToken(accessToken); + return; + } + } + throw new RuntimeException("No OAuth2 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). */ diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache index a1f1b6a827c..902f54a2e3a 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache @@ -7,8 +7,20 @@ import java.util.List; {{>generatedAnnotation}} public class OAuth implements Authentication { + private String accessToken; + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + @Override public void applyToParams(List queryParams, Map headerParams) { - // TODO: support oauth + if (accessToken != null) { + headerParams.put("Authorization", "Bearer " + accessToken); + } } } diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java index 17709ee88dc..da7f3ba5a4e 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java @@ -39,7 +39,7 @@ import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T21:16:46.418+08:00") public class ApiClient { private Map hostMap = new HashMap(); private Map defaultHeaderMap = new HashMap(); @@ -67,8 +67,8 @@ public class ApiClient { // Setup authentications (key: authentication name, value: authentication). authentications = new HashMap(); - authentications.put("api_key", new ApiKeyAuth("header", "api_key")); authentications.put("petstore_auth", new OAuth()); + authentications.put("api_key", new ApiKeyAuth("header", "api_key")); // Prevent the authentications from being modified. authentications = Collections.unmodifiableMap(authentications); } @@ -165,6 +165,19 @@ public class ApiClient { throw new RuntimeException("No API key authentication configured!"); } + /** + * Helper method to set access token for the first OAuth2 authentication. + */ + public void setAccessToken(String accessToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof OAuth) { + ((OAuth) auth).setAccessToken(accessToken); + return; + } + } + throw new RuntimeException("No OAuth2 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). */ diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java index 3e0fade5e80..1ab313d67ca 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java @@ -5,10 +5,22 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T21:16:46.418+08:00") public class OAuth implements Authentication { + private String accessToken; + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + @Override public void applyToParams(List queryParams, Map headerParams) { - // TODO: support oauth + if (accessToken != null) { + headerParams.put("Authorization", "Bearer " + accessToken); + } } } From a94f9b69affefbe75384cfb30b32aa3dd5dc2205 Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 2 Nov 2015 22:52:51 +0800 Subject: [PATCH 038/142] Add oauth support to other Java clients with libraries jersey2 and okhttp-gson --- .../Java/libraries/jersey2/ApiClient.mustache | 13 +++++++++++++ .../libraries/okhttp-gson/ApiClient.mustache | 13 +++++++++++++ .../main/java/io/swagger/client/ApiClient.java | 15 ++++++++++++++- .../main/java/io/swagger/client/auth/OAuth.java | 16 ++++++++++++++-- .../main/java/io/swagger/client/ApiClient.java | 15 ++++++++++++++- .../main/java/io/swagger/client/auth/OAuth.java | 16 ++++++++++++++-- 6 files changed, 82 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache index adaee9fde89..c71b6089358 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache @@ -173,6 +173,19 @@ public class ApiClient { throw new RuntimeException("No API key authentication configured!"); } + /** + * Helper method to set access token for the first OAuth2 authentication. + */ + public void setAccessToken(String accessToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof OAuth) { + ((OAuth) auth).setAccessToken(accessToken); + return; + } + } + throw new RuntimeException("No OAuth2 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). */ diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache index df36a8b5483..2ee5ab3e887 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache @@ -369,6 +369,19 @@ public class ApiClient { throw new RuntimeException("No API key authentication configured!"); } + /** + * Helper method to set access token for the first OAuth2 authentication. + */ + public void setAccessToken(String accessToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof OAuth) { + ((OAuth) auth).setAccessToken(accessToken); + return; + } + } + throw new RuntimeException("No OAuth2 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). */ diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java index 01c0888ee90..1fc3258b9dc 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java @@ -43,7 +43,7 @@ import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-29T09:31:27.804+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T22:10:35.641+08:00") public class ApiClient { private Client client; private Map hostMap = new HashMap(); @@ -172,6 +172,19 @@ public class ApiClient { throw new RuntimeException("No API key authentication configured!"); } + /** + * Helper method to set access token for the first OAuth2 authentication. + */ + public void setAccessToken(String accessToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof OAuth) { + ((OAuth) auth).setAccessToken(accessToken); + return; + } + } + throw new RuntimeException("No OAuth2 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). */ diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java index e3ec46f0b81..215eb960fd4 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java @@ -5,10 +5,22 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T22:10:35.641+08:00") public class OAuth implements Authentication { + private String accessToken; + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + @Override public void applyToParams(List queryParams, Map headerParams) { - // TODO: support oauth + if (accessToken != null) { + headerParams.put("Authorization", "Bearer " + accessToken); + } } } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java index 52a414252c5..88b8f5602d1 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java @@ -105,8 +105,8 @@ public class ApiClient { // Setup authentications (key: authentication name, value: authentication). authentications = new HashMap(); - authentications.put("api_key", new ApiKeyAuth("header", "api_key")); authentications.put("petstore_auth", new OAuth()); + authentications.put("api_key", new ApiKeyAuth("header", "api_key")); // Prevent the authentications from being modified. authentications = Collections.unmodifiableMap(authentications); } @@ -368,6 +368,19 @@ public class ApiClient { throw new RuntimeException("No API key authentication configured!"); } + /** + * Helper method to set access token for the first OAuth2 authentication. + */ + public void setAccessToken(String accessToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof OAuth) { + ((OAuth) auth).setAccessToken(accessToken); + return; + } + } + throw new RuntimeException("No OAuth2 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). */ diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java index dfa75184014..bc6473d110f 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java @@ -5,10 +5,22 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:42:25.339-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T22:14:00.422+08:00") public class OAuth implements Authentication { + private String accessToken; + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + @Override public void applyToParams(List queryParams, Map headerParams) { - // TODO: support oauth + if (accessToken != null) { + headerParams.put("Authorization", "Bearer " + accessToken); + } } } From 645b8a01e1f1612792acf16826571173ff272e85 Mon Sep 17 00:00:00 2001 From: cbornet Date: Mon, 2 Nov 2015 16:16:14 +0100 Subject: [PATCH 039/142] provide dependency to javax.annotation.Generated for android --- .../main/resources/Java/build.gradle.mustache | 130 +++++++++--------- .../libraries/jersey2/build.gradle.mustache | 130 +++++++++--------- .../okhttp-gson/build.gradle.mustache | 130 +++++++++--------- .../libraries/retrofit/build.gradle.mustache | 130 +++++++++--------- .../client/petstore/java/default/build.gradle | 130 +++++++++--------- .../client/petstore/java/jersey2/build.gradle | 130 +++++++++--------- .../petstore/java/okhttp-gson/build.gradle | 106 +++++++++++--- .../petstore/java/retrofit/build.gradle | 130 +++++++++--------- 8 files changed, 556 insertions(+), 460 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache index 971dcd816a4..2725cbe1f86 100644 --- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = '{{artifactId}}' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = '{{artifactId}}' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } ext { diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index 548c1854e5e..09262af0d63 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = '{{artifactId}}' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = '{{artifactId}}' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } ext { diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index 289f9a6df72..9741cb13d10 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = '{{artifactId}}' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = '{{artifactId}}' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } dependencies { diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache index a285745505a..7072c8752f5 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = '{{artifactId}}' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = '{{artifactId}}' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } ext { diff --git a/samples/client/petstore/java/default/build.gradle b/samples/client/petstore/java/default/build.gradle index baa5ce97b01..b7ccd1df774 100644 --- a/samples/client/petstore/java/default/build.gradle +++ b/samples/client/petstore/java/default/build.gradle @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = 'swagger-java-client' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = 'swagger-java-client' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } ext { diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index 9727e5693e6..85ad4f048b9 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = 'swagger-petstore-jersey2' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = 'swagger-petstore-jersey2' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } ext { diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle index ada6a992573..c739b5e1a23 100644 --- a/samples/client/petstore/java/okhttp-gson/build.gradle +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -1,11 +1,93 @@ -apply plugin: 'java' -apply plugin: 'maven' +group = 'io.swagger' +version = '1.0.0' -sourceCompatibility = JavaVersion.VERSION_1_7 -targetCompatibility = JavaVersion.VERSION_1_7 +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.2' + classpath 'com.github.dcendents:android-maven-plugin:1.2' + } +} repositories { - mavenCentral() + jcenter() +} + + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = 'swagger-petstore-okhttp-gson' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } dependencies { @@ -15,17 +97,3 @@ dependencies { compile 'com.brsanthu:migbase64:2.2' testCompile 'junit:junit:4.8.1' } - -group = 'io.swagger' -version = '1.0.0' - -install { - repositories.mavenInstaller { - pom.artifactId = 'swagger-petstore-okhttp-gson' - } -} - -task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath -} diff --git a/samples/client/petstore/java/retrofit/build.gradle b/samples/client/petstore/java/retrofit/build.gradle index 710d9da9a54..255a76e0403 100644 --- a/samples/client/petstore/java/retrofit/build.gradle +++ b/samples/client/petstore/java/retrofit/build.gradle @@ -18,72 +18,76 @@ repositories { if(hasProperty('target') && target == 'android') { - apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - - android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - // Rename the aar correctly - libraryVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${project.name}-${variant.baseName}-${version}.aar" - output.outputFile = new File(outputFile.parent, fileName) - } - } - } - } - - afterEvaluate { - android.libraryVariants.all { variant -> - def task = project.tasks.create "jar${variant.name.capitalize()}", Jar - task.description = "Create jar artifact for ${variant.name}" - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" - artifacts.add('archives', task); - } - } - - task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' - } - - artifacts { - archives sourcesJar - } + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided 'javax.annotation:jsr250-api:1.0' + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } } else { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 - - install { - repositories.mavenInstaller { - pom.artifactId = 'swagger-petstore-retrofit' - } - } - - task execute(type:JavaExec) { - main = System.getProperty('mainClass') - classpath = sourceSets.main.runtimeClasspath - } + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = 'swagger-petstore-retrofit' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } } ext { From 5b1f287176598560c92fa60da83a2100f3338b28 Mon Sep 17 00:00:00 2001 From: cbornet Date: Mon, 2 Nov 2015 18:32:52 +0100 Subject: [PATCH 040/142] add android manifest to java codegen --- .../java/io/swagger/codegen/languages/JavaClientCodegen.java | 4 +++- .../swagger-codegen/src/main/resources/Java/manifest.mustache | 3 +++ .../client/petstore/java/default/src/main/AndroidManifest.xml | 3 +++ .../client/petstore/java/jersey2/src/main/AndroidManifest.xml | 3 +++ .../petstore/java/okhttp-gson/src/main/AndroidManifest.xml | 3 +++ .../petstore/java/retrofit/src/main/AndroidManifest.xml | 3 +++ 6 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 modules/swagger-codegen/src/main/resources/Java/manifest.mustache create mode 100644 samples/client/petstore/java/default/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/jersey2/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/okhttp-gson/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/retrofit/src/main/AndroidManifest.xml diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 46b0fb2cb21..46e213eccd3 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -42,7 +42,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String groupId = "io.swagger"; protected String artifactId = "swagger-java-client"; protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/java"; + protected String projectFolder = "src/main"; + protected String sourceFolder = projectFolder + "/java"; protected String localVariablePrefix = ""; protected boolean fullJavaUtil = false; protected String javaUtilPrefix = ""; @@ -199,6 +200,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle")); supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties")); + supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml")); supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java")); supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java")); diff --git a/modules/swagger-codegen/src/main/resources/Java/manifest.mustache b/modules/swagger-codegen/src/main/resources/Java/manifest.mustache new file mode 100644 index 00000000000..f44bd07d0a0 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/manifest.mustache @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/default/src/main/AndroidManifest.xml b/samples/client/petstore/java/default/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..465dcb520c4 --- /dev/null +++ b/samples/client/petstore/java/default/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/jersey2/src/main/AndroidManifest.xml b/samples/client/petstore/java/jersey2/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..465dcb520c4 --- /dev/null +++ b/samples/client/petstore/java/jersey2/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/okhttp-gson/src/main/AndroidManifest.xml b/samples/client/petstore/java/okhttp-gson/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..465dcb520c4 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/retrofit/src/main/AndroidManifest.xml b/samples/client/petstore/java/retrofit/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..465dcb520c4 --- /dev/null +++ b/samples/client/petstore/java/retrofit/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + From 8b0bf8ff726a31c2fbdb38676065c38e86e7181e Mon Sep 17 00:00:00 2001 From: cbornet Date: Thu, 15 Oct 2015 15:50:29 +0200 Subject: [PATCH 041/142] add a listener on new token reception Add a listener on new token reception that can then be stored or logged for debug Add an helper method to add authorizations (otherwise if the swagger def is not complete or correct, it is hard to configure from the main app) --- .../libraries/retrofit/ApiClient.mustache | 41 +++++++++++++++---- .../libraries/retrofit/auth/OAuth.mustache | 17 +++++++- .../java/io/swagger/client/ApiClient.java | 41 +++++++++++++++---- .../java/io/swagger/client/auth/OAuth.java | 17 +++++++- 4 files changed, 96 insertions(+), 20 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache index eaca662c583..183fb5f27ce 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache @@ -28,6 +28,7 @@ import com.squareup.okhttp.OkHttpClient; import {{invokerPackage}}.auth.HttpBasicAuth; import {{invokerPackage}}.auth.ApiKeyAuth; import {{invokerPackage}}.auth.OAuth; +import {{invokerPackage}}.auth.OAuth.AccessTokenListener; import {{invokerPackage}}.auth.OAuthFlow; @@ -44,12 +45,7 @@ public class ApiClient { public ApiClient(String[] authNames) { this(); - okClient = new OkHttpClient(); - adapterBuilder.setClient(new OkClient(okClient)); - for(String authName : authNames) { - if (apiAuthorizations.containsKey(authName)) { - throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations"); - }{{#hasAuthMethods}} + for(String authName : authNames) { {{#hasAuthMethods}} Interceptor auth; {{#authMethods}}if (authName == "{{name}}") { {{#isBasic}} auth = new HttpBasicAuth();{{/isBasic}}{{#isApiKey}} @@ -58,10 +54,9 @@ public class ApiClient { } else {{/authMethods}}{ throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); } - apiAuthorizations.put(authName, auth);{{/hasAuthMethods}}{{^hasAuthMethods}} + addAuthorization(authName, auth);{{/hasAuthMethods}}{{^hasAuthMethods}} throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");{{/hasAuthMethods}} } - addAuthsToOkClient(okClient); } /** @@ -115,9 +110,12 @@ public class ApiClient { .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") .create(); + okClient = new OkHttpClient(); + adapterBuilder = new RestAdapter .Builder() .setEndpoint("{{basePath}}") + .setClient(new OkClient(okClient)) .setConverter(new GsonConverterWrapper(gson)); } @@ -224,6 +222,33 @@ public class ApiClient { } } + /** + * Configures a listener which is notified when a new access token is received. + * @param accessTokenListener + */ + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.registerAccessTokenListener(accessTokenListener); + return; + } + } + } + + /** + * Adds an authorization to be used by the client + * @param authName + * @param authorization + */ + public void addAuthorization(String authName, Interceptor authorization) { + if (apiAuthorizations.containsKey(authName)) { + throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations"); + } + apiAuthorizations.put(authName, authorization); + okClient.interceptors().add(authorization); + } + public Map getApiAuthorizations() { return apiAuthorizations; } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache index e6179d6c690..68ee918601e 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache @@ -14,6 +14,7 @@ import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.token.BasicOAuthToken; import com.squareup.okhttp.Interceptor; import com.squareup.okhttp.OkHttpClient; @@ -23,12 +24,18 @@ import com.squareup.okhttp.Response; public class OAuth implements Interceptor { + public interface AccessTokenListener { + public void notify(BasicOAuthToken token); + } + private volatile String accessToken; private OAuthClient oauthClient; private TokenRequestBuilder tokenRequestBuilder; private AuthenticationRequestBuilder authenticationRequestBuilder; + private AccessTokenListener accessTokenListener; + public OAuth( OkHttpClient client, TokenRequestBuilder requestBuilder ) { this.oauthClient = new OAuthClient(new OAuthOkHttpClient(client)); this.tokenRequestBuilder = requestBuilder; @@ -110,9 +117,11 @@ public class OAuth implements Interceptor { public synchronized void updateAccessToken(String requestAccessToken) throws IOException { if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) { try { - OAuthJSONAccessTokenResponse accessTokenResponse; - accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); + OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); setAccessToken(accessTokenResponse.getAccessToken()); + if (accessTokenListener != null) { + accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken()); + } } catch (OAuthSystemException e) { throw new IOException(e); } catch (OAuthProblemException e) { @@ -121,6 +130,10 @@ public class OAuth implements Interceptor { } } + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + this.accessTokenListener = accessTokenListener; + } + public synchronized String getAccessToken() { return accessToken; } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java index 343e545e83d..6540997c319 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java @@ -28,6 +28,7 @@ import com.squareup.okhttp.OkHttpClient; import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; +import io.swagger.client.auth.OAuth.AccessTokenListener; import io.swagger.client.auth.OAuthFlow; @@ -44,12 +45,7 @@ public class ApiClient { public ApiClient(String[] authNames) { this(); - okClient = new OkHttpClient(); - adapterBuilder.setClient(new OkClient(okClient)); - for(String authName : authNames) { - if (apiAuthorizations.containsKey(authName)) { - throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations"); - } + for(String authName : authNames) { Interceptor auth; if (authName == "petstore_auth") { auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); @@ -58,9 +54,8 @@ public class ApiClient { } else { throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); } - apiAuthorizations.put(authName, auth); + addAuthorization(authName, auth); } - addAuthsToOkClient(okClient); } /** @@ -114,9 +109,12 @@ public class ApiClient { .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") .create(); + okClient = new OkHttpClient(); + adapterBuilder = new RestAdapter .Builder() .setEndpoint("http://petstore.swagger.io/v2") + .setClient(new OkClient(okClient)) .setConverter(new GsonConverterWrapper(gson)); } @@ -223,6 +221,33 @@ public class ApiClient { } } + /** + * Configures a listener which is notified when a new access token is received. + * @param accessTokenListener + */ + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.registerAccessTokenListener(accessTokenListener); + return; + } + } + } + + /** + * Adds an authorization to be used by the client + * @param authName + * @param authorization + */ + public void addAuthorization(String authName, Interceptor authorization) { + if (apiAuthorizations.containsKey(authName)) { + throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations"); + } + apiAuthorizations.put(authName, authorization); + okClient.interceptors().add(authorization); + } + public Map getApiAuthorizations() { return apiAuthorizations; } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuth.java index f7e488e0499..80614f0f56a 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuth.java @@ -14,6 +14,7 @@ import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.token.BasicOAuthToken; import com.squareup.okhttp.Interceptor; import com.squareup.okhttp.OkHttpClient; @@ -23,12 +24,18 @@ import com.squareup.okhttp.Response; public class OAuth implements Interceptor { + public interface AccessTokenListener { + public void notify(BasicOAuthToken token); + } + private volatile String accessToken; private OAuthClient oauthClient; private TokenRequestBuilder tokenRequestBuilder; private AuthenticationRequestBuilder authenticationRequestBuilder; + private AccessTokenListener accessTokenListener; + public OAuth( OkHttpClient client, TokenRequestBuilder requestBuilder ) { this.oauthClient = new OAuthClient(new OAuthOkHttpClient(client)); this.tokenRequestBuilder = requestBuilder; @@ -110,9 +117,11 @@ public class OAuth implements Interceptor { public synchronized void updateAccessToken(String requestAccessToken) throws IOException { if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) { try { - OAuthJSONAccessTokenResponse accessTokenResponse; - accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); + OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); setAccessToken(accessTokenResponse.getAccessToken()); + if (accessTokenListener != null) { + accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken()); + } } catch (OAuthSystemException e) { throw new IOException(e); } catch (OAuthProblemException e) { @@ -121,6 +130,10 @@ public class OAuth implements Interceptor { } } + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + this.accessTokenListener = accessTokenListener; + } + public synchronized String getAccessToken() { return accessToken; } From 89ec500744073c60605f5c0493b030d3740f02f6 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 27 Oct 2015 18:54:08 +0800 Subject: [PATCH 042/142] add oauth support in python --- .../main/resources/python/configuration.mustache | 16 ++++++++++++++-- .../python/swagger_client/apis/pet_api.py | 2 +- .../python/swagger_client/configuration.py | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache index 78fa8fb6d3c..ad21e4c8cf9 100644 --- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache @@ -72,6 +72,11 @@ class Configuration(object): # Password for HTTP basic authentication self.password = "" +{{#authMethods}}{{#isOAuth}} + # token for OAuth + self.auth_token = "" +{{/isOAuth}}{{/authMethods}} + # Logging Settings self.logger = {} self.logger["package_logger"] = logging.getLogger("{{packageName}}") @@ -231,8 +236,15 @@ class Configuration(object): 'key': 'Authorization', 'value': self.get_basic_auth_token() }, -{{/isBasic}} -{{/authMethods}} +{{/isBasic}}{{#isOauth}} + '{{name}}': + { + 'type': 'oauth2', + 'in': 'header', + 'key': 'Authorization', + 'value': 'Bearer ' + self.auth_token + }, +{{/isOauth}}{{/authMethods}} } def to_debug_report(self): diff --git a/samples/client/petstore/python/swagger_client/apis/pet_api.py b/samples/client/petstore/python/swagger_client/apis/pet_api.py index ad053a7d72d..d68d34e6774 100644 --- a/samples/client/petstore/python/swagger_client/apis/pet_api.py +++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py @@ -409,7 +409,7 @@ class PetApi(object): select_header_content_type([]) # Authentication setting - auth_settings = ['api_key', 'petstore_auth'] + auth_settings = ['api_key'] response = self.api_client.call_api(resource_path, method, path_params, diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py index 3e00acbe252..122a347b3ab 100644 --- a/samples/client/petstore/python/swagger_client/configuration.py +++ b/samples/client/petstore/python/swagger_client/configuration.py @@ -220,6 +220,7 @@ class Configuration(object): 'key': 'api_key', 'value': self.get_api_key_with_prefix('api_key') }, + } def to_debug_report(self): From eebb6c4dd0b48469bfe243fd81a487736d12d623 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 3 Nov 2015 10:17:47 +0800 Subject: [PATCH 043/142] rename auth token to access token --- .../src/main/resources/python/configuration.mustache | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache index ad21e4c8cf9..bab1d09d761 100644 --- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache @@ -71,10 +71,9 @@ class Configuration(object): self.username = "" # Password for HTTP basic authentication self.password = "" - {{#authMethods}}{{#isOAuth}} - # token for OAuth - self.auth_token = "" + # access token for OAuth + self.access_token = "" {{/isOAuth}}{{/authMethods}} # Logging Settings @@ -242,7 +241,7 @@ class Configuration(object): 'type': 'oauth2', 'in': 'header', 'key': 'Authorization', - 'value': 'Bearer ' + self.auth_token + 'value': 'Bearer ' + self.access_token }, {{/isOauth}}{{/authMethods}} } From 792726ddc52bedec35532d652cda5651b5ac15d9 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 3 Nov 2015 10:29:28 +0800 Subject: [PATCH 044/142] update sample, better handle of $ in naming --- .../languages/PythonClientCodegen.java | 6 ++++++ samples/client/petstore/python/.coverage | Bin 3918 -> 6348 bytes .../petstore/python/dev-requirements.txt.log | 7 +++++++ .../python/swagger_client/configuration.py | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index ad8fbc683fc..2722a93b3c9 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -173,6 +173,9 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig // sanitize name name = sanitizeName(name); + // remove dollar sign + name = name.replaceAll("$", ""); + // if it's all uppper case, convert to lower case if (name.matches("^[A-Z_]*$")) { name = name.toLowerCase(); @@ -203,6 +206,9 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig public String toModelName(String name) { name = sanitizeName(name); + // remove dollar sign + name = name.replaceAll("$", ""); + // model name cannot use reserved keyword, e.g. return if (reservedWords.contains(name)) { throw new RuntimeException(name + " (reserved word) cannot be used as a model name"); diff --git a/samples/client/petstore/python/.coverage b/samples/client/petstore/python/.coverage index d58a8fe9c63feb32f3168f71e645ace0827bed20..03f8b2a2d03d1fee6eba2071dc2d2b0306bd6877 100644 GIT binary patch literal 6348 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 literal 3918 zcmd6qd32QJ8O8fNvI+=7WC@7SDuf`JASj@M3lNs;6^)LFGQ^mC8OA1=d@~bbz?7Y$ zfD4L%vWiNjEp4r>TU%?fh+VW=v6d=YZPnIl7cK6!&--Qu(^EXB|I9i4FFDCM-}}7x z-rs%RMcNWdQM7YavbHv;$|O^vM!Q!f=LM}D*GiK)JM{lbq%#aI#N}e25Th)r&!pz2nFbkKIn^nC`5k@#2^gDNf?SE6k`NRaSBFZG)~277>hG8 z0h2KW(=Z(~Z~-nvIik1>mt!_6P>Cy1hk7)i5%X|0u0abHVi6W&36^3RmSY9Jij`P} z)mVe;aRb)kX54~x*oe*8ify<9cj7MGjh(m$yYVf28{ffqaUZ^i@8f@oNbR<(5cUOFLEbLN*UO3J!xgUvb193@6*wmSCh^?r4n1S(s`UdXZh_ z99)5F)F6(zc9jiCA%porv?jlYO{S`Ylsj(MSlI1I$1TQif8nc8cx0o$o(hv9NoQ zOOrQwAqJQRgR=H^DwLSPCwWUxHA6c)UuMb2JEu5vD8duq1&e}=SBs5jhrc0~I z_wd*}y2-}Kg2PSIBNiT;lgCBY1=dY85GVN9ehDXe1n&!_M!JdIylIG@8S7RcA}Cf>3@zK0L+AwI&#_{5_51)&Jl2ehNGQ!b{* z2)m2jEqe-k`PBAy!DXSazi^CjtZ$0oG6?moGhFooGLs| zNa6Xy8Nv&M7Yn1pON29pmkMVIFB4uaoGpwA=LoBW)xtnnBdilP3Y&yi3+D?L2(J;g z2p0+$2^R~O2$u?%30DYL3U3hJC|oPNMYvA5Ubs=XO}JgSLwJ|)ZsFI2yM*@&?-SlH zd_ef1@FC&D!ac$lg|7);7yd=~w(yYf6XCyvp9(uGdn$V=3zP$uLzG3zVaj6VaOKI$ z5z2@L(RiLBR+X%;NyHmdm6=4c-g&ZTEbR4}CtZm+FFGd<$+FJXNQrszRKtZUkaNwG zWkx*bNmnA}mbjUgxmiASbF4_Jjeeo!YYDE!bygJXv-Pmu3StL#2GK;Grpv;+sxlMA zlc{DmUqLK9E;rx*A;CTJY~{!SuXil$^ZCFl&K6IpA+y15J~K@M*W^xuD^O)J z1RfD}|AoCKYxib@L@N+ngWqOA*zAGeI=r>Pcj4<<`nv{y;Bb5Y$eQ3YRP43Ze!+U- zCF|`!`riJN2gTd?tM&Igc-N583Jed6qlE3-z@oG8XpfApzT6K}V~B95aG0=II9ymN z94Q(f!Jx1_ z$A#;JtA%SkAdC(-dq8aPbl4=^BHWt8#2ua#cjjQRGslZZg^vk;DtuhHPxyrJN#Rq% zr-jc5pB3&GJ|}!$ctH4q=g2|fOTw3hzZbrm!^#_;EN=<_Cj5u+9pSsee|pfoCwyP{ zf$&4&N5YRicZ@ZClzo+j%Kpj$%E8JnDo<3Nq#T-KkO9c(Q{n)`k;+q)qm^TnW0m8S zaiDVHl(C|4?1DOW4kC~s1(RjyO6S8h;lRNkh%UAalQS-C~IRk=;M zJ&(}zA#JqhL@uR$V`0A|r?k{kwb#{Nh0t_2QOfLKd0tkH9}abev9SM=0.3.0 (from tox->-r dev-requirements.txt (line 2)) Using cached pluggy-0.3.0-py2.py3-none-any.whl Installing collected packages: nose, virtualenv, py, pluggy, tox, coverage, randomize Successfully installed coverage-3.7.1 nose-1.3.7 pluggy-0.3.0 py-1.4.30 randomize-0.13 tox-2.1.1 virtualenv-13.1.2 +Requirement already satisfied (use --upgrade to upgrade): nose in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1)) +Requirement already satisfied (use --upgrade to upgrade): tox in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2)) +Requirement already satisfied (use --upgrade to upgrade): coverage in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3)) +Requirement already satisfied (use --upgrade to upgrade): randomize in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4)) +Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2)) +Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2)) +Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2)) diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py index 122a347b3ab..ecbecf7e9f9 100644 --- a/samples/client/petstore/python/swagger_client/configuration.py +++ b/samples/client/petstore/python/swagger_client/configuration.py @@ -72,6 +72,10 @@ class Configuration(object): # Password for HTTP basic authentication self.password = "" + # access token for OAuth + self.access_token = "" + + # Logging Settings self.logger = {} self.logger["package_logger"] = logging.getLogger("swagger_client") From 5580eb7ac3d5448a0b8fd840f36e2e21ecfcbd22 Mon Sep 17 00:00:00 2001 From: aersamkull Date: Tue, 3 Nov 2015 09:03:52 +0100 Subject: [PATCH 045/142] Aligns the two typescript generators --- .../TypeScriptAngularClientCodegen.java | 2 +- .../resources/TypeScript-Angular/api.mustache | 6 +- .../TypeScript-Angular/model.mustache | 4 +- .../resources/TypeScript-node/api.mustache | 28 +- .../typescript-angular/API/Client/Category.ts | 17 +- .../typescript-angular/API/Client/Order.ts | 49 +- .../typescript-angular/API/Client/Pet.ts | 49 +- .../typescript-angular/API/Client/PetApi.ts | 250 ++- .../typescript-angular/API/Client/Tag.ts | 17 +- .../typescript-angular/API/Client/User.ts | 30 +- .../petstore/typescript-angular/tsconfig.json | 33 +- .../client/petstore/typescript-node/api.ts | 1527 ++++++++++------- .../client/petstore/typescript-node/client.ts | 74 +- .../petstore/typescript-node/tsconfig.json | 1 + 14 files changed, 1333 insertions(+), 754 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java index 4747b8bba88..6c9b615476d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java @@ -4,7 +4,7 @@ import io.swagger.codegen.SupportingFile; import java.io.File; public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen { - + @Override public String getName() { return "typescript-angular"; diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index b49026b8991..000ed2707b3 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -12,12 +12,12 @@ namespace {{package}} { */ {{/description}} export class {{classname}} { - private basePath = '{{basePath}}'; + protected basePath = '{{basePath}}'; public defaultHeaders : any = {}; static $inject: string[] = ['$http', '$httpParamSerializer']; - constructor(private $http: ng.IHttpService, basePath?: string, private $httpParamSerializer?: (d: any) => any) { + constructor(protected $http: ng.IHttpService, protected $httpParamSerializer?: (d: any) => any, basePath?: string) { if (basePath) { this.basePath = basePath; } @@ -68,7 +68,7 @@ namespace {{package}} { {{/hasFormParams}} {{#formParams}} formParams['{{baseName}}'] = {{paramName}}; - + {{/formParams}} let httpRequestParams: any = { method: '{{httpMethod}}', diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache index 5b57ed4dc94..4096e078518 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache @@ -27,7 +27,7 @@ namespace {{package}} { {{#vars}} {{#isEnum}} - export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}} + export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}} {{.}} = '{{.}}',{{/values}}{{/allowableValues}} } {{/isEnum}} @@ -36,4 +36,4 @@ namespace {{package}} { {{/hasEnums}} {{/model}} {{/models}} -} \ No newline at end of file +} diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index 4d03ae0f424..e2a440bb846 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -95,7 +95,11 @@ class VoidAuth implements Authentication { */ {{/description}} export class {{classname}} { - private basePath = '{{basePath}}'; + protected basePath = '{{basePath}}'; + protected defaultHeaders : any = {}; + + + public authentications = { 'default': new VoidAuth(), {{#authMethods}} @@ -154,17 +158,21 @@ export class {{classname}} { {{#isOAuth}} {{/isOAuth}} {{/authMethods}} + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } {{#operation}} - public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}} }> { - let path = this.url + this.basePath + '{{path}}'; - -{{#pathParams}} - path = path.replace('{' + '{{baseName}}' + '}', String({{paramName}})); - -{{/pathParams}} + public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> { + const path = this.url + this.basePath + '{{path}}'{{#pathParams}} + .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; let queryParameters: any = {}; - let headerParams: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); let formParams: any = {}; {{#allParams}}{{#required}} @@ -194,7 +202,7 @@ export class {{classname}} { {{/isFile}} {{/formParams}} - let deferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}} }>(); + let deferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>(); let requestOptions: request.Options = { method: '{{httpMethod}}', diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts index 7faf87208eb..532d9bb0856 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Category.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts @@ -1,13 +1,24 @@ /// -module API.Client { +namespace API.Client { 'use strict'; - export class Category { + + + + export interface Category { + + id: number; + + name: string; + } -} \ No newline at end of file + + + +} diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts index abee3a2894b..11a0fafe293 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Order.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts @@ -1,32 +1,67 @@ /// -module API.Client { +namespace API.Client { 'use strict'; - export class Order { + + + + export interface Order { + + id: number; + + petId: number; + + quantity: number; + + shipDate: Date; + + /** * Order Status */ + status: Order.StatusEnum; + + complete: boolean; + } - export module Order { - export enum StatusEnum { - placed = 'placed', - approved = 'approved', + export namespace Order { + + + + + + + + + + + + export enum StatusEnum { + placed = 'placed', + approved = 'approved', delivered = 'delivered', } + + + + } -} \ No newline at end of file + + + +} diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts index 9523bef90b0..acbb6bcb6c2 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts @@ -1,32 +1,67 @@ /// -module API.Client { +namespace API.Client { 'use strict'; - export class Pet { + + + + export interface Pet { + + id: number; + + category: Category; + + name: string; + + photoUrls: Array; + + tags: Array; + + /** * pet status in the store */ + status: Pet.StatusEnum; + } - export module Pet { - export enum StatusEnum { - available = 'available', - pending = 'pending', + export namespace Pet { + + + + + + + + + + + + + + export enum StatusEnum { + available = 'available', + pending = 'pending', sold = 'sold', } + + } -} \ No newline at end of file + + + +} diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts index b8eb8c3ae12..6e7dd50c6aa 100644 --- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts @@ -2,26 +2,48 @@ /* tslint:disable:no-unused-variable member-ordering */ -module API.Client { + +namespace API.Client { 'use strict'; + export class PetApi { - private basePath = 'http://petstore.swagger.io/v2'; + protected basePath = 'http://petstore.swagger.io/v2'; + public defaultHeaders : any = {}; static $inject: string[] = ['$http', '$httpParamSerializer']; - constructor(private $http: ng.IHttpService, basePath?: string, private $httpParamSerializer?: (any) => any) { + constructor(protected $http: ng.IHttpService, protected $httpParamSerializer?: (d: any) => any, basePath?: string) { if (basePath) { this.basePath = basePath; } } - public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/pet'; + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + + + public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { + const path = this.basePath + '/pet'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + + let httpRequestParams: any = { method: 'PUT', url: path, json: true, @@ -33,22 +55,27 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } - public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/pet'; - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { + const path = this.basePath + '/pet'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + + let httpRequestParams: any = { method: 'POST', url: path, json: true, @@ -60,26 +87,32 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } - public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { - var path = this.basePath + '/pet/findByStatus'; - var queryParameters: any = {}; - var headerParams: any = {}; + public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { + const path = this.basePath + '/pet/findByStatus'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + if (status !== undefined) { queryParameters['status'] = status; } - var httpRequestParams: any = { + + + + + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -90,26 +123,32 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } - public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { - var path = this.basePath + '/pet/findByTags'; - var queryParameters: any = {}; - var headerParams: any = {}; + public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { + const path = this.basePath + '/pet/findByTags'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + if (tags !== undefined) { queryParameters['tags'] = tags; } - var httpRequestParams: any = { + + + + + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -120,29 +159,33 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } + public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { - var path = this.basePath + '/pet/{petId}'; + const path = this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + - path = path.replace('{' + 'petId' + '}', String(petId)); - var queryParameters: any = {}; - var headerParams: any = {}; // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling getPetById'); } - var httpRequestParams: any = { + + + + + + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -153,37 +196,49 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } + public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/pet/{petId}'; + const path = this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + + let formParams: any = {}; + - path = path.replace('{' + 'petId' + '}', String(petId)); - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } + + + + + + + + headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; + + formParams['name'] = name; - + + formParams['status'] = status; - - var httpRequestParams: any = { + + + let httpRequestParams: any = { method: 'POST', url: path, json: false, @@ -195,31 +250,38 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } + public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/pet/{petId}'; + const path = this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + - path = path.replace('{' + 'petId' + '}', String(petId)); - var queryParameters: any = {}; - var headerParams: any = {}; // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling deletePet'); } + + + + + headerParams['api_key'] = apiKey; - var httpRequestParams: any = { + + + + let httpRequestParams: any = { method: 'DELETE', url: path, json: true, @@ -230,37 +292,49 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } + public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/pet/{petId}/uploadImage'; + const path = this.basePath + '/pet/{petId}/uploadImage' + .replace('{' + 'petId' + '}', String(petId)); + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + + let formParams: any = {}; + - path = path.replace('{' + 'petId' + '}', String(petId)); - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling uploadFile'); } + + + + + + + + headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; + + formParams['additionalMetadata'] = additionalMetadata; - + + formParams['file'] = file; - - var httpRequestParams: any = { + + + let httpRequestParams: any = { method: 'POST', url: path, json: false, @@ -272,14 +346,12 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } + } } + diff --git a/samples/client/petstore/typescript-angular/API/Client/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts index 2ec9b456f27..525d5ff8ab1 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Tag.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts @@ -1,13 +1,24 @@ /// -module API.Client { +namespace API.Client { 'use strict'; - export class Tag { + + + + export interface Tag { + + id: number; + + name: string; + } -} \ No newline at end of file + + + +} diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts index ca8ac57c7a3..274b2e866e3 100644 --- a/samples/client/petstore/typescript-angular/API/Client/User.ts +++ b/samples/client/petstore/typescript-angular/API/Client/User.ts @@ -1,28 +1,52 @@ /// -module API.Client { +namespace API.Client { 'use strict'; - export class User { + + + + export interface User { + + id: number; + + username: string; + + firstName: string; + + lastName: string; + + email: string; + + password: string; + + phone: string; + + /** * User Status */ + userStatus: number; + } -} \ No newline at end of file + + + +} diff --git a/samples/client/petstore/typescript-angular/tsconfig.json b/samples/client/petstore/typescript-angular/tsconfig.json index c389d5011ff..9bf11bd4cee 100644 --- a/samples/client/petstore/typescript-angular/tsconfig.json +++ b/samples/client/petstore/typescript-angular/tsconfig.json @@ -1,18 +1,19 @@ { - "compilerOptions": { - "noImplicitAny": true, - "out": "client.js" - }, - "files": [ - "API/Client/Category.ts", - "API/Client/Pet.ts", - "API/Client/StoreApi.ts", - "API/Client/User.ts", - "API/Client/api.d.ts", - "API/Client/Order.ts", - "API/Client/PetApi.ts", - "API/Client/Tag.ts", - "API/Client/UserApi.ts", - "typings/tsd.d.ts" - ] + "compilerOptions": { + "noImplicitAny": true, + "suppressImplicitAnyIndexErrors": true, + "out": "client.js" + }, + "files": [ + "API/Client/Category.ts", + "API/Client/Pet.ts", + "API/Client/StoreApi.ts", + "API/Client/User.ts", + "API/Client/api.d.ts", + "API/Client/Order.ts", + "API/Client/PetApi.ts", + "API/Client/Tag.ts", + "API/Client/UserApi.ts", + "typings/tsd.d.ts" + ] } diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 148782a4000..7ee27e06dd1 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -8,69 +8,181 @@ import http = require('http'); /* tslint:disable:no-unused-variable */ + + + export class User { + + id: number; + + username: string; + + firstName: string; + + lastName: string; + + email: string; + + password: string; + + phone: string; + + /** * User Status */ + userStatus: number; + } + + + + + export class Category { + + id: number; + + name: string; + } + + + + + export class Pet { + + id: number; + + category: Category; + + name: string; + + photoUrls: Array; + + tags: Array; + + /** * pet status in the store */ + status: Pet.StatusEnum; + } -export module Pet { + +export namespace Pet { + + + + + + + + + + + + export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } -} -export class Tag { - id: number; - name: string; + + } -export class Order { + + + + +export class Tag { + + id: number; + + + name: string; + +} + + + + + + +export class Order { + + + id: number; + + petId: number; + + quantity: number; + + shipDate: Date; + + /** * Order Status */ + status: Order.StatusEnum; + + complete: boolean; + } -export module Order { + +export namespace Order { + + + + + + + + + + export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } + + + + } + + + interface Authentication { /** * Apply authentication settings to header and query params. @@ -117,17 +229,46 @@ class VoidAuth implements Authentication { } } + + + + export class UserApi { - private basePath = 'http://petstore.swagger.io/v2'; + protected basePath = 'http://petstore.swagger.io/v2'; + protected defaultHeaders : any = {}; + + + public authentications = { 'default': new VoidAuth(), - 'api_key': new ApiKeyAuth('header', 'api_key'), + + + + 'petstore_auth': new OAuth(), + + + + + 'api_key': new ApiKeyAuth('header', 'api_key'), + + + } constructor(url: string, basePath?: string); + + + + + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { + + + + + if (basePath) { this.basePath = basePath; } @@ -138,31 +279,56 @@ export class UserApi { } } + + + + + + + + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } - public createUser (body?: User) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/user'; - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - var useFormData = false; + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/user'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -188,27 +354,33 @@ export class UserApi { return deferred.promise; } - public createUsersWithArrayInput (body?: Array) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/user/createWithArray'; - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + public createUsersWithArrayInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/user/createWithArray'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -234,27 +406,33 @@ export class UserApi { return deferred.promise; } - public createUsersWithListInput (body?: Array) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/user/createWithList'; - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + public createUsersWithListInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/user/createWithList'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -280,34 +458,41 @@ export class UserApi { return deferred.promise; } + public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string; }> { - var path = this.url + this.basePath + '/user/login'; + const path = this.url + this.basePath + '/user/login'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; if (username !== undefined) { queryParameters['username'] = username; } + if (password !== undefined) { queryParameters['password'] = password; } - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); + + let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -333,26 +518,31 @@ export class UserApi { return deferred.promise; } - public logoutUser () : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/user/logout'; - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + public logoutUser () : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/user/logout'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -378,14 +568,13 @@ export class UserApi { return deferred.promise; } + public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User; }> { - var path = this.url + this.basePath + '/user/{username}'; - - path = path.replace('{' + 'username' + '}', String(username)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + const path = this.url + this.basePath + '/user/{username}' + .replace('{' + 'username' + '}', String(username)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; // verify required parameter 'username' is set @@ -393,18 +582,23 @@ export class UserApi { throw new Error('Missing required parameter username when calling getUserByName'); } - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); + + let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -430,14 +624,13 @@ export class UserApi { return deferred.promise; } - public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/user/{username}'; - path = path.replace('{' + 'username' + '}', String(username)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/user/{username}' + .replace('{' + 'username' + '}', String(username)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; // verify required parameter 'username' is set @@ -445,19 +638,25 @@ export class UserApi { throw new Error('Missing required parameter username when calling updateUser'); } - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'PUT', qs: queryParameters, headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -483,14 +682,13 @@ export class UserApi { return deferred.promise; } - public deleteUser (username: string) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/user/{username}'; - path = path.replace('{' + 'username' + '}', String(username)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/user/{username}' + .replace('{' + 'username' + '}', String(username)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; // verify required parameter 'username' is set @@ -498,18 +696,23 @@ export class UserApi { throw new Error('Missing required parameter username when calling deleteUser'); } - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'DELETE', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -534,478 +737,48 @@ export class UserApi { return deferred.promise; } + } -export class PetApi { - private basePath = 'http://petstore.swagger.io/v2'; - public authentications = { - 'default': new VoidAuth(), - 'api_key': new ApiKeyAuth('header', 'api_key'), - 'petstore_auth': new OAuth(), - } - constructor(url: string, basePath?: string); - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { - if (password) { - if (basePath) { - this.basePath = basePath; - } - } else { - if (basePathOrUsername) { - this.basePath = basePathOrUsername - } - } - } - set apiKey(key: string) { - this.authentications.api_key.apiKey = key; - } - public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/pet'; - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - var useFormData = false; - - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - - var requestOptions: request.Options = { - method: 'PUT', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - body: body, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/pet'; - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - var useFormData = false; - - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - - var requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - body: body, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { - var path = this.url + this.basePath + '/pet/findByStatus'; - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - if (status !== undefined) { - queryParameters['status'] = status; - } - - var useFormData = false; - - var deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); - - var requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { - var path = this.url + this.basePath + '/pet/findByTags'; - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - if (tags !== undefined) { - queryParameters['tags'] = tags; - } - - var useFormData = false; - - var deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); - - var requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { - var path = this.url + this.basePath + '/pet/{petId}'; - - path = path.replace('{' + 'petId' + '}', String(petId)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling getPetById'); - } - - var useFormData = false; - - var deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); - - var requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.api_key.applyToRequest(requestOptions); - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/pet/{petId}'; - - path = path.replace('{' + 'petId' + '}', String(petId)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling updatePetWithForm'); - } - - var useFormData = false; - - if (name !== undefined) { - formParams['name'] = name; - } - - if (status !== undefined) { - formParams['status'] = status; - } - - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - - var requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/pet/{petId}'; - - path = path.replace('{' + 'petId' + '}', String(petId)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling deletePet'); - } - - headerParams['api_key'] = apiKey; - - var useFormData = false; - - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - - var requestOptions: request.Options = { - method: 'DELETE', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/pet/{petId}/uploadImage'; - - path = path.replace('{' + 'petId' + '}', String(petId)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling uploadFile'); - } - - var useFormData = false; - - if (additionalMetadata !== undefined) { - formParams['additionalMetadata'] = additionalMetadata; - } - - if (file !== undefined) { - formParams['file'] = file; - } - useFormData = true; - - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - - var requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } -} export class StoreApi { - private basePath = 'http://petstore.swagger.io/v2'; + protected basePath = 'http://petstore.swagger.io/v2'; + protected defaultHeaders : any = {}; + + + public authentications = { 'default': new VoidAuth(), - 'api_key': new ApiKeyAuth('header', 'api_key'), + + + + 'petstore_auth': new OAuth(), + + + + + 'api_key': new ApiKeyAuth('header', 'api_key'), + + + } constructor(url: string, basePath?: string); + + + + + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { + + + + + if (basePath) { this.basePath = basePath; } @@ -1016,32 +789,57 @@ export class StoreApi { } } + + + + + + + + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } + + + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } + + public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { - var path = this.url + this.basePath + '/store/inventory'; - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + const path = this.url + this.basePath + '/store/inventory'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); + + let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.api_key.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1067,27 +865,33 @@ export class StoreApi { return deferred.promise; } + public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { - var path = this.url + this.basePath + '/store/order'; - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + const path = this.url + this.basePath + '/store/order'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + + let requestOptions: request.Options = { method: 'POST', qs: queryParameters, headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1113,14 +917,13 @@ export class StoreApi { return deferred.promise; } + public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { - var path = this.url + this.basePath + '/store/order/{orderId}'; - - path = path.replace('{' + 'orderId' + '}', String(orderId)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + const path = this.url + this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; // verify required parameter 'orderId' is set @@ -1128,18 +931,23 @@ export class StoreApi { throw new Error('Missing required parameter orderId when calling getOrderById'); } - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + + let requestOptions: request.Options = { method: 'GET', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1165,14 +973,13 @@ export class StoreApi { return deferred.promise; } - public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; }> { - var path = this.url + this.basePath + '/store/order/{orderId}'; - path = path.replace('{' + 'orderId' + '}', String(orderId)); - - var queryParameters: any = {}; - var headerParams: any = {}; - var formParams: any = {}; + public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; // verify required parameter 'orderId' is set @@ -1180,18 +987,23 @@ export class StoreApi { throw new Error('Missing required parameter orderId when calling deleteOrder'); } - var useFormData = false; - var deferred = promise.defer<{ response: http.ClientResponse; }>(); - var requestOptions: request.Options = { + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { method: 'DELETE', qs: queryParameters, headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1216,4 +1028,573 @@ export class StoreApi { return deferred.promise; } + } + + + + +export class PetApi { + protected basePath = 'http://petstore.swagger.io/v2'; + protected defaultHeaders : any = {}; + + + + public authentications = { + 'default': new VoidAuth(), + + + + + 'petstore_auth': new OAuth(), + + + + + 'api_key': new ApiKeyAuth('header', 'api_key'), + + + + } + + constructor(url: string, basePath?: string); + + + + + + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { + if (password) { + + + + + + if (basePath) { + this.basePath = basePath; + } + } else { + if (basePathOrUsername) { + this.basePath = basePathOrUsername + } + } + } + + + + + + + + + + set apiKey(key: string) { + this.authentications.api_key.apiKey = key; + } + + + + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } + + + public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'PUT', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + body: body, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + body: body, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { + const path = this.url + this.basePath + '/pet/findByStatus'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + if (status !== undefined) { + queryParameters['status'] = status; + } + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { + const path = this.url + this.basePath + '/pet/findByTags'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + if (tags !== undefined) { + queryParameters['tags'] = tags; + } + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { + const path = this.url + this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling getPetById'); + } + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.api_key.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling updatePetWithForm'); + } + + + + let useFormData = false; + + + if (name !== undefined) { + formParams['name'] = name; + } + + + + if (status !== undefined) { + formParams['status'] = status; + } + + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling deletePet'); + } + + + + headerParams['api_key'] = apiKey; + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'DELETE', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + + public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet/{petId}/uploadImage' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling uploadFile'); + } + + + + let useFormData = false; + + + if (additionalMetadata !== undefined) { + formParams['additionalMetadata'] = additionalMetadata; + } + + + + if (file !== undefined) { + formParams['file'] = file; + } + + useFormData = true; + + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + +} + + + diff --git a/samples/client/petstore/typescript-node/client.ts b/samples/client/petstore/typescript-node/client.ts index 111c76f03c7..506f33f014e 100644 --- a/samples/client/petstore/typescript-node/client.ts +++ b/samples/client/petstore/typescript-node/client.ts @@ -1,7 +1,7 @@ import api = require('./api'); import fs = require('fs'); -var petApi = new api.PetApi('http://petstore.swagger.io'); +var petApi = new api.PetApi('http://petstore.swagger.io/'); petApi.apiKey = 'special-key'; var pet = new api.Pet(); @@ -13,39 +13,39 @@ var exitCode = 0; // Test various API calls to the petstore petApi.addPet(pet) -.then((res) => { - var newPet = (res.response).body; - petId = (res.response).body.id; - console.log(`Created pet with ID ${petId}`); - newPet.status = api.Pet.StatusEnum.available; - return petApi.updatePet(newPet); -}) -.then((res) => { - console.log('Updated pet using POST body'); - return petApi.updatePetWithForm(petId, undefined, "pending"); -}) -.then((res) => { - console.log('Updated pet using POST form'); - return petApi.uploadFile(petId, undefined, fs.createReadStream('sample.png')); -}) -.then((res) => { - console.log('Uploaded image'); - return petApi.getPetById(petId); -}) -.then((res) => { - console.log('Got pet by ID: ' + JSON.stringify(res.body)); - if (res.body.status != api.Pet.StatusEnum.pending) { - throw new Error("Unexpected pet status"); - } -}) -.catch((err:any) => { - console.error(err); - exitCode = 1; -}) -.finally(() => { - return petApi.deletePet(petId); -}) -.then((res) => { - console.log('Deleted pet'); - process.exit(exitCode); -}); + .then((res) => { + var newPet = res.body; + petId = newPet.id; + console.log(`Created pet with ID ${petId}`); + newPet.status = api.Pet.StatusEnum.available; + return petApi.updatePet(newPet); + }) + .then((res) => { + console.log('Updated pet using POST body'); + return petApi.updatePetWithForm(petId, undefined, "pending"); + }) + .then((res) => { + console.log('Updated pet using POST form'); + return petApi.uploadFile(petId, undefined, fs.createReadStream('sample.png')); + }) + .then((res) => { + console.log('Uploaded image'); + return petApi.getPetById(petId); + }) + .then((res) => { + console.log('Got pet by ID: ' + JSON.stringify(res.body)); + if (res.body.status != api.Pet.StatusEnum.pending) { + throw new Error("Unexpected pet status"); + } + }) + .catch((err: any) => { + console.error(err); + exitCode = 1; + }) + .finally(() => { + return petApi.deletePet(petId); + }) + .then((res) => { + console.log('Deleted pet'); + process.exit(exitCode); + }); diff --git a/samples/client/petstore/typescript-node/tsconfig.json b/samples/client/petstore/typescript-node/tsconfig.json index 572228f6356..7c4f5847040 100644 --- a/samples/client/petstore/typescript-node/tsconfig.json +++ b/samples/client/petstore/typescript-node/tsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "module": "commonjs", "noImplicitAny": true, + "suppressImplicitAnyIndexErrors": true, "target": "ES5" }, "files": [ From abe44df1ec2adc4b7e3d5afbc0ef8553d19bf9b6 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 3 Nov 2015 16:39:54 +0800 Subject: [PATCH 046/142] Ruby: support map/hash in model deserialization with additionalProperties For example, the "scoreMap" and "cateMap" properties below: "definitions": { "User": { "properties": { "scoreMap": { "type": "object", "additionalProperties": { "type": "integer", "format": "int32", } }, "cateMap": { "type": "object", "additionalProperties": { "$ref": "#/definitions/Category" } } } } } --- .../main/resources/ruby/base_object.mustache | 25 ++++++++++++++----- .../ruby/lib/petstore/models/base_object.rb | 25 ++++++++++++++----- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache b/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache index ccf6db4a4fd..ddb68998e9e 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache @@ -42,6 +42,17 @@ module {{moduleName}} else false end + when /\AArray<(?.+)>\z/ + inner_type = Regexp.last_match[:inner_type] + value.map { |v| _deserialize(inner_type, v) } + when /\AHash<(?.+), (?.+)>\z/ + k_type = Regexp.last_match[:k_type] + v_type = Regexp.last_match[:v_type] + {}.tap do |hash| + value.each do |k, v| + hash[_deserialize(k_type, k)] = _deserialize(v_type, v) + end + end else # model _model = {{moduleName}}.const_get(type).new _model.build_from_hash(value) @@ -63,11 +74,7 @@ module {{moduleName}} self.class.attribute_map.each_pair do |attr, param| value = self.send(attr) next if value.nil? - if value.is_a?(Array) - hash[param] = value.compact.map{ |v| _to_hash(v) } - else - hash[param] = _to_hash(value) - end + hash[param] = _to_hash(value) end hash end @@ -75,7 +82,13 @@ module {{moduleName}} # Method to output non-array value in the form of hash # For object, use to_hash. Otherwise, just return the value def _to_hash(value) - if value.respond_to? :to_hash + if value.is_a?(Array) + value.compact.map{ |v| _to_hash(v) } + elsif value.is_a?(Hash) + {}.tap do |hash| + value.each { |k, v| hash[k] = _to_hash(v) } + end + elsif value.respond_to? :to_hash value.to_hash else value diff --git a/samples/client/petstore/ruby/lib/petstore/models/base_object.rb b/samples/client/petstore/ruby/lib/petstore/models/base_object.rb index 4a9a781ae64..af0ec63e79f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/base_object.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/base_object.rb @@ -42,6 +42,17 @@ module Petstore else false end + when /\AArray<(?.+)>\z/ + inner_type = Regexp.last_match[:inner_type] + value.map { |v| _deserialize(inner_type, v) } + when /\AHash<(?.+), (?.+)>\z/ + k_type = Regexp.last_match[:k_type] + v_type = Regexp.last_match[:v_type] + {}.tap do |hash| + value.each do |k, v| + hash[_deserialize(k_type, k)] = _deserialize(v_type, v) + end + end else # model _model = Petstore.const_get(type).new _model.build_from_hash(value) @@ -63,11 +74,7 @@ module Petstore self.class.attribute_map.each_pair do |attr, param| value = self.send(attr) next if value.nil? - if value.is_a?(Array) - hash[param] = value.compact.map{ |v| _to_hash(v) } - else - hash[param] = _to_hash(value) - end + hash[param] = _to_hash(value) end hash end @@ -75,7 +82,13 @@ module Petstore # Method to output non-array value in the form of hash # For object, use to_hash. Otherwise, just return the value def _to_hash(value) - if value.respond_to? :to_hash + if value.is_a?(Array) + value.compact.map{ |v| _to_hash(v) } + elsif value.is_a?(Hash) + {}.tap do |hash| + value.each { |k, v| hash[k] = _to_hash(v) } + end + elsif value.respond_to? :to_hash value.to_hash else value From 42e10fbb14ed979dc68936577f867883171ca89c Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 30 Oct 2015 16:33:07 +0800 Subject: [PATCH 047/142] better error handling for invalid array/map type --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index e86d4c9cd78..e61864b1e81 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -814,6 +814,7 @@ public class DefaultCodegen { LOGGER.error("unexpected missing property for name " + name); return null; } + CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY); property.name = toVarName(name); @@ -1907,6 +1908,12 @@ public class DefaultCodegen { // character with _ or empty character. Below aims to spell out different cases we've // encountered so far and hopefully make it easier for others to add more special // cases in the future. + + // better error handling when map/array type is invalid + if (name == null) { + LOGGER.error("String to be sanitized is null. Default to ERROR_UNKNOWN"); + return "ERROR_UNKNOWN"; + } // input[] => input name = name.replaceAll("\\[\\]", ""); From c8ce84f65029931ad4ef1a76c3b9e6f38508abbb Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 30 Oct 2015 16:37:23 +0800 Subject: [PATCH 048/142] replace tab with space, update samples --- .../io/swagger/codegen/DefaultCodegen.java | 4 +- samples/client/petstore/java/default/pom.xml | 6 +- .../java/io/swagger/client/ApiException.java | 2 +- .../java/io/swagger/client/Configuration.java | 2 +- .../src/main/java/io/swagger/client/JSON.java | 2 +- .../src/main/java/io/swagger/client/Pair.java | 2 +- .../java/io/swagger/client/StringUtil.java | 2 +- .../main/java/io/swagger/client/TypeRef.java | 2 +- .../java/io/swagger/client/api/PetApi.java | 2 +- .../java/io/swagger/client/api/StoreApi.java | 2 +- .../java/io/swagger/client/api/UserApi.java | 2 +- .../io/swagger/client/auth/ApiKeyAuth.java | 2 +- .../swagger/client/auth/Authentication.java | 2 +- .../io/swagger/client/auth/HttpBasicAuth.java | 2 +- .../io/swagger/client/model/Category.java | 2 +- .../java/io/swagger/client/model/Order.java | 2 +- .../java/io/swagger/client/model/Pet.java | 2 +- .../java/io/swagger/client/model/Tag.java | 2 +- .../java/io/swagger/client/model/User.java | 2 +- .../dynamic-html/docs/assets/css/style.css | 4 + .../dynamic-html/docs/models/Category.html | 6 +- samples/dynamic-html/docs/models/Order.html | 30 +- samples/dynamic-html/docs/models/Pet.html | 30 +- samples/dynamic-html/docs/models/Tag.html | 6 +- samples/dynamic-html/docs/models/User.html | 24 +- samples/html/index.html | 2256 ++++++++++++----- 26 files changed, 1669 insertions(+), 731 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index e61864b1e81..275bf9f10ee 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1911,8 +1911,8 @@ public class DefaultCodegen { // better error handling when map/array type is invalid if (name == null) { - LOGGER.error("String to be sanitized is null. Default to ERROR_UNKNOWN"); - return "ERROR_UNKNOWN"; + LOGGER.error("String to be sanitized is null. Default to ERROR_UNKNOWN"); + return "ERROR_UNKNOWN"; } // input[] => input diff --git a/samples/client/petstore/java/default/pom.xml b/samples/client/petstore/java/default/pom.xml index da49f3b2fb0..894e318b5f3 100644 --- a/samples/client/petstore/java/default/pom.xml +++ b/samples/client/petstore/java/default/pom.xml @@ -6,11 +6,7 @@ jar swagger-java-client 1.0.0 - - scm:git:git@github.com:swagger-api/swagger-mustache.git - scm:git:git@github.com:swagger-api/swagger-codegen.git - https://github.com/swagger-api/swagger-codegen - + 2.2.0 diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java index c09e4939e94..4ed22daabcd 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java @@ -3,7 +3,7 @@ package io.swagger.client; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class ApiException extends Exception { private int code = 0; private Map> responseHeaders = null; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java index 692018a52d3..8d0b098e28d 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class Configuration { private static ApiClient defaultApiClient = new ApiClient(); diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java index 1986a6badbf..60872714a37 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.datatype.joda.*; import java.io.IOException; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:29.717+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class JSON { private ObjectMapper mapper; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java index bc45efb5ce0..58afaafb158 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class Pair { private String name = ""; private String value = ""; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java index c2f943c731f..e1536c68473 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java index c30d70add6b..b1ba48408db 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java @@ -3,7 +3,7 @@ package io.swagger.client; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class TypeRef { private final Type type; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java index 23782e03e72..34e29bdc521 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java @@ -11,7 +11,7 @@ import java.io.File; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:29.717+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class PetApi { private ApiClient apiClient; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java index f8c0fc58682..a2f2900dd40 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java @@ -11,7 +11,7 @@ import io.swagger.client.model.Order; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:29.717+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class StoreApi { private ApiClient apiClient; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java index f6ab0ae0814..9be6bbfa67f 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java @@ -11,7 +11,7 @@ import java.util.*; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:29.717+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class UserApi { private ApiClient apiClient; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index bc6e2f87def..14891e3504f 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -5,7 +5,7 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java index 45a92c1323c..d74fd356989 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java @@ -5,7 +5,7 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public interface Authentication { /** Apply authentication settings to header and query params. */ void applyToParams(List queryParams, Map headerParams); diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java index bb14cab5a2c..99ff90e4c6f 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java @@ -8,7 +8,7 @@ import java.util.List; import java.io.UnsupportedEncodingException; import javax.xml.bind.DatatypeConverter; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class HttpBasicAuth implements Authentication { private String username; private String password; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java index b12b44dd1c8..1d1d9e1d1b5 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class Category { private Long id = null; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java index 7e4e43420c9..9c6094aefbf 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class Order { private Long id = null; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java index ba497232881..b842a7800de 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class Pet { private Long id = null; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java index 68918590789..d52ef12d01c 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class Tag { private Long id = null; diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java index 271bf3b19d7..8aa9e34283f 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T10:56:59.550-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") public class User { private Long id = null; diff --git a/samples/dynamic-html/docs/assets/css/style.css b/samples/dynamic-html/docs/assets/css/style.css index f14f6bdb62c..b596c11a535 100644 --- a/samples/dynamic-html/docs/assets/css/style.css +++ b/samples/dynamic-html/docs/assets/css/style.css @@ -100,6 +100,10 @@ float: left; } +.param-enum { + margin-left: 20px; +} + .section-header { border-bottom: 2px; font-weight: bold; diff --git a/samples/dynamic-html/docs/models/Category.html b/samples/dynamic-html/docs/models/Category.html index 15c6820eead..99ec473bcc7 100644 --- a/samples/dynamic-html/docs/models/Category.html +++ b/samples/dynamic-html/docs/models/Category.html @@ -3,13 +3,15 @@
  • id : Long -
    +
    +
  • name : String -
    +
    +
diff --git a/samples/dynamic-html/docs/models/Order.html b/samples/dynamic-html/docs/models/Order.html index 82278a470c2..a45f7d6cd65 100644 --- a/samples/dynamic-html/docs/models/Order.html +++ b/samples/dynamic-html/docs/models/Order.html @@ -3,37 +3,55 @@
  • id : Long -
    +
    +
  • petId : Long -
    +
    +
  • quantity : Integer -
    +
    +
  • shipDate : Date -
    +
    +
  • status : String -
    Order Status +
    Order Status + +
    +
    Enum: + +
    placed
    + +
    approved
    + +
    delivered
    + + +
    +
  • complete : Boolean -
    +
    +
diff --git a/samples/dynamic-html/docs/models/Pet.html b/samples/dynamic-html/docs/models/Pet.html index 17468477704..2578f97e660 100644 --- a/samples/dynamic-html/docs/models/Pet.html +++ b/samples/dynamic-html/docs/models/Pet.html @@ -3,37 +3,55 @@
  • id : Long -
    +
    +
  • category : Category -
    +
    +
  • name : String -
    +
    +
  • photoUrls : List -
    +
    +
  • tags : List -
    +
    +
  • status : String -
    pet status in the store +
    pet status in the store + +
    +
    Enum: + +
    available
    + +
    pending
    + +
    sold
    + + +
    +
diff --git a/samples/dynamic-html/docs/models/Tag.html b/samples/dynamic-html/docs/models/Tag.html index e84b50d73d6..bf1ef9eadaf 100644 --- a/samples/dynamic-html/docs/models/Tag.html +++ b/samples/dynamic-html/docs/models/Tag.html @@ -3,13 +3,15 @@
  • id : Long -
    +
    +
  • name : String -
    +
    +
diff --git a/samples/dynamic-html/docs/models/User.html b/samples/dynamic-html/docs/models/User.html index c71cf6649d7..d742aa7cfde 100644 --- a/samples/dynamic-html/docs/models/User.html +++ b/samples/dynamic-html/docs/models/User.html @@ -3,49 +3,57 @@
  • id : Long -
    +
    +
  • username : String -
    +
    +
  • firstName : String -
    +
    +
  • lastName : String -
    +
    +
  • email : String -
    +
    +
  • password : String -
    +
    +
  • phone : String -
    +
    +
  • userStatus : Integer -
    User Status +
    User Status +
diff --git a/samples/html/index.html b/samples/html/index.html index 67d651d9307..cae7e02c9e0 100644 --- a/samples/html/index.html +++ b/samples/html/index.html @@ -1,685 +1,11 @@ - + + + - - API Reference - - -

Swagger Petstore

-
This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key \"special-key\" to test the authorization filters for
- -
Contact Info: apiteam@swagger.io
-
Version: 1.0.0
-
Apache 2.0
-
http://www.apache.org/licenses/LICENSE-2.0.html
-

Access

-
Customize this message as you see fit!
-

Methods

- - - -
- 
put: /pet
-
Pet
-
updatePet Update an existing pet
-
- -

Parameters

-
-
body (optional)
- -
Body Parameter — Pet object that needs to be added to the store
- -
-

Return type

- -
- - -
-
- -
- 
post: /pet
-
Pet
-
addPet Add a new pet to the store
-
- -

Parameters

-
-
body (optional)
- -
Body Parameter — Pet object that needs to be added to the store
- -
-

Return type

- -
- - -
-
- -
- 
get: /pet/findByStatus
-
Pet
-
findPetsByStatus Finds Pets by status
-
Multiple status values can be provided with comma seperated strings
- -

Parameters

-
-
status (optional)
- -
Query Parameter — Status values that need to be considered for filter default: available
- -
-

Return type

- -
array[Pet]
- - -

Example data

-
Content-Type: application/json
- 
[ {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
-  "id" : 123456789,
-  "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
-  },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-} ]
- -

Example data

-
Content-Type: application/xml
- 
<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>string</photoUrls>
-  <status>string</status>
-</Pet>
- -
-
- -
- 
get: /pet/findByTags
-
Pet
-
findPetsByTags Finds Pets by tags
-
Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
- -

Parameters

-
-
tags (optional)
- -
Query Parameter — Tags to filter by
- -
-

Return type

- -
array[Pet]
- - -

Example data

-
Content-Type: application/json
- 
[ {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
-  "id" : 123456789,
-  "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
-  },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-} ]
- -

Example data

-
Content-Type: application/xml
- 
<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>string</photoUrls>
-  <status>string</status>
-</Pet>
- -
-
- -
- 
get: /pet/{petId}
-
Pet
-
getPetById Find pet by ID
-
Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions
- -

Parameters

-
-
petId (required)
- -
Path Parameter — ID of pet that needs to be fetched
- -
-

Return type

- -
Pet
- - -

Example data

-
Content-Type: application/json
- 
{
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
-  "id" : 123456789,
-  "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
-  },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-}
- -

Example data

-
Content-Type: application/xml
- 
<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>string</photoUrls>
-  <status>string</status>
-</Pet>
- -
-
- -
- 
post: /pet/{petId}
-
Pet
-
updatePetWithForm Updates a pet in the store with form data
-
- -

Parameters

-
-
petId (required)
- -
Path Parameter — ID of pet that needs to be updated
-
name (optional)
- -
Form Parameter — Updated name of the pet
-
status (optional)
- -
Form Parameter — Updated status of the pet
- -
-

Return type

- -
- - -
-
- -
- 
delete: /pet/{petId}
-
Pet
-
deletePet Deletes a pet
-
- -

Parameters

-
-
apiKey (optional)
- -
Header Parameter —
-
petId (required)
- -
Path Parameter — Pet id to delete
- -
-

Return type

- -
- - -
-
- -
- 
post: /pet/{petId}/uploadImage
-
Pet
-
uploadFile uploads an image
-
- -

Parameters

-
-
petId (required)
- -
Path Parameter — ID of pet to update
-
additionalMetadata (optional)
- -
Form Parameter — Additional data to pass to server
-
file (optional)
- -
Form Parameter — file to upload
- -
-

Return type

- -
- - -
-
- -
- 
get: /store/inventory
-
Store
-
getInventory Returns pet inventories by status
-
Returns a map of status codes to quantities
- -

Parameters

-
- -
-

Return type

- -
map[String, Integer]
- - -

Example data

-
Content-Type: application/json
- 
{
-  "key" : 123
-}
- -

Example data

-
Content-Type: application/xml
- 
not implemented io.swagger.models.properties.MapProperty@3e
- -
-
- -
- 
post: /store/order
-
Store
-
placeOrder Place an order for a pet
-
- -

Parameters

-
-
body (optional)
- -
Body Parameter — order placed for purchasing the pet
- -
-

Return type

- -
Order
- - -

Example data

-
Content-Type: application/json
- 
{
-  "petId" : 123456789,
-  "quantity" : 123,
-  "id" : 123456789,
-  "shipDate" : "2015-06-09T07:23:55.625+0000",
-  "complete" : true,
-  "status" : "aeiou"
-}
- -

Example data

-
Content-Type: application/xml
- 
<Order>
-  <id>123456</id>
-  <petId>123456</petId>
-  <quantity>0</quantity>
-  <shipDate>2015-06-09T00:23:55.631Z</shipDate>
-  <status>string</status>
-  <complete>true</complete>
-</Order>
- -
-
- -
- 
get: /store/order/{orderId}
-
Store
-
getOrderById Find purchase order by ID
-
For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
- -

Parameters

-
-
orderId (required)
- -
Path Parameter — ID of pet that needs to be fetched
- -
-

Return type

- -
Order
- - -

Example data

-
Content-Type: application/json
- 
{
-  "petId" : 123456789,
-  "quantity" : 123,
-  "id" : 123456789,
-  "shipDate" : "2015-06-09T07:23:55.632+0000",
-  "complete" : true,
-  "status" : "aeiou"
-}
- -

Example data

-
Content-Type: application/xml
- 
<Order>
-  <id>123456</id>
-  <petId>123456</petId>
-  <quantity>0</quantity>
-  <shipDate>2015-06-09T00:23:55.633Z</shipDate>
-  <status>string</status>
-  <complete>true</complete>
-</Order>
- -
-
- -
- 
delete: /store/order/{orderId}
-
Store
-
deleteOrder Delete purchase order by ID
-
For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
- -

Parameters

-
-
orderId (required)
- -
Path Parameter — ID of the order that needs to be deleted
- -
-

Return type

- -
- - -
-
- -
- 
post: /user
-
User
-
createUser Create user
-
This can only be done by the logged in user.
- -

Parameters

-
-
body (optional)
- -
Body Parameter — Created user object
- -
-

Return type

- -
- - -
-
- -
- 
post: /user/createWithArray
-
User
-
createUsersWithArrayInput Creates list of users with given input array
-
- -

Parameters

-
-
body (optional)
- -
Body Parameter — List of user object
- -
-

Return type

- -
- - -
-
- -
- 
post: /user/createWithList
-
User
-
createUsersWithListInput Creates list of users with given input array
-
- -

Parameters

-
-
body (optional)
- -
Body Parameter — List of user object
- -
-

Return type

- -
- - -
-
- -
- 
get: /user/login
-
User
-
loginUser Logs user into the system
-
- -

Parameters

-
-
username (optional)
- -
Query Parameter — The user name for login
-
password (optional)
- -
Query Parameter — The password for login in clear text
- -
-

Return type

- -
String
- - -

Example data

-
Content-Type: application/json
- 
"aeiou"
- -

Example data

-
Content-Type: application/xml
- 
string
- -
-
- -
- 
get: /user/logout
-
User
-
logoutUser Logs out current logged in user session
-
- -

Parameters

-
- -
-

Return type

- -
- - -
-
- -
- 
get: /user/{username}
-
User
-
getUserByName Get user by user name
-
- -

Parameters

-
-
username (required)
- -
Path Parameter — The name that needs to be fetched. Use user1 for testing.
- -
-

Return type

- -
User
- - -

Example data

-
Content-Type: application/json
- 
{
-  "id" : 1,
-  "username" : "johnp",
-  "firstName" : "John",
-  "lastName" : "Public",
-  "email" : "johnp@swagger.io",
-  "password" : "-secret-",
-  "phone" : "0123456789",
-  "userStatus" : 0
-}
- -
-
- -
- 
put: /user/{username}
-
User
-
updateUser Updated user
-
This can only be done by the logged in user.
- -

Parameters

-
-
username (required)
- -
Path Parameter — name that need to be deleted
-
body (optional)
- -
Body Parameter — Updated user object
- -
-

Return type

- -
- - -
-
- -
- 
delete: /user/{username}
-
User
-
deleteUser Delete user
-
This can only be done by the logged in user.
- -

Parameters

-
-
username (required)
- -
Path Parameter — The name that needs to be deleted
- -
-

Return type

- -
- - -
-
- - - -

Models

- - -
-

User

-
-
id
Long
-
username
String
-
firstName
String
-
lastName
String
-
email
String
-
password
String
-
phone
String
-
userStatus
Integer User Status
- -
-
- - - -
-

Category

-
-
id
Long
-
name
String
- -
-
- - - -
-

Pet

-
-
id
Long
-
category
Category
-
name
String
-
photoUrls
array[String]
-
tags
array[Tag]
-
status
String pet status in the store
- -
-
- - - -
-

Tag

-
-
id
Long
-
name
String
- -
-
- - - -
-

Order

-
-
id
Long
-
petId
Long
-
quantity
Integer
-
shipDate
Date
-
status
String Order Status
-
complete
Boolean
- -
-
- - - + + + +

Swagger Petstore

+
This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key \"special-key\" to test the authorization filters
+ +
Contact Info: apiteam@swagger.io
+
Version: 1.0.0
+
Apache 2.0
+
http://www.apache.org/licenses/LICENSE-2.0.html
+

Access

+ + +

Methods

+ [ Jump to Models ] + + +

Table of Contents

+
+ +
    + + + +
  1. put /pet
    2. + +
  2. post /pet
    3. + +
  3. get /pet/findByStatus
    4. + +
  4. get /pet/findByTags
    5. + +
  5. get /pet/{petId}
    6. + +
  6. post /pet/{petId}
    7. + +
  7. delete /pet/{petId}
    8. + +
  8. post /pet/{petId}/uploadImage
    9. + +
  9. get /store/inventory
    10. + +
  10. post /store/order
    11. + +
  11. get /store/order/{orderId}
    12. + +
  12. delete /store/order/{orderId}
    13. + +
  13. post /user
    14. + +
  14. post /user/createWithArray
    15. + +
  15. post /user/createWithList
    16. + +
  16. get /user/login
    17. + +
  17. get /user/logout
    18. + +
  18. get /user/{username}
    19. + +
  19. put /user/{username}
    20. + +
  20. delete /user/{username}
    21. + + + +
+ + + + + + +
+
+ Up + 
put /pet
+
Update an existing pet (updatePet)
+ +
+ + + + +

Consumes

+ This API call consumes the following media types via the Content-Type request header: +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + + +

Request body

+
+
body (optional)
+ +
Body Parameter — Pet object that needs to be added to the store
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

400

+ Invalid ID supplied + + +

404

+ Pet not found + + +

405

+ Validation exception + + +
+
+ +
+
+ Up + 
post /pet
+
Add a new pet to the store (addPet)
+ +
+ + + + +

Consumes

+ This API call consumes the following media types via the Content-Type request header: +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + + +

Request body

+
+
body (optional)
+ +
Body Parameter — Pet object that needs to be added to the store
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

405

+ Invalid input + + +
+
+ +
+
+ Up + 
get /pet/findByStatus
+
Finds Pets by status (findPetsByStatus)
+ +
Multiple status values can be provided with comma seperated strings
+ + + + + + + + + + +

Query parameters

+
+
status (optional)
+ +
Query Parameter — Status values that need to be considered for filter default: available
+
+ + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +

400

+ Invalid status value + + +
+
+ +
+
+ Up + 
get /pet/findByTags
+
Finds Pets by tags (findPetsByTags)
+ +
Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+ + + + + + + + + + +

Query parameters

+
+
tags (optional)
+ +
Query Parameter — Tags to filter by
+
+ + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +

400

+ Invalid tag value + + +
+
+ +
+
+ Up + 
get /pet/{petId}
+
Find pet by ID (getPetById)
+ +
Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions
+ + +

Path parameters

+
+
petId (required)
+ +
Path Parameter — ID of pet that needs to be fetched
+
+ + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +

400

+ Invalid ID supplied + + +

404

+ Pet not found + + +
+
+ +
+
+ Up + 
post /pet/{petId}
+
Updates a pet in the store with form data (updatePetWithForm)
+ +
+ + +

Path parameters

+
+
petId (required)
+ +
Path Parameter — ID of pet that needs to be updated
+
+ + + +

Consumes

+ This API call consumes the following media types via the Content-Type request header: +
    + +
  • application/x-www-form-urlencoded
    • + +
+ + + + + + + + + +

Form parameters

+
+
name (optional)
+ +
Form Parameter — Updated name of the pet
status (optional)
+ +
Form Parameter — Updated status of the pet
+
+ + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

405

+ Invalid input + + +
+
+ +
+
+ Up + 
delete /pet/{petId}
+
Deletes a pet (deletePet)
+ +
+ + +

Path parameters

+
+
petId (required)
+ +
Path Parameter — Pet id to delete
+
+ + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

400

+ Invalid pet value + + +
+
+ +
+
+ Up + 
post /pet/{petId}/uploadImage
+
uploads an image (uploadFile)
+ +
+ + +

Path parameters

+
+
petId (required)
+ +
Path Parameter — ID of pet to update
+
+ + + +

Consumes

+ This API call consumes the following media types via the Content-Type request header: +
    + +
  • multipart/form-data
    • + +
+ + + + + + + + + +

Form parameters

+
+
additionalMetadata (optional)
+ +
Form Parameter — Additional data to pass to server
file (optional)
+ +
Form Parameter — file to upload
+
+ + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

0

+ successful operation + + +
+
+ +
+
+ Up + 
get /store/inventory
+
Returns pet inventories by status (getInventory)
+ +
Returns a map of status codes to quantities
+ + + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +
+
+ +
+
+ Up + 
post /store/order
+
Place an order for a pet (placeOrder)
+ +
+ + + + + + +

Request body

+
+
body (optional)
+ +
Body Parameter — order placed for purchasing the pet
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +

400

+ Invalid Order + + +
+
+ +
+
+ Up + 
get /store/order/{orderId}
+
Find purchase order by ID (getOrderById)
+ +
For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ + +

Path parameters

+
+
orderId (required)
+ +
Path Parameter — ID of pet that needs to be fetched
+
+ + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +

400

+ Invalid ID supplied + + +

404

+ Order not found + + +
+
+ +
+
+ Up + 
delete /store/order/{orderId}
+
Delete purchase order by ID (deleteOrder)
+ +
For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+ + +

Path parameters

+
+
orderId (required)
+ +
Path Parameter — ID of the order that needs to be deleted
+
+ + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

400

+ Invalid ID supplied + + +

404

+ Order not found + + +
+
+ +
+
+ Up + 
post /user
+
Create user (createUser)
+ +
This can only be done by the logged in user.
+ + + + + + +

Request body

+
+
body (optional)
+ +
Body Parameter — Created user object
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

0

+ successful operation + + +
+
+ +
+
+ Up + 
post /user/createWithArray
+
Creates list of users with given input array (createUsersWithArrayInput)
+ +
+ + + + + + +

Request body

+
+
body (optional)
+ +
Body Parameter — List of user object
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

0

+ successful operation + + +
+
+ +
+
+ Up + 
post /user/createWithList
+
Creates list of users with given input array (createUsersWithListInput)
+ +
+ + + + + + +

Request body

+
+
body (optional)
+ +
Body Parameter — List of user object
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

0

+ successful operation + + +
+
+ +
+
+ Up + 
get /user/login
+
Logs user into the system (loginUser)
+ +
+ + + + + + + + + + +

Query parameters

+
+
username (optional)
+ +
Query Parameter — The user name for login
password (optional)
+ +
Query Parameter — The password for login in clear text
+
+ + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + + +

400

+ Invalid username/password supplied + + +
+
+ +
+
+ Up + 
get /user/logout
+
Logs out current logged in user session (logoutUser)
+ +
+ + + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

0

+ successful operation + + +
+
+ +
+
+ Up + 
get /user/{username}
+
Get user by user name (getUserByName)
+ +
+ + +

Path parameters

+
+
username (required)
+ +
Path Parameter — The name that needs to be fetched. Use user1 for testing.
+
+ + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

200

+ successful operation + +

Example data

+
Content-Type: application/json
+ 
{id=1, username=johnp, firstName=John, lastName=Public, email=johnp@swagger.io, password=-secret-, phone=0123456789, userStatus=0}
+ + +

400

+ Invalid username supplied + + +

404

+ User not found + + +
+
+ +
+
+ Up + 
put /user/{username}
+
Updated user (updateUser)
+ +
This can only be done by the logged in user.
+ + +

Path parameters

+
+
username (required)
+ +
Path Parameter — name that need to be deleted
+
+ + + + + +

Request body

+
+
body (optional)
+ +
Body Parameter — Updated user object
+
+ + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

400

+ Invalid user supplied + + +

404

+ User not found + + +
+
+ +
+
+ Up + 
delete /user/{username}
+
Delete user (deleteUser)
+ +
This can only be done by the logged in user.
+ + +

Path parameters

+
+
username (required)
+ +
Path Parameter — The name that needs to be deleted
+
+ + + + + + + + + + + + + + + + + +

Produces

+ This API call produces the following media types according to the Accept request header; + the media type will be conveyed by the Content-Type response header. +
    + +
  • application/json
    • + +
  • application/xml
    • + +
+ + +

Responses

+ +

400

+ Invalid username supplied + + +

404

+ User not found + + +
+
+ + + + + +
Up
+

Models

+ [ Jump to Methods ] + +

Table of Contents

+
    + + +
  1. User
    2. + + + +
  2. Category
    3. + + + +
  3. Pet
    4. + + + +
  4. Tag
    5. + + + +
  5. Order
    6. + + +
+ + + +
+

User Up

+
+
id
Long
+ +
username
String
+ +
firstName
String
+ +
lastName
String
+ +
email
String
+ +
password
String
+ +
phone
String
+ +
userStatus
Integer User Status
+ + +
+
+ + + +
+

Category Up

+
+
id
Long
+ +
name
String
+ + +
+
+ + + +
+

Pet Up

+
+
id
Long
+ +
category
Category
+ +
name
String
+ +
photoUrls
array[String]
+ +
tags
array[Tag]
+ +
status
String pet status in the store
+ +
Enum:
+
available
pending
sold
+ + +
+
+ + + +
+

Tag Up

+
+
id
Long
+ +
name
String
+ + +
+
+ + + +
+

Order Up

+
+
id
Long
+ +
petId
Long
+ +
quantity
Integer
+ +
shipDate
Date
+ +
status
String Order Status
+ +
Enum:
+
placed
approved
delivered
+ +
complete
Boolean
+ + +
+
+ + - \ No newline at end of file + From 8428e7963bde1269d59d43b7a88f9b3d906e87b1 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Tue, 3 Nov 2015 16:46:47 +0100 Subject: [PATCH 049/142] Rebuild perl petstore client after previous updates At least 2 previous updates were committed without rebuilding the perl petstore client. One was my fault (BaseObject.pm changes), the other changes come from an upstream update or updates I can't identify. --- .../perl/lib/WWW/SwaggerClient/ApiClient.pm | 1 + .../WWW/SwaggerClient/Object/ApiResponse.pm | 59 ++++++++++++++++++ .../WWW/SwaggerClient/Object/BaseObject.pm | 16 ++--- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 61 +++++++++++++------ .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 17 ++++-- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 58 +++++++++++++----- samples/client/petstore/perl/t/01_pet_api.t | 6 +- 7 files changed, 169 insertions(+), 49 deletions(-) create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index 6245329197a..f75bf24e031 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -153,6 +153,7 @@ sub to_query_value { } } + # Take value and turn it into a string suitable for inclusion in # the header. If it's a string, pass through unchanged # If it's a datetime object, format it in ISO8601 diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm new file mode 100644 index 00000000000..02c36f17262 --- /dev/null +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm @@ -0,0 +1,59 @@ +package WWW::SwaggerClient::Object::ApiResponse; + +require 5.6.0; +use strict; +use warnings; +use utf8; +use JSON qw(decode_json); +use Data::Dumper; +use Module::Runtime qw(use_module); +use Log::Any qw($log); +use Date::Parse; +use DateTime; + +use base "WWW::SwaggerClient::Object::BaseObject"; + +# +# +# +#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. +# + +my $swagger_types = { + 'code' => 'int', + 'type' => 'string', + 'message' => 'string' +}; + +my $attribute_map = { + 'code' => 'code', + 'type' => 'type', + 'message' => 'message' +}; + +# new object +sub new { + my ($class, %args) = @_; + my $self = { + # + 'code' => $args{'code'}, + # + 'type' => $args{'type'}, + # + 'message' => $args{'message'} + }; + + return bless $self, $class; +} + +# get swagger type of the attribute +sub get_swagger_types { + return $swagger_types; +} + +# get attribute mappping +sub get_attribute_map { + return $attribute_map; +} + +1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm index af1ac1c6017..1c17b55976c 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm @@ -19,7 +19,7 @@ use DateTime; # -# return json string +# return perl hash sub to_hash { return decode_json(JSON->new->convert_blessed->encode( shift )); } @@ -36,28 +36,30 @@ sub TO_JSON { return $_data; } -# from json string +# from Perl hashref sub from_hash { my ($self, $hash) = @_; + # loop through attributes and use swagger_types to deserialize the data while ( my ($_key, $_type) = each %{$self->get_swagger_types} ) { + my $_json_attribute = $self->get_attribute_map->{$_key}; if ($_type =~ /^array\[/i) { # array my $_subclass = substr($_type, 6, -1); my @_array = (); - foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) { + foreach my $_element (@{$hash->{$_json_attribute}}) { push @_array, $self->_deserialize($_subclass, $_element); } $self->{$_key} = \@_array; - } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime - $self->{$_key} = $self->_deserialize($_type, $hash->{$_key}); + } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime + $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute}); } else { - $log->debugf("warning: %s not defined\n", $_key); + $log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute); } } return $self; } - + # deserialize non-array data sub _deserialize { my ($self, $type, $data) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 19a3d88b299..c8f0fc98ff3 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -52,13 +52,18 @@ sub new { # # Update an existing pet # -# @param Pet $body Pet object that needs to be added to the store (optional) +# @param Pet $body Pet object that needs to be added to the store (required) # @return void # sub update_pet { my ($self, %args) = @_; + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling update_pet"); + } + # parse inputs my $_resource_path = '/pet'; @@ -70,7 +75,7 @@ sub update_pet { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -102,13 +107,18 @@ sub update_pet { # # Add a new pet to the store # -# @param Pet $body Pet object that needs to be added to the store (optional) +# @param Pet $body Pet object that needs to be added to the store (required) # @return void # sub add_pet { my ($self, %args) = @_; + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling add_pet"); + } + # parse inputs my $_resource_path = '/pet'; @@ -120,7 +130,7 @@ sub add_pet { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -152,13 +162,18 @@ sub add_pet { # # Finds Pets by status # -# @param ARRAY[string] $status Status values that need to be considered for filter (optional) +# @param ARRAY[string] $status Status values that need to be considered for filter (required) # @return ARRAY[Pet] # sub find_pets_by_status { my ($self, %args) = @_; + # verify the required parameter 'status' is set + unless (exists $args{'status'}) { + croak("Missing the required parameter 'status' when calling find_pets_by_status"); + } + # parse inputs my $_resource_path = '/pet/findByStatus'; @@ -170,7 +185,7 @@ sub find_pets_by_status { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -205,13 +220,18 @@ sub find_pets_by_status { # # Finds Pets by tags # -# @param ARRAY[string] $tags Tags to filter by (optional) +# @param ARRAY[string] $tags Tags to filter by (required) # @return ARRAY[Pet] # sub find_pets_by_tags { my ($self, %args) = @_; + # verify the required parameter 'tags' is set + unless (exists $args{'tags'}) { + croak("Missing the required parameter 'tags' when calling find_pets_by_tags"); + } + # parse inputs my $_resource_path = '/pet/findByTags'; @@ -223,7 +243,7 @@ sub find_pets_by_tags { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -258,7 +278,7 @@ sub find_pets_by_tags { # # Find pet by ID # -# @param int $pet_id ID of pet that needs to be fetched (required) +# @param int $pet_id ID of pet to return (required) # @return Pet # sub get_pet_by_id { @@ -281,7 +301,7 @@ sub get_pet_by_id { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -300,7 +320,7 @@ sub get_pet_by_id { # authentication setting, if any - my $auth_settings = ['api_key', 'petstore_auth']; + my $auth_settings = ['api_key']; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -318,7 +338,7 @@ sub get_pet_by_id { # # Updates a pet in the store with form data # -# @param string $pet_id ID of pet that needs to be updated (required) +# @param int $pet_id ID of pet that needs to be updated (required) # @param string $name Updated name of the pet (optional) # @param string $status Updated status of the pet (optional) # @return void @@ -343,7 +363,7 @@ sub update_pet_with_form { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -411,7 +431,7 @@ sub delete_pet { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -451,7 +471,7 @@ sub delete_pet { # @param int $pet_id ID of pet to update (required) # @param string $additional_metadata Additional data to pass to server (optional) # @param file $file file to upload (optional) -# @return void +# @return ApiResponse # sub upload_file { my ($self, %args) = @_; @@ -473,7 +493,7 @@ sub upload_file { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -506,11 +526,14 @@ sub upload_file { my $auth_settings = ['petstore_auth']; # make the API Call - - $self->{api_client}->call_api($_resource_path, $_method, + my $response = $self->{api_client}->call_api($_resource_path, $_method, $query_params, $form_params, $header_params, $_body_data, $auth_settings); - return; + if (!$response) { + return; + } + my $_response_object = $self->{api_client}->deserialize('ApiResponse', $response); + return $_response_object; } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index a2ac9010e77..047c4624587 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -69,7 +69,7 @@ sub get_inventory { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -101,13 +101,18 @@ sub get_inventory { # # Place an order for a pet # -# @param Order $body order placed for purchasing the pet (optional) +# @param Order $body order placed for purchasing the pet (required) # @return Order # sub place_order { my ($self, %args) = @_; + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling place_order"); + } + # parse inputs my $_resource_path = '/store/order'; @@ -119,7 +124,7 @@ sub place_order { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -154,7 +159,7 @@ sub place_order { # # Find purchase order by ID # -# @param string $order_id ID of pet that needs to be fetched (required) +# @param int $order_id ID of pet that needs to be fetched (required) # @return Order # sub get_order_by_id { @@ -177,7 +182,7 @@ sub get_order_by_id { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -237,7 +242,7 @@ sub delete_order { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index e1088a0839e..f70c20136a4 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -52,13 +52,18 @@ sub new { # # Create user # -# @param User $body Created user object (optional) +# @param User $body Created user object (required) # @return void # sub create_user { my ($self, %args) = @_; + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling create_user"); + } + # parse inputs my $_resource_path = '/user'; @@ -70,7 +75,7 @@ sub create_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -102,13 +107,18 @@ sub create_user { # # Creates list of users with given input array # -# @param ARRAY[User] $body List of user object (optional) +# @param ARRAY[User] $body List of user object (required) # @return void # sub create_users_with_array_input { my ($self, %args) = @_; + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling create_users_with_array_input"); + } + # parse inputs my $_resource_path = '/user/createWithArray'; @@ -120,7 +130,7 @@ sub create_users_with_array_input { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -152,13 +162,18 @@ sub create_users_with_array_input { # # Creates list of users with given input array # -# @param ARRAY[User] $body List of user object (optional) +# @param ARRAY[User] $body List of user object (required) # @return void # sub create_users_with_list_input { my ($self, %args) = @_; + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling create_users_with_list_input"); + } + # parse inputs my $_resource_path = '/user/createWithList'; @@ -170,7 +185,7 @@ sub create_users_with_list_input { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -202,14 +217,24 @@ sub create_users_with_list_input { # # Logs user into the system # -# @param string $username The user name for login (optional) -# @param string $password The password for login in clear text (optional) +# @param string $username The user name for login (required) +# @param string $password The password for login in clear text (required) # @return string # sub login_user { my ($self, %args) = @_; + # verify the required parameter 'username' is set + unless (exists $args{'username'}) { + croak("Missing the required parameter 'username' when calling login_user"); + } + + # verify the required parameter 'password' is set + unless (exists $args{'password'}) { + croak("Missing the required parameter 'password' when calling login_user"); + } + # parse inputs my $_resource_path = '/user/login'; @@ -221,7 +246,7 @@ sub login_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -276,7 +301,7 @@ sub logout_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -328,7 +353,7 @@ sub get_user_by_name { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -366,7 +391,7 @@ sub get_user_by_name { # Updated user # # @param string $username name that need to be deleted (required) -# @param User $body Updated user object (optional) +# @param User $body Updated user object (required) # @return void # sub update_user { @@ -378,6 +403,11 @@ sub update_user { croak("Missing the required parameter 'username' when calling update_user"); } + # verify the required parameter 'body' is set + unless (exists $args{'body'}) { + croak("Missing the required parameter 'body' when calling update_user"); + } + # parse inputs my $_resource_path = '/user/{username}'; @@ -389,7 +419,7 @@ sub update_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -449,7 +479,7 @@ sub delete_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t index bbd1aae4c1d..6e1bb28af94 100644 --- a/samples/client/petstore/perl/t/01_pet_api.t +++ b/samples/client/petstore/perl/t/01_pet_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 35; +use Test::More tests => 37; use Test::Exception; use lib 'lib'; @@ -69,8 +69,8 @@ is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id); is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form'; -my $upload_pet = $api->upload_file(pet_id => $pet_id, additional_metadata => 'testabc', file => 'test.pl'); -is $upload_pet, undef, 'get the null response from upload_pet'; +my $upload_file = $api->upload_file(pet_id => $pet_id, additional_metadata => 'testabc', file => 'test.pl'); +isa_ok($upload_file, 'WWW::SwaggerClient::Object::ApiResponse'); # WWW::SwaggerClient::Object::Pet my $delete_pet = $api->delete_pet(pet_id => $pet_id); is $delete_pet, undef, 'get the null response from delete_pet'; From 37b123530f42ae548d13bf06743129cdad68c8b1 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Tue, 3 Nov 2015 17:58:53 +0100 Subject: [PATCH 050/142] Add ApiFactory class and proper accessors on object classes ApiFactory provides a get_api() method to generate API objects without having to hard-code class names. All API and object classes are loaded automatically. Also, added proper accessors for attributes of object classes. --- .../codegen/languages/PerlClientCodegen.java | 1 + .../main/resources/perl/ApiFactory.mustache | 63 +++++++++++++++++++ .../main/resources/perl/BaseObject.mustache | 2 + .../src/main/resources/perl/object.mustache | 2 + .../perl/lib/WWW/SwaggerClient/ApiFactory.pm | 63 +++++++++++++++++++ .../WWW/SwaggerClient/Object/ApiResponse.pm | 2 + .../WWW/SwaggerClient/Object/BaseObject.pm | 2 + .../lib/WWW/SwaggerClient/Object/Category.pm | 2 + .../lib/WWW/SwaggerClient/Object/Order.pm | 2 + .../perl/lib/WWW/SwaggerClient/Object/Pet.pm | 2 + .../perl/lib/WWW/SwaggerClient/Object/Tag.pm | 2 + .../perl/lib/WWW/SwaggerClient/Object/User.pm | 2 + samples/client/petstore/perl/pom.xml | 13 ++++ .../client/petstore/perl/t/03_api_factory.t | 34 ++++++++++ 14 files changed, 192 insertions(+) create mode 100644 modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm create mode 100644 samples/client/petstore/perl/t/03_api_factory.t diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index d2ced5c4281..ba03f3944c5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -94,6 +94,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiClient.pm")); supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Configuration.pm")); supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Object/BaseObject.pm")); + supportingFiles.add(new SupportingFile("ApiFactory.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiFactory.pm")); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache new file mode 100644 index 00000000000..2ea2db72402 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache @@ -0,0 +1,63 @@ +package WWW::{{moduleName}}::ApiFactory; + +use strict; +use warnings; +use utf8; + +use Carp; +use Module::Find; + +usesub WWW::{{moduleName}}::Object; + +use WWW::{{moduleName}}::ApiClient; + +=head1 Name + + WWW::{{moduleName}}::ApiFactory - constructs APIs to retrieve {{moduleName}} objects + +=head1 Synopsis + + package My::Petstore::App; + + use WWW::{{moduleName}}::ApiFactory; + + my $api_factory = WWW::{{moduleName}}::ApiFactory->new( base_url => 'http://petstore.swagger.io/v2', + ..., # other args for ApiClient constructor + ); + + # later... + my $pet_api = $api_factory->get_api('Pet'); + + # $pet_api isa WWW::{{moduleName}}::PetApi + + my $pet = $pet_api->get_pet_by_id(pet_id => $pet_id); + + # object attributes have proper accessors: + printf "Pet's name is %s", $pet->name; + + # change the value stored on the object: + $pet->name('Dave'); + +=cut + +# Load all the API classes and construct a lookup table at startup time +my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } + grep {$_ =~ /Api$/} + usesub 'WWW::{{moduleName}}'; + +sub new { + my ($class, %p) = (shift, @_); + $p{api_client} = WWW::{{moduleName}}::ApiClient->new(%p); + return bless \%p, $class; +} + +sub get_api { + my ($self, $which) = @_; + croak "API not specified" unless $which; + my $api_class = $_apis{"${which}Api"} || croak "No known API for '$which'"; + return $api_class->new(api_client => $self->_api_client); +} + +sub _api_client { $_[0]->{api_client} } + +1; diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index 4e9a4699ed3..58c047f49a4 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -11,6 +11,8 @@ use Log::Any qw($log); use Date::Parse; use DateTime; +use base "Class::Accessor"; + # # diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache index d4d6961c646..fc418e79ce4 100644 --- a/modules/swagger-codegen/src/main/resources/perl/object.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache @@ -31,6 +31,8 @@ my $attribute_map = { {{/hasMore}}{{/vars}} }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm new file mode 100644 index 00000000000..811031b06a3 --- /dev/null +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm @@ -0,0 +1,63 @@ +package WWW::SwaggerClient::ApiFactory; + +use strict; +use warnings; +use utf8; + +use Carp; +use Module::Find; + +usesub WWW::SwaggerClient::Object; + +use WWW::SwaggerClient::ApiClient; + +=head1 Name + + WWW::SwaggerClient::ApiFactory - constructs APIs to retrieve SwaggerClient objects + +=head1 Synopsis + + package My::Petstore::App; + + use WWW::SwaggerClient::ApiFactory; + + my $api_factory = WWW::SwaggerClient::ApiFactory->new( base_url => 'http://petstore.swagger.io/v2', + ..., # other args for ApiClient constructor + ); + + # later... + my $pet_api = $api_factory->get_api('Pet'); + + # $pet_api isa WWW::SwaggerClient::PetApi + + my $pet = $pet_api->get_pet_by_id(pet_id => $pet_id); + + # object attributes have proper accessors: + printf "Pet's name is %s", $pet->name; + + # change the value stored on the object: + $pet->name('Dave'); + +=cut + +# Load all the API classes and construct a lookup table at startup time +my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ } + grep {$_ =~ /Api$/} + usesub 'WWW::SwaggerClient'; + +sub new { + my ($class, %p) = (shift, @_); + $p{api_client} = WWW::SwaggerClient::ApiClient->new(%p); + return bless \%p, $class; +} + +sub get_api { + my ($self, $which) = @_; + croak "API not specified" unless $which; + my $api_class = $_apis{"${which}Api"} || croak "No known API for '$which'"; + return $api_class->new(api_client => $self->_api_client); +} + +sub _api_client { $_[0]->{api_client} } + +1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm index 02c36f17262..029aad32b9b 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm @@ -31,6 +31,8 @@ my $attribute_map = { 'message' => 'message' }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm index 1c17b55976c..fcdbe3fc14e 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm @@ -11,6 +11,8 @@ use Log::Any qw($log); use Date::Parse; use DateTime; +use base "Class::Accessor"; + # # diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm index 2b2c0beceac..7aa9b642824 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm @@ -29,6 +29,8 @@ my $attribute_map = { 'name' => 'name' }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm index 14da4a5f3af..f7016179e3a 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm @@ -37,6 +37,8 @@ my $attribute_map = { 'complete' => 'complete' }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm index eb74ad3f368..20b9262e49f 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm @@ -37,6 +37,8 @@ my $attribute_map = { 'status' => 'status' }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm index 1b136d5fbfc..2c585b1ec80 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm @@ -29,6 +29,8 @@ my $attribute_map = { 'name' => 'name' }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm index 1beb8f0b201..271f5e91ef7 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm @@ -41,6 +41,8 @@ my $attribute_map = { 'user_status' => 'userStatus' }; +__PACKAGE__->mk_accessors(keys %$attribute_map); + # new object sub new { my ($class, %args) = @_; diff --git a/samples/client/petstore/perl/pom.xml b/samples/client/petstore/perl/pom.xml index 00d192b1e54..4034cf0a687 100644 --- a/samples/client/petstore/perl/pom.xml +++ b/samples/client/petstore/perl/pom.xml @@ -52,6 +52,19 @@ + + Test::More for ApiFactory + integration-test + + exec + + + perl + + t/03_api_factory.t + + + diff --git a/samples/client/petstore/perl/t/03_api_factory.t b/samples/client/petstore/perl/t/03_api_factory.t new file mode 100644 index 00000000000..f96bffa7a84 --- /dev/null +++ b/samples/client/petstore/perl/t/03_api_factory.t @@ -0,0 +1,34 @@ +use Test::More tests => 13; +use Test::Exception; + +use lib 'lib'; +use strict; +use warnings; + +use_ok('WWW::SwaggerClient::ApiFactory'); + +my $api_factory = WWW::SwaggerClient::ApiFactory->new('base_url' => 'http://testing'); +my $pet_api = $api_factory->get_api('Pet'); +isa_ok($pet_api, 'WWW::SwaggerClient::PetApi'); +is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base URL from api client'; + +$api_factory = WWW::SwaggerClient::ApiFactory->new; +$pet_api = $api_factory->get_api('Pet'); + +is $pet_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client'; + +# test accessor methods +my $pet_id = 10008; +# note - we don't need to 'use' these modules because they've already been loaded by ApiFactory +my ($category, $tag, $pet); +lives_ok { $category = WWW::SwaggerClient::Object::Category->new('id' => '22', 'name' => 'perl') } 'Category.pm loaded OK'; +lives_ok { $tag = WWW::SwaggerClient::Object::Tag->new('id' => '11', 'name' => 'just kidding') } 'Tag.pm loaded OK'; +lives_ok { $pet = WWW::SwaggerClient::Object::Pet->new('id' => $pet_id, 'name' => 'perl test', + "photoUrls" => ['123', 'oop'], 'tags' => [$tag], 'status' => 'pending', 'category' => $category) } 'Pet.pm loaded OK'; + +is $pet->id, '10008', 'got the proper pet id'; +is $pet->name, 'perl test', 'got the proper pet name'; +is $pet->category->id, '22', 'got the proper category id'; +is $pet->category->name, 'perl', 'got the proper category name'; +is $pet->tags->[0]->name, 'just kidding', 'got the proper tag name'; +is $pet->tags->[0]->id, '11', 'got the proper tag id'; From 7ac91ced2ecde9770390b63935c61ae32b4cf195 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 3 Nov 2015 09:13:29 -0800 Subject: [PATCH 051/142] updated parser version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 466b8f300b8..94d4741f185 100644 --- a/pom.xml +++ b/pom.xml @@ -517,7 +517,7 @@ - 1.0.11 + 1.0.12 2.11.1 2.3.4 1.5.4 From 18abc566886c5c7ada97a02872812b30f92ac4f2 Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 4 Nov 2015 10:23:21 +0800 Subject: [PATCH 052/142] Add tests for array and map property deserialization --- .../petstore/ruby/spec/base_object_spec.rb | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 samples/client/petstore/ruby/spec/base_object_spec.rb diff --git a/samples/client/petstore/ruby/spec/base_object_spec.rb b/samples/client/petstore/ruby/spec/base_object_spec.rb new file mode 100644 index 00000000000..79b5e624474 --- /dev/null +++ b/samples/client/petstore/ruby/spec/base_object_spec.rb @@ -0,0 +1,81 @@ +require 'spec_helper' + +class ArrayMapObject < Petstore::BaseObject + attr_accessor :int_arr, :pet_arr, :int_map, :pet_map, :int_arr_map, :pet_arr_map + + def self.attribute_map + { + :int_arr => :int_arr, + :pet_arr => :pet_arr, + :int_map => :int_map, + :pet_map => :pet_map, + :int_arr_map => :int_arr_map, + :pet_arr_map => :pet_arr_map + } + end + + def self.swagger_types + { + :int_arr => :'Array', + :pet_arr => :'Array', + :int_map => :'Hash', + :pet_map => :'Hash', + :int_arr_map => :'Hash>', + :pet_arr_map => 'Hash>' + } + end +end + + +describe Petstore::BaseObject do + describe 'array and map properties' do + let(:obj) { ArrayMapObject.new } + + let(:data) do + {int_arr: [123, 456], + pet_arr: [{name: 'Kitty'}], + int_map: {'int' => 123}, + pet_map: {'pet' => {name: 'Kitty'}}, + int_arr_map: {'int_arr' => [123, 456]}, + pet_arr_map: {'pet_arr' => [{name: 'Kitty'}]} + } + end + + it 'works for #build_from_hash' do + obj.build_from_hash(data) + + obj.int_arr.should == [123, 456] + + obj.pet_arr.should be_a(Array) + obj.pet_arr.size.should == 1 + pet = obj.pet_arr.first + pet.should be_a(Petstore::Pet) + pet.name.should == 'Kitty' + + obj.int_map.should be_a(Hash) + obj.int_map.should == {'int' => 123} + + obj.pet_map.should be_a(Hash) + pet = obj.pet_map['pet'] + pet.should be_a(Petstore::Pet) + pet.name.should == 'Kitty' + + obj.int_arr_map.should be_a(Hash) + arr = obj.int_arr_map['int_arr'] + arr.should == [123, 456] + + obj.pet_arr_map.should be_a(Hash) + arr = obj.pet_arr_map['pet_arr'] + arr.should be_a(Array) + arr.size.should == 1 + pet = arr.first + pet.should be_a(Petstore::Pet) + pet.name.should == 'Kitty' + end + + it 'works for #to_hash' do + obj.build_from_hash(data) + obj.to_hash.should == data + end + end +end \ No newline at end of file From 7813976d9b0560df09c8e5aa950a662da33a970b Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 4 Nov 2015 10:26:14 +0800 Subject: [PATCH 053/142] Minor changes --- samples/client/petstore/ruby/spec/base_object_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/ruby/spec/base_object_spec.rb b/samples/client/petstore/ruby/spec/base_object_spec.rb index 79b5e624474..313d47f5d54 100644 --- a/samples/client/petstore/ruby/spec/base_object_spec.rb +++ b/samples/client/petstore/ruby/spec/base_object_spec.rb @@ -21,7 +21,7 @@ class ArrayMapObject < Petstore::BaseObject :int_map => :'Hash', :pet_map => :'Hash', :int_arr_map => :'Hash>', - :pet_arr_map => 'Hash>' + :pet_arr_map => :'Hash>' } end end From 1a67f452e2bffc92fa9fcbedbdbae199d6604d58 Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 4 Nov 2015 20:51:56 +0800 Subject: [PATCH 054/142] Make parameters unique in generated code through a config option "ensureUniqueParams" which is false by default Closes #1422 --- .../io/swagger/codegen/CodegenConstants.java | 3 ++ .../io/swagger/codegen/DefaultCodegen.java | 46 ++++++++++++++++++- .../codegen/languages/JavaClientCodegen.java | 1 + .../codegen/languages/RubyClientCodegen.java | 12 ++++- .../src/main/resources/Java/api.mustache | 2 +- .../java/io/swagger/client/api/PetApi.java | 4 +- 6 files changed, 63 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index 2e53ab42797..684eea14fc5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -40,6 +40,9 @@ public class CodegenConstants { public static final String SORT_PARAMS_BY_REQUIRED_FLAG = "sortParamsByRequiredFlag"; public static final String SORT_PARAMS_BY_REQUIRED_FLAG_DESC = "Sort method arguments to place required parameters before optional parameters. Default: true"; + public static final String ENSURE_UNIQUE_PARAMS = "ensureUniqueParams"; + public static final String ENSURE_UNIQUE_PARAMS_DESC = "Whether to ensure parameter names are unique in an operation (rename parameters that are not). Default: false"; + public static final String PACKAGE_NAME = "packageName"; public static final String PACKAGE_VERSION = "packageVersion"; public static final String POD_VERSION = "podVersion"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 7fa3d1883b6..4aa5af77fc7 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -87,6 +87,7 @@ public class DefaultCodegen { protected Map supportedLibraries = new LinkedHashMap(); protected String library = null; protected Boolean sortParamsByRequiredFlag = true; + protected Boolean ensureUniqueParams = false; public List cliOptions() { return cliOptions; @@ -109,6 +110,11 @@ public class DefaultCodegen { this.setSortParamsByRequiredFlag(Boolean.valueOf(additionalProperties .get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG).toString())); } + + if (additionalProperties.containsKey(CodegenConstants.ENSURE_UNIQUE_PARAMS)) { + this.setEnsureUniqueParams(Boolean.valueOf(additionalProperties + .get(CodegenConstants.ENSURE_UNIQUE_PARAMS).toString())); + } } // override with any special post-processing @@ -245,6 +251,10 @@ public class DefaultCodegen { this.sortParamsByRequiredFlag = sortParamsByRequiredFlag; } + public void setEnsureUniqueParams(Boolean ensureUniqueParams) { + this.ensureUniqueParams = ensureUniqueParams; + } + /** * Return the file name of the Api * @@ -436,6 +446,7 @@ public class DefaultCodegen { cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); + cliOptions.add(new CliOption(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants.ENSURE_UNIQUE_PARAMS_DESC)); } /** @@ -1245,6 +1256,23 @@ public class DefaultCodegen { if (parameters != null) { for (Parameter param : parameters) { CodegenParameter p = fromParameter(param, imports); + // rename parameters to make sure all of them have unique names + if (ensureUniqueParams) { + while (true) { + boolean exists = false; + for (CodegenParameter cp : allParams) { + if (p.paramName.equals(cp.paramName)) { + exists = true; + break; + } + } + if (exists) { + p.paramName = generateNextName(p.paramName); + } else { + break; + } + } + } allParams.add(p); if (param instanceof QueryParameter) { p.isQueryParam = new Boolean(true); @@ -1283,7 +1311,7 @@ public class DefaultCodegen { op.httpMethod = httpMethod.toUpperCase(); // move "required" parameters in front of "optional" parameters - if(sortParamsByRequiredFlag) { + if (sortParamsByRequiredFlag) { Collections.sort(allParams, new Comparator() { @Override public int compare(CodegenParameter one, CodegenParameter another) { @@ -1710,6 +1738,22 @@ public class DefaultCodegen { return word; } + // Generate the next name for the given name, e.g. + // status => status2 + // status2 => status3 + // myName100 => myName101 + private String generateNextName(String name) { + Pattern pattern = Pattern.compile("\\d+\\z"); + Matcher matcher = pattern.matcher(name); + if (matcher.find()) { + String numStr = matcher.group(); + int num = Integer.parseInt(numStr) + 1; + return name.substring(0, name.length() - numStr.length()) + num; + } else { + return name + "2"; + } + } + private void addImport(CodegenModel m, String type) { if (type != null && needToImport(type)) { m.imports.add(type); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 34b4e0e77d6..ac33bac7c9a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -56,6 +56,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { embeddedTemplateDir = templateDir = "Java"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; + ensureUniqueParams = true; reservedWords = new HashSet( Arrays.asList( diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java index 12dcedd36ae..821919971d5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -2,6 +2,7 @@ package io.swagger.codegen.languages; import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; @@ -12,6 +13,7 @@ import io.swagger.models.properties.Property; import java.io.File; import java.util.Arrays; import java.util.HashSet; +import java.util.Iterator; import org.apache.commons.lang.StringUtils; @@ -32,6 +34,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { modelTemplateFiles.put("model.mustache", ".rb"); apiTemplateFiles.put("api.mustache", ".rb"); embeddedTemplateDir = templateDir = "ruby"; + ensureUniqueParams = true; typeMapping.clear(); languageSpecificPrimitives.clear(); @@ -70,7 +73,14 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("file", "File"); // remove modelPackage and apiPackage added by default - cliOptions.clear(); + Iterator itr = cliOptions.iterator(); + while (itr.hasNext()) { + CliOption opt = itr.next(); + if (CodegenConstants.MODEL_PACKAGE.equals(opt.getOpt()) || + CodegenConstants.API_PACKAGE.equals(opt.getOpt())) { + itr.remove(); + } + } cliOptions.add(new CliOption(GEM_NAME, "gem name (convention: underscore_case), default: swagger_client")); cliOptions.add(new CliOption(MODULE_NAME, "top module name (convention: CamelCase, usually corresponding to gem name), default: SwaggerClient")); cliOptions.add(new CliOption(GEM_VERSION, "gem version, default: 1.0.0")); diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache index 08d28ebd51b..3ac280b2d70 100644 --- a/modules/swagger-codegen/src/main/resources/Java/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache @@ -64,7 +64,7 @@ public class {{classname}} { {{/queryParams}} {{#headerParams}}if ({{paramName}} != null) - {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}})); + {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}})); {{/headerParams}} {{#formParams}}if ({{paramName}} != null) diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java index 34e29bdc521..17e9a0e299e 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java @@ -11,7 +11,7 @@ import java.io.File; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-04T19:58:40.953+08:00") public class PetApi { private ApiClient apiClient; @@ -367,7 +367,7 @@ public class PetApi { if (apiKey != null) - headerParams.put("api_key", apiClient.parameterToString(apiKey)); + headerParams.put("api_key", apiClient.parameterToString(apiKey)); From e9ba5ed57c46abe7f4980a98f0d39e27b05dce2c Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 4 Nov 2015 21:20:16 +0800 Subject: [PATCH 055/142] Fix tests --- .../codegen/options/AkkaScalaClientOptionsProvider.java | 2 ++ .../codegen/options/AndroidClientOptionsProvider.java | 2 ++ .../codegen/options/AsyncScalaClientOptionsProvider.java | 2 ++ .../swagger/codegen/options/DartClientOptionsProvider.java | 2 ++ .../java/io/swagger/codegen/options/JavaOptionsProvider.java | 2 ++ .../swagger/codegen/options/NodeJSServerOptionsProvider.java | 2 ++ .../io/swagger/codegen/options/PhpClientOptionsProvider.java | 2 ++ .../io/swagger/codegen/options/Qt5CPPOptionsProvider.java | 2 ++ .../swagger/codegen/options/RubyClientOptionsProvider.java | 5 +++++ .../swagger/codegen/options/ScalaClientOptionsProvider.java | 2 ++ .../codegen/options/ScalatraServerOptionsProvider.java | 2 ++ .../swagger/codegen/options/SilexServerOptionsProvider.java | 2 ++ .../io/swagger/codegen/options/StaticDocOptionsProvider.java | 2 ++ .../swagger/codegen/options/StaticHtmlOptionsProvider.java | 2 ++ .../io/swagger/codegen/options/SwaggerOptionsProvider.java | 2 ++ .../swagger/codegen/options/SwaggerYamlOptionsProvider.java | 2 ++ .../io/swagger/codegen/options/SwiftOptionsProvider.java | 2 ++ .../swagger/codegen/options/TizenClientOptionsProvider.java | 2 ++ .../options/TypeScriptAngularClientOptionsProvider.java | 2 ++ .../codegen/options/TypeScriptNodeClientOptionsProvider.java | 2 ++ 20 files changed, 43 insertions(+) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java index 6cd8e83467b..e26968500d7 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java @@ -10,6 +10,7 @@ public class AkkaScalaClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class AkkaScalaClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java index 12752d7b636..c677e5caa7b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AndroidClientOptionsProvider.java @@ -13,6 +13,7 @@ public class AndroidClientOptionsProvider implements OptionsProvider { public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; public static final String GROUP_ID_VALUE = "io.swagger.test"; public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; public static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; @@ -29,6 +30,7 @@ public class AndroidClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java index 3a5daca3ba2..be21a20efe4 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AsyncScalaClientOptionsProvider.java @@ -10,6 +10,7 @@ public class AsyncScalaClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class AsyncScalaClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java index 07689da66da..018913fa3ba 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java @@ -11,6 +11,7 @@ public class DartClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "packagedart"; public static final String API_PACKAGE_VALUE = "apiPackageDart"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; public static final String BROWSER_CLIENT_VALUE = "true"; public static final String PUB_NAME_VALUE = "swagger"; public static final String PUB_VERSION_VALUE = "1.0.0-SNAPSHOT"; @@ -28,6 +29,7 @@ public class DartClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(DartClientCodegen.BROWSER_CLIENT, BROWSER_CLIENT_VALUE) .put(DartClientCodegen.PUB_NAME, PUB_NAME_VALUE) .put(DartClientCodegen.PUB_VERSION, PUB_VERSION_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java index 26d4c893236..8ea7ee31452 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java @@ -20,6 +20,7 @@ public class JavaOptionsProvider implements OptionsProvider { public static final String LIBRARY_VALUE = "jersey2"; public static final String SERIALIZABLE_MODEL_VALUE = "false"; public static final String FULL_JAVA_UTIL_VALUE = "true"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public Map createOptions() { @@ -27,6 +28,7 @@ public class JavaOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java index 09500bd65ea..d4cfce1c9b7 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java @@ -10,6 +10,7 @@ public class NodeJSServerOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class NodeJSServerOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java index fd1fbabbe5d..dcd7a06438f 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PhpClientOptionsProvider.java @@ -11,6 +11,7 @@ public class PhpClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; public static final String VARIABLE_NAMING_CONVENTION_VALUE = "snake_case"; public static final String INVOKER_PACKAGE_VALUE = "Swagger\\Client\\Php"; public static final String PACKAGE_PATH_VALUE = "SwaggerClient-php"; @@ -30,6 +31,7 @@ public class PhpClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(PhpClientCodegen.VARIABLE_NAMING_CONVENTION, VARIABLE_NAMING_CONVENTION_VALUE) .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) .put(PhpClientCodegen.PACKAGE_PATH, PACKAGE_PATH_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java index 1deb7a99afc..c0583639fbe 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java @@ -10,6 +10,7 @@ public class Qt5CPPOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class Qt5CPPOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java index 94f15cc1def..d80341f0200 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java @@ -1,5 +1,6 @@ package io.swagger.codegen.options; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.languages.RubyClientCodegen; import com.google.common.collect.ImmutableMap; @@ -10,6 +11,8 @@ public class RubyClientOptionsProvider implements OptionsProvider { public static final String GEM_NAME_VALUE = "swagger_client_ruby"; public static final String MODULE_NAME_VALUE = "SwaggerClientRuby"; public static final String GEM_VERSION_VALUE = "1.0.0-SNAPSHOT"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +25,8 @@ public class RubyClientOptionsProvider implements OptionsProvider { return builder.put(RubyClientCodegen.GEM_NAME, GEM_NAME_VALUE) .put(RubyClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) .put(RubyClientCodegen.GEM_VERSION, GEM_VERSION_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java index 5d9b80b2670..867482f145b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalaClientOptionsProvider.java @@ -10,6 +10,7 @@ public class ScalaClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class ScalaClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java index 0e237f1b1e9..a0fef2f4858 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ScalatraServerOptionsProvider.java @@ -10,6 +10,7 @@ public class ScalatraServerOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class ScalatraServerOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java index 35d290ada7a..553b24414f6 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java @@ -10,6 +10,7 @@ public class SilexServerOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class SilexServerOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java index fcef6a436cf..5cd8325606c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java @@ -10,6 +10,7 @@ public class StaticDocOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class StaticDocOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java index d0067b60117..5fe534b52c1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java @@ -10,6 +10,7 @@ public class StaticHtmlOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class StaticHtmlOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java index 81b8059b9e9..4d1997484e2 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java @@ -10,6 +10,7 @@ public class SwaggerOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class SwaggerOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java index f611dc9c88c..1797e2888fb 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java @@ -10,6 +10,7 @@ public class SwaggerYamlOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class SwaggerYamlOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java index c5600d4f590..a31159abf1c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java @@ -11,6 +11,7 @@ public class SwiftOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; public static final String PROJECT_NAME_VALUE = "Swagger"; public static final String RESPONSE_AS_VALUE = "test"; public static final String UNWRAP_REQUIRED_VALUE = "true"; @@ -38,6 +39,7 @@ public class SwiftOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(SwiftCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) .put(SwiftCodegen.RESPONSE_AS, RESPONSE_AS_VALUE) .put(SwiftCodegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java index 796aabc6b31..80194388da0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java @@ -10,6 +10,7 @@ public class TizenClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class TizenClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java index 24ce25b4578..2b69f5e12f1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java @@ -10,6 +10,7 @@ public class TypeScriptAngularClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class TypeScriptAngularClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java index 5da5c01c991..6a7ac239f15 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java @@ -10,6 +10,7 @@ public class TypeScriptNodeClientOptionsProvider implements OptionsProvider { public static final String MODEL_PACKAGE_VALUE = "package"; public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; + public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @Override public String getLanguage() { @@ -22,6 +23,7 @@ public class TypeScriptNodeClientOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } From 5a7bb600d639d71322d093b1befec64cf5c7a6b3 Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 4 Nov 2015 21:28:52 +0800 Subject: [PATCH 056/142] Set the ensureUniqueParams option to true by default --- .../src/main/java/io/swagger/codegen/CodegenConstants.java | 2 +- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 2 +- .../java/io/swagger/codegen/languages/JavaClientCodegen.java | 1 - .../java/io/swagger/codegen/languages/RubyClientCodegen.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index 684eea14fc5..4910058034c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -41,7 +41,7 @@ public class CodegenConstants { public static final String SORT_PARAMS_BY_REQUIRED_FLAG_DESC = "Sort method arguments to place required parameters before optional parameters. Default: true"; public static final String ENSURE_UNIQUE_PARAMS = "ensureUniqueParams"; - public static final String ENSURE_UNIQUE_PARAMS_DESC = "Whether to ensure parameter names are unique in an operation (rename parameters that are not). Default: false"; + public static final String ENSURE_UNIQUE_PARAMS_DESC = "Whether to ensure parameter names are unique in an operation (rename parameters that are not). Default: true"; public static final String PACKAGE_NAME = "packageName"; public static final String PACKAGE_VERSION = "packageVersion"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 4aa5af77fc7..f9cf4c90baf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -87,7 +87,7 @@ public class DefaultCodegen { protected Map supportedLibraries = new LinkedHashMap(); protected String library = null; protected Boolean sortParamsByRequiredFlag = true; - protected Boolean ensureUniqueParams = false; + protected Boolean ensureUniqueParams = true; public List cliOptions() { return cliOptions; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index ac33bac7c9a..34b4e0e77d6 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -56,7 +56,6 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { embeddedTemplateDir = templateDir = "Java"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; - ensureUniqueParams = true; reservedWords = new HashSet( Arrays.asList( diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java index 821919971d5..0c1275a00e5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -34,7 +34,6 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { modelTemplateFiles.put("model.mustache", ".rb"); apiTemplateFiles.put("api.mustache", ".rb"); embeddedTemplateDir = templateDir = "ruby"; - ensureUniqueParams = true; typeMapping.clear(); languageSpecificPrimitives.clear(); From 449fa3a0f57932d993fe4e168d80aa3b6c8062fc Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 4 Nov 2015 22:32:06 +0800 Subject: [PATCH 057/142] add guidelines for contriubtion --- README.md | 56 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index cdcd2f95bfd..067ae95490b 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,13 @@ Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additi - [Overview](#overview) - [Table of Contents](#table-of-contents) - Installation - - [Build and run using docker](#build-and-run-using-docker) - - [Build a nodejs server stub](#build-a-nodejs-server-stub) - [Compatibility](#compatibility) - [Prerequisites](#prerequisites) - - [OS X Users](#os-x-users) - - [Building](#building) + - [OS X Users](#os-x-users) + - [Building](#building) + - [Docker](#docker) + - [Build and run](#build-and-run-using-docker) + - [Build a Node.js server stub](#build-a-nodejs-server-stub) - Generators - [To generate a sample client library](#to-generate-a-sample-client-library) - [Generating libraries from your server](#generating-libraries-from-your-server) @@ -40,26 +41,9 @@ Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additi - [Java Spring MVC](#java-spring-mvc) - [To build the codegen library](#to-build-the-codegen-library) - [Online Generators](#online-generators) + - [Guidelines for Contribution](https://github.com/swagger-api/swagger-codegen/wiki/Guidelines-for-Contribution) - [License](#license) -## Build and run using docker - -``` -git clone https://github.com/swagger-api/swagger-codegen - -cd swagger-codegen - -./run-in-docker.sh mvn package - ``` - -## Build a nodejs server stub - - ``` -./run-in-docker.sh generate \ - -i http://petstore.swagger.io/v2/swagger.json \ - -l nodejs \ - -o samples/server/petstore/nodejs - ``` ## Compatibility The Swagger Specification has undergone 3 revisions since initial creation in 2010. The swagger-codegen project has the following compatibilies with the swagger specification: @@ -88,14 +72,33 @@ export JAVA_HOME=`/usr/libexec/java_home -v 1.7` export PATH=${JAVA_HOME}/bin:$PATH ``` -#### Building +### Building After cloning the project, you can build it from source with this command: - ``` mvn package ``` +### Docker +#### Build and run using docker + +``` +git clone https://github.com/swagger-api/swagger-codegen + +cd swagger-codegen + +./run-in-docker.sh mvn package + ``` + +#### Build a Node.js server stub + + ``` +./run-in-docker.sh generate \ + -i http://petstore.swagger.io/v2/swagger.json \ + -l nodejs \ + -o samples/server/petstore/nodejs + ``` + ### To generate a sample client library You can build a client against the swagger sample [petstore](http://petstore.swagger.io) API as follows: @@ -481,6 +484,11 @@ curl -X POST -H "content-type:application/json" -d '{"swaggerUrl":"http://petsto ``` Then you will receieve a JSON response with the URL to download the zipped code. +Guidelines for Contribution +--------------------------- + +Please refer to this [page](https://github.com/swagger-api/swagger-codegen/wiki/Guidelines-for-Contribution) + License ------- From 3b77b6ab39186cb98298230e604912fb1e43b3f9 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 4 Nov 2015 22:35:29 +0800 Subject: [PATCH 058/142] fix link in toc fix link in toc (Generating a client from local files) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 067ae95490b..ec693d92483 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additi - [Modifying the client library format](#modifying-the-client-library-format) - [Making your own codegen modules](#making-your-own-codegen-modules) - [Where is Javascript???](#where-is-javascript) - - [Generating a client from local files](#generating-a-client-from-local-files) + - [Generating a client from local files](#generating-a-client-from-local-files) - [Customizing the generator](#customizing-the-generator) - [Validating your swagger spec](#validating-your-swagger-spec) - [Generating dynamic html api documentation](#generating-dynamic-html-api-documentation) @@ -207,7 +207,7 @@ static code generation. There is a third-party component called [swagger-js-codegen](https://github.com/wcandillon/swagger-js-codegen) that can generate angularjs or nodejs source code from a swagger specification. -#### Generating a client from local files +### Generating a client from local files If you don't want to call your server, you can save the swagger spec files into a directory and pass an argument to the code generator like this: From 4264b74e4083288c8971f13c26c83a3ff527dc1a Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Wed, 4 Nov 2015 20:27:23 +0100 Subject: [PATCH 059/142] Minor tidying up Some documentation, fix a warning, added a couple of logger calls. --- .../main/resources/perl/ApiClient.mustache | 16 +++++++- .../main/resources/perl/ApiFactory.mustache | 39 ++++++++++++++++++- .../src/main/resources/perl/api.mustache | 2 +- .../perl/lib/WWW/SwaggerClient/ApiClient.pm | 16 +++++++- .../perl/lib/WWW/SwaggerClient/ApiFactory.pm | 39 ++++++++++++++++++- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 2 +- 6 files changed, 104 insertions(+), 10 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index 3a36ce14073..06aae8a0e55 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -118,10 +118,12 @@ sub call_api { $self->{ua}->timeout($self->{http_timeout} || $WWW::{{moduleName}}::Configuration::http_timeout); $self->{ua}->agent($self->{http_user_agent} || $WWW::{{moduleName}}::Configuration::http_user_agent); + $log->debugf("REQUEST: %s", $_request->as_string); my $_response = $self->{ua}->request($_request); + $log->debugf("RESPONSE: %s", $_response->as_string); unless ($_response->is_success) { - croak("API Exception(".$_response->code."): ".$_response->message); + croak(sprintf "API Exception(%s): %s\n%s", $_response->code, $_response->message, $_response->content); } return $_response->content; @@ -294,13 +296,23 @@ sub get_api_key_with_prefix } } -# update hearder and query param based on authentication setting +# update header and query param based on authentication setting # # @param array $headerParams header parameters (by ref) # @param array $queryParams query parameters (by ref) # @param array $authSettings array of authentication scheme (e.g ['api_key']) sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; + + # we can defer to the application + if ($self->{auth_setup_handler} && ref($self->{auth_setup_handler}) eq 'CODE') { + $self->{auth_setup_handler}->( api_client => $self, + header_params => $header_params, + query_params => $query_params, + auth_settings => $auth_settings, # presumably this won't be defined if we're doing it this way + ); + return; + } return if (!defined($auth_settings) || scalar(@$auth_settings) == 0); diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache index 2ea2db72402..fc309c91b9c 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache @@ -45,19 +45,54 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } grep {$_ =~ /Api$/} usesub 'WWW::{{moduleName}}'; +=head1 new() + + All parameters are optional, and are passed to and stored on the api_client object. + + base_url: supply this to change the default base URL taken from the Swagger definition. + + auth_setup_handler: a coderef you can supply to set up authentication. + + The coderef receives a hashref with keys: api_client, query_params, header_params, auth_settings. + + my $api_factory = WWW::{{moduleName}}::ApiFactory->new( auth_setup_handler => \&setup_auth ); ); + + sub setup_auth { + my %p = @_; + $p{header_params}->{'X-SomeApp-FunkyKeyName'} = 'aaaaabbbbbcccccddddd'; + } + +=cut + sub new { my ($class, %p) = (shift, @_); $p{api_client} = WWW::{{moduleName}}::ApiClient->new(%p); return bless \%p, $class; } +=head1 get_api($which) + + Returns an API object of the requested type. + + $which is a nickname for the class: + + WWW::FooBarClient::BazApi has nickname 'Baz' + +=cut + sub get_api { my ($self, $which) = @_; croak "API not specified" unless $which; my $api_class = $_apis{"${which}Api"} || croak "No known API for '$which'"; - return $api_class->new(api_client => $self->_api_client); + return $api_class->new(api_client => $self->api_client); } -sub _api_client { $_[0]->{api_client} } +=head1 api_client() + + Returns the api_client object, should you ever need it. + +=cut + +sub api_client { $_[0]->{api_client} } 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index e69e4e3066f..d305d69b7fa 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -100,7 +100,7 @@ sub {{nickname}} { {{#formParams}}# form params if ( exists $args{'{{paramName}}'} ) { {{#isFile}}$form_params->{'{{baseName}}'} = [] unless defined $form_params->{'{{baseName}}'}; - push $form_params->{'{{baseName}}'}, $args{'{{paramName}}'}; + push @{$form_params->{'{{baseName}}'}}, $args{'{{paramName}}'}; {{/isFile}} {{^isFile}}$form_params->{'{{baseName}}'} = $self->{api_client}->to_form_value($args{'{{paramName}}'}); {{/isFile}} diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index f75bf24e031..de4a3e2d2fb 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -118,10 +118,12 @@ sub call_api { $self->{ua}->timeout($self->{http_timeout} || $WWW::SwaggerClient::Configuration::http_timeout); $self->{ua}->agent($self->{http_user_agent} || $WWW::SwaggerClient::Configuration::http_user_agent); + $log->debugf("REQUEST: %s", $_request->as_string); my $_response = $self->{ua}->request($_request); + $log->debugf("RESPONSE: %s", $_response->as_string); unless ($_response->is_success) { - croak("API Exception(".$_response->code."): ".$_response->message); + croak(sprintf "API Exception(%s): %s\n%s", $_response->code, $_response->message, $_response->content); } return $_response->content; @@ -294,13 +296,23 @@ sub get_api_key_with_prefix } } -# update hearder and query param based on authentication setting +# update header and query param based on authentication setting # # @param array $headerParams header parameters (by ref) # @param array $queryParams query parameters (by ref) # @param array $authSettings array of authentication scheme (e.g ['api_key']) sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; + + # we can defer to the application + if ($self->{auth_setup_handler} && ref($self->{auth_setup_handler}) eq 'CODE') { + $self->{auth_setup_handler}->( api_client => $self, + header_params => $header_params, + query_params => $query_params, + auth_settings => $auth_settings, # presumably this won't be defined if we're doing it this way + ); + return; + } return if (!defined($auth_settings) || scalar(@$auth_settings) == 0); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm index 811031b06a3..701a22603c5 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm @@ -45,19 +45,54 @@ my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ } grep {$_ =~ /Api$/} usesub 'WWW::SwaggerClient'; +=head1 new() + + All parameters are optional, and are passed to and stored on the api_client object. + + base_url: supply this to change the default base URL taken from the Swagger definition. + + auth_setup_handler: a coderef you can supply to set up authentication. + + The coderef receives a hashref with keys: api_client, query_params, header_params, auth_settings. + + my $api_factory = WWW::SwaggerClient::ApiFactory->new( auth_setup_handler => \&setup_auth ); ); + + sub setup_auth { + my %p = @_; + $p{header_params}->{'X-SomeApp-FunkyKeyName'} = 'aaaaabbbbbcccccddddd'; + } + +=cut + sub new { my ($class, %p) = (shift, @_); $p{api_client} = WWW::SwaggerClient::ApiClient->new(%p); return bless \%p, $class; } +=head1 get_api($which) + + Returns an API object of the requested type. + + $which is a nickname for the class: + + WWW::FooBarClient::BazApi has nickname 'Baz' + +=cut + sub get_api { my ($self, $which) = @_; croak "API not specified" unless $which; my $api_class = $_apis{"${which}Api"} || croak "No known API for '$which'"; - return $api_class->new(api_client => $self->_api_client); + return $api_class->new(api_client => $self->api_client); } -sub _api_client { $_[0]->{api_client} } +=head1 api_client() + + Returns the api_client object, should you ever need it. + +=cut + +sub api_client { $_[0]->{api_client} } 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index c8f0fc98ff3..a7cb9a973df 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -515,7 +515,7 @@ sub upload_file { }# form params if ( exists $args{'file'} ) { $form_params->{'file'} = [] unless defined $form_params->{'file'}; - push $form_params->{'file'}, $args{'file'}; + push @{$form_params->{'file'}}, $args{'file'}; } From f521680c0f1f3d796468b69fe8b0fe3aada0af7f Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Wed, 4 Nov 2015 21:42:27 +0100 Subject: [PATCH 060/142] Moved object classes' constructor into base class --- .../main/resources/perl/BaseObject.mustache | 26 ++++++++--- .../src/main/resources/perl/object.mustache | 32 +++---------- .../WWW/SwaggerClient/Object/ApiResponse.pm | 35 +++------------ .../WWW/SwaggerClient/Object/BaseObject.pm | 26 ++++++++--- .../lib/WWW/SwaggerClient/Object/Category.pm | 33 +++----------- .../lib/WWW/SwaggerClient/Object/Order.pm | 41 +++-------------- .../perl/lib/WWW/SwaggerClient/Object/Pet.pm | 41 +++-------------- .../perl/lib/WWW/SwaggerClient/Object/Tag.pm | 33 +++----------- .../perl/lib/WWW/SwaggerClient/Object/User.pm | 45 +++---------------- 9 files changed, 77 insertions(+), 235 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index 58c047f49a4..f2a58efdb68 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -11,7 +11,7 @@ use Log::Any qw($log); use Date::Parse; use DateTime; -use base "Class::Accessor"; +use base ("Class::Accessor", "Class::Data::Inheritable"); # @@ -20,6 +20,22 @@ use base "Class::Accessor"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->mk_classdata('attribute_map'); +__PACKAGE__->mk_classdata('swagger_types'); + +# new object +sub new { + my ($class, %args) = @_; + + my $self = bless {}, $class; + + foreach my $attribute (keys %{$class->attribute_map}) { + my $args_key = $class->attribute_map->{$attribute}; + $self->$attribute( $args{ $args_key } ); + } + + return $self; +} # return perl hash sub to_hash { @@ -30,9 +46,9 @@ sub to_hash { sub TO_JSON { my $self = shift; my $_data = {}; - foreach my $_key (keys %{$self->get_attribute_map}) { + foreach my $_key (keys %{$self->attribute_map}) { if (defined $self->{$_key}) { - $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key}; + $_data->{$self->attribute_map->{$_key}} = $self->{$_key}; } } return $_data; @@ -43,8 +59,8 @@ sub from_hash { my ($self, $hash) = @_; # loop through attributes and use swagger_types to deserialize the data - while ( my ($_key, $_type) = each %{$self->get_swagger_types} ) { - my $_json_attribute = $self->get_attribute_map->{$_key}; + while ( my ($_key, $_type) = each %{$self->swagger_types} ) { + my $_json_attribute = $self->attribute_map->{$_key}; if ($_type =~ /^array\[/i) { # array my $_subclass = substr($_type, 6, -1); my @_array = (); diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache index fc418e79ce4..bbddd3c7f32 100644 --- a/modules/swagger-codegen/src/main/resources/perl/object.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache @@ -21,39 +21,17 @@ use base "WWW::{{moduleName}}::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, {{/hasMore}}{{/vars}} -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}}, {{/hasMore}}{{/vars}} -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - {{#vars}}#{{#description}}{{{description}}}{{/description}} - '{{name}}' => $args{'{{baseName}}'}{{#hasMore}}, - {{/hasMore}}{{/vars}} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; {{/model}} diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm index 029aad32b9b..9d3de7648aa 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm @@ -19,43 +19,18 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { 'code' => 'int', 'type' => 'string', 'message' => 'string' -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { 'code' => 'code', 'type' => 'type', 'message' => 'message' -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - # - 'code' => $args{'code'}, - # - 'type' => $args{'type'}, - # - 'message' => $args{'message'} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm index fcdbe3fc14e..fee2b06fb0e 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm @@ -11,7 +11,7 @@ use Log::Any qw($log); use Date::Parse; use DateTime; -use base "Class::Accessor"; +use base ("Class::Accessor", "Class::Data::Inheritable"); # @@ -20,6 +20,22 @@ use base "Class::Accessor"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->mk_classdata('attribute_map'); +__PACKAGE__->mk_classdata('swagger_types'); + +# new object +sub new { + my ($class, %args) = @_; + + my $self = bless {}, $class; + + foreach my $attribute (keys %{$class->attribute_map}) { + my $args_key = $class->attribute_map->{$attribute}; + $self->$attribute( $args{ $args_key } ); + } + + return $self; +} # return perl hash sub to_hash { @@ -30,9 +46,9 @@ sub to_hash { sub TO_JSON { my $self = shift; my $_data = {}; - foreach my $_key (keys %{$self->get_attribute_map}) { + foreach my $_key (keys %{$self->attribute_map}) { if (defined $self->{$_key}) { - $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key}; + $_data->{$self->attribute_map->{$_key}} = $self->{$_key}; } } return $_data; @@ -43,8 +59,8 @@ sub from_hash { my ($self, $hash) = @_; # loop through attributes and use swagger_types to deserialize the data - while ( my ($_key, $_type) = each %{$self->get_swagger_types} ) { - my $_json_attribute = $self->get_attribute_map->{$_key}; + while ( my ($_key, $_type) = each %{$self->swagger_types} ) { + my $_json_attribute = $self->attribute_map->{$_key}; if ($_type =~ /^array\[/i) { # array my $_subclass = substr($_type, 6, -1); my @_array = (); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm index 7aa9b642824..1e062925037 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm @@ -19,39 +19,16 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { 'id' => 'int', 'name' => 'string' -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { 'id' => 'id', 'name' => 'name' -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - # - 'id' => $args{'id'}, - # - 'name' => $args{'name'} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm index f7016179e3a..70b3db2cfc0 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm @@ -19,55 +19,24 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { 'id' => 'int', 'pet_id' => 'int', 'quantity' => 'int', 'ship_date' => 'DateTime', 'status' => 'string', 'complete' => 'boolean' -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { 'id' => 'id', 'pet_id' => 'petId', 'quantity' => 'quantity', 'ship_date' => 'shipDate', 'status' => 'status', 'complete' => 'complete' -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - # - 'id' => $args{'id'}, - # - 'pet_id' => $args{'petId'}, - # - 'quantity' => $args{'quantity'}, - # - 'ship_date' => $args{'shipDate'}, - #Order Status - 'status' => $args{'status'}, - # - 'complete' => $args{'complete'} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm index 20b9262e49f..3ff3f50b399 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm @@ -19,55 +19,24 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { 'id' => 'int', 'category' => 'Category', 'name' => 'string', 'photo_urls' => 'ARRAY[string]', 'tags' => 'ARRAY[Tag]', 'status' => 'string' -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { 'id' => 'id', 'category' => 'category', 'name' => 'name', 'photo_urls' => 'photoUrls', 'tags' => 'tags', 'status' => 'status' -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - # - 'id' => $args{'id'}, - # - 'category' => $args{'category'}, - # - 'name' => $args{'name'}, - # - 'photo_urls' => $args{'photoUrls'}, - # - 'tags' => $args{'tags'}, - #pet status in the store - 'status' => $args{'status'} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm index 2c585b1ec80..bf97f210a37 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm @@ -19,39 +19,16 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { 'id' => 'int', 'name' => 'string' -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { 'id' => 'id', 'name' => 'name' -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - # - 'id' => $args{'id'}, - # - 'name' => $args{'name'} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm index 271f5e91ef7..36fc7baf6ee 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm @@ -19,7 +19,7 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -my $swagger_types = { +__PACKAGE__->swagger_types( { 'id' => 'int', 'username' => 'string', 'first_name' => 'string', @@ -28,9 +28,9 @@ my $swagger_types = { 'password' => 'string', 'phone' => 'string', 'user_status' => 'int' -}; +} ); -my $attribute_map = { +__PACKAGE__->attribute_map( { 'id' => 'id', 'username' => 'username', 'first_name' => 'firstName', @@ -39,43 +39,8 @@ my $attribute_map = { 'password' => 'password', 'phone' => 'phone', 'user_status' => 'userStatus' -}; +} ); -__PACKAGE__->mk_accessors(keys %$attribute_map); - -# new object -sub new { - my ($class, %args) = @_; - my $self = { - # - 'id' => $args{'id'}, - # - 'username' => $args{'username'}, - # - 'first_name' => $args{'firstName'}, - # - 'last_name' => $args{'lastName'}, - # - 'email' => $args{'email'}, - # - 'password' => $args{'password'}, - # - 'phone' => $args{'phone'}, - #User Status - 'user_status' => $args{'userStatus'} - }; - - return bless $self, $class; -} - -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} - -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} +__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); 1; From baf20ca22652598ccd5eb81ead36e5c769f2e7a2 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Wed, 4 Nov 2015 22:24:49 +0100 Subject: [PATCH 061/142] Fix errors from using wrong JSON spec I've been using http://petstore.swagger.io/v2/swagger.json instead of modules/swagger-codegen/src/test/resources/2_0/petstore.json as the input spec for building the petstore. This commit reverts the changes introduced from that. --- .../WWW/SwaggerClient/Object/ApiResponse.pm | 36 ----------- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 59 ++++++------------- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 17 ++---- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 58 +++++------------- samples/client/petstore/perl/t/01_pet_api.t | 4 +- 5 files changed, 40 insertions(+), 134 deletions(-) delete mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm deleted file mode 100644 index 9d3de7648aa..00000000000 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm +++ /dev/null @@ -1,36 +0,0 @@ -package WWW::SwaggerClient::Object::ApiResponse; - -require 5.6.0; -use strict; -use warnings; -use utf8; -use JSON qw(decode_json); -use Data::Dumper; -use Module::Runtime qw(use_module); -use Log::Any qw($log); -use Date::Parse; -use DateTime; - -use base "WWW::SwaggerClient::Object::BaseObject"; - -# -# -# -#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. -# - -__PACKAGE__->swagger_types( { - 'code' => 'int', - 'type' => 'string', - 'message' => 'string' -} ); - -__PACKAGE__->attribute_map( { - 'code' => 'code', - 'type' => 'type', - 'message' => 'message' -} ); - -__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map}); - -1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index a7cb9a973df..26b9f42e620 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -52,18 +52,13 @@ sub new { # # Update an existing pet # -# @param Pet $body Pet object that needs to be added to the store (required) +# @param Pet $body Pet object that needs to be added to the store (optional) # @return void # sub update_pet { my ($self, %args) = @_; - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling update_pet"); - } - # parse inputs my $_resource_path = '/pet'; @@ -75,7 +70,7 @@ sub update_pet { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -107,18 +102,13 @@ sub update_pet { # # Add a new pet to the store # -# @param Pet $body Pet object that needs to be added to the store (required) +# @param Pet $body Pet object that needs to be added to the store (optional) # @return void # sub add_pet { my ($self, %args) = @_; - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling add_pet"); - } - # parse inputs my $_resource_path = '/pet'; @@ -130,7 +120,7 @@ sub add_pet { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -162,18 +152,13 @@ sub add_pet { # # Finds Pets by status # -# @param ARRAY[string] $status Status values that need to be considered for filter (required) +# @param ARRAY[string] $status Status values that need to be considered for filter (optional) # @return ARRAY[Pet] # sub find_pets_by_status { my ($self, %args) = @_; - # verify the required parameter 'status' is set - unless (exists $args{'status'}) { - croak("Missing the required parameter 'status' when calling find_pets_by_status"); - } - # parse inputs my $_resource_path = '/pet/findByStatus'; @@ -185,7 +170,7 @@ sub find_pets_by_status { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -220,18 +205,13 @@ sub find_pets_by_status { # # Finds Pets by tags # -# @param ARRAY[string] $tags Tags to filter by (required) +# @param ARRAY[string] $tags Tags to filter by (optional) # @return ARRAY[Pet] # sub find_pets_by_tags { my ($self, %args) = @_; - # verify the required parameter 'tags' is set - unless (exists $args{'tags'}) { - croak("Missing the required parameter 'tags' when calling find_pets_by_tags"); - } - # parse inputs my $_resource_path = '/pet/findByTags'; @@ -243,7 +223,7 @@ sub find_pets_by_tags { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -278,7 +258,7 @@ sub find_pets_by_tags { # # Find pet by ID # -# @param int $pet_id ID of pet to return (required) +# @param int $pet_id ID of pet that needs to be fetched (required) # @return Pet # sub get_pet_by_id { @@ -301,7 +281,7 @@ sub get_pet_by_id { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -338,7 +318,7 @@ sub get_pet_by_id { # # Updates a pet in the store with form data # -# @param int $pet_id ID of pet that needs to be updated (required) +# @param string $pet_id ID of pet that needs to be updated (required) # @param string $name Updated name of the pet (optional) # @param string $status Updated status of the pet (optional) # @return void @@ -363,7 +343,7 @@ sub update_pet_with_form { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -431,7 +411,7 @@ sub delete_pet { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -471,7 +451,7 @@ sub delete_pet { # @param int $pet_id ID of pet to update (required) # @param string $additional_metadata Additional data to pass to server (optional) # @param file $file file to upload (optional) -# @return ApiResponse +# @return void # sub upload_file { my ($self, %args) = @_; @@ -493,7 +473,7 @@ sub upload_file { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -526,14 +506,11 @@ sub upload_file { my $auth_settings = ['petstore_auth']; # make the API Call - my $response = $self->{api_client}->call_api($_resource_path, $_method, + + $self->{api_client}->call_api($_resource_path, $_method, $query_params, $form_params, $header_params, $_body_data, $auth_settings); - if (!$response) { - return; - } - my $_response_object = $self->{api_client}->deserialize('ApiResponse', $response); - return $_response_object; + return; } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 047c4624587..a2ac9010e77 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -69,7 +69,7 @@ sub get_inventory { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -101,18 +101,13 @@ sub get_inventory { # # Place an order for a pet # -# @param Order $body order placed for purchasing the pet (required) +# @param Order $body order placed for purchasing the pet (optional) # @return Order # sub place_order { my ($self, %args) = @_; - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling place_order"); - } - # parse inputs my $_resource_path = '/store/order'; @@ -124,7 +119,7 @@ sub place_order { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -159,7 +154,7 @@ sub place_order { # # Find purchase order by ID # -# @param int $order_id ID of pet that needs to be fetched (required) +# @param string $order_id ID of pet that needs to be fetched (required) # @return Order # sub get_order_by_id { @@ -182,7 +177,7 @@ sub get_order_by_id { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -242,7 +237,7 @@ sub delete_order { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index f70c20136a4..e1088a0839e 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -52,18 +52,13 @@ sub new { # # Create user # -# @param User $body Created user object (required) +# @param User $body Created user object (optional) # @return void # sub create_user { my ($self, %args) = @_; - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling create_user"); - } - # parse inputs my $_resource_path = '/user'; @@ -75,7 +70,7 @@ sub create_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -107,18 +102,13 @@ sub create_user { # # Creates list of users with given input array # -# @param ARRAY[User] $body List of user object (required) +# @param ARRAY[User] $body List of user object (optional) # @return void # sub create_users_with_array_input { my ($self, %args) = @_; - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling create_users_with_array_input"); - } - # parse inputs my $_resource_path = '/user/createWithArray'; @@ -130,7 +120,7 @@ sub create_users_with_array_input { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -162,18 +152,13 @@ sub create_users_with_array_input { # # Creates list of users with given input array # -# @param ARRAY[User] $body List of user object (required) +# @param ARRAY[User] $body List of user object (optional) # @return void # sub create_users_with_list_input { my ($self, %args) = @_; - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling create_users_with_list_input"); - } - # parse inputs my $_resource_path = '/user/createWithList'; @@ -185,7 +170,7 @@ sub create_users_with_list_input { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -217,24 +202,14 @@ sub create_users_with_list_input { # # Logs user into the system # -# @param string $username The user name for login (required) -# @param string $password The password for login in clear text (required) +# @param string $username The user name for login (optional) +# @param string $password The password for login in clear text (optional) # @return string # sub login_user { my ($self, %args) = @_; - # verify the required parameter 'username' is set - unless (exists $args{'username'}) { - croak("Missing the required parameter 'username' when calling login_user"); - } - - # verify the required parameter 'password' is set - unless (exists $args{'password'}) { - croak("Missing the required parameter 'password' when calling login_user"); - } - # parse inputs my $_resource_path = '/user/login'; @@ -246,7 +221,7 @@ sub login_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -301,7 +276,7 @@ sub logout_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -353,7 +328,7 @@ sub get_user_by_name { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -391,7 +366,7 @@ sub get_user_by_name { # Updated user # # @param string $username name that need to be deleted (required) -# @param User $body Updated user object (required) +# @param User $body Updated user object (optional) # @return void # sub update_user { @@ -403,11 +378,6 @@ sub update_user { croak("Missing the required parameter 'username' when calling update_user"); } - # verify the required parameter 'body' is set - unless (exists $args{'body'}) { - croak("Missing the required parameter 'body' when calling update_user"); - } - # parse inputs my $_resource_path = '/user/{username}'; @@ -419,7 +389,7 @@ sub update_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } @@ -479,7 +449,7 @@ sub delete_user { my $form_params = {}; # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json'); + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t index 6e1bb28af94..5460c3282b2 100644 --- a/samples/client/petstore/perl/t/01_pet_api.t +++ b/samples/client/petstore/perl/t/01_pet_api.t @@ -69,8 +69,8 @@ is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id); is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form'; -my $upload_file = $api->upload_file(pet_id => $pet_id, additional_metadata => 'testabc', file => 'test.pl'); -isa_ok($upload_file, 'WWW::SwaggerClient::Object::ApiResponse'); # WWW::SwaggerClient::Object::Pet +my $upload_pet = $api->upload_file(pet_id => $pet_id, additional_metadata => 'testabc', file => 'test.pl'); +is $upload_pet, undef, 'get the null response from upload_pet'; my $delete_pet = $api->delete_pet(pet_id => $pet_id); is $delete_pet, undef, 'get the null response from delete_pet'; From 9863b631f7fad466e0e229f1c42a4fb465223830 Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 5 Nov 2015 11:23:15 +0800 Subject: [PATCH 062/142] Fix comment to conform to javadoc guideline --- .../java/io/swagger/codegen/DefaultCodegen.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index f9cf4c90baf..675091da120 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1738,10 +1738,16 @@ public class DefaultCodegen { return word; } - // Generate the next name for the given name, e.g. - // status => status2 - // status2 => status3 - // myName100 => myName101 + /** + * Generate the next name for the given name, i.e. append "2" to the base name if not ending with a number, + * otherwise increase the number by 1. For example: + * status => status2 + * status2 => status3 + * myName100 => myName101 + * + * @param name The base name + * @return The next name for the base name + */ private String generateNextName(String name) { Pattern pattern = Pattern.compile("\\d+\\z"); Matcher matcher = pattern.matcher(name); From 4bfc032a640d25a9cca47075c9651fe730c3ad4c Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 5 Nov 2015 16:32:46 +0800 Subject: [PATCH 063/142] add oauth2 support for Perl --- .../src/main/resources/perl/ApiClient.mustache | 2 +- .../src/main/resources/perl/Configuration.mustache | 8 ++++++-- .../petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm | 2 +- .../petstore/perl/lib/WWW/SwaggerClient/Configuration.pm | 8 ++++++-- samples/client/petstore/perl/t/02_store_api.t | 5 +++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index 06aae8a0e55..0cdb40325c5 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -323,7 +323,7 @@ sub update_params_for_auth { } {{#authMethods}}elsif ($auth eq '{{name}}') { {{#isApiKey}}{{#isKeyInHeader}}$header_params->{'{{keyParamName}}'} = $self->get_api_key_with_prefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$query_params->{'{{keyParamName}}'} = $self->get_api_key_with_prefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$header_params->{'Authorization'} = 'Basic '.encode_base64($WWW::{{moduleName}}::Configuration::username.":".$WWW::{{moduleName}}::Configuration::password);{{/isBasic}} - {{#isOAuth}}# TODO support oauth{{/isOAuth}} + {{#isOAuth}}$header_params->{'Authorization'} = 'Bearer ' . $WWW::{{moduleName}}::Configuration::access_token;{{/isOAuth}} } {{/authMethods}} else { diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache index 0a097dda7bd..d0b8b2c0e68 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache @@ -17,8 +17,12 @@ our $http_user_agent = 'Perl-Swagger'; # authenticaiton setting our $api_key = {}; our $api_key_prefix = {}; -our $username; -our $password; +# username and password for HTTP basic authentication +our $username = ''; +our $password = ''; + +# access token for OAuth +our $access_token = ''; 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index de4a3e2d2fb..7ed19c328c3 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -327,7 +327,7 @@ sub update_params_for_auth { } elsif ($auth eq 'petstore_auth') { - # TODO support oauth + $header_params->{'Authorization'} = 'Bearer ' . $WWW::SwaggerClient::Configuration::access_token; } else { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm index aaa387236d9..6a4afe254e0 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm @@ -17,8 +17,12 @@ our $http_user_agent = 'Perl-Swagger'; # authenticaiton setting our $api_key = {}; our $api_key_prefix = {}; -our $username; -our $password; +# username and password for HTTP basic authentication +our $username = ''; +our $password = ''; + +# access token for OAuth +our $access_token = ''; 1; diff --git a/samples/client/petstore/perl/t/02_store_api.t b/samples/client/petstore/perl/t/02_store_api.t index c731273271d..dfee5c46839 100644 --- a/samples/client/petstore/perl/t/02_store_api.t +++ b/samples/client/petstore/perl/t/02_store_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 42; +use Test::More tests => 41; use Test::Exception; use lib 'lib'; @@ -22,7 +22,8 @@ is $store_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get t my $get_inventory_response = $store_api->get_inventory(); -like ($get_inventory_response->{pending}, qr/^\d+$/, "pending is numeric"); +# comment out pending check as sometimes there's no object with pending status +#like ($get_inventory_response->{pending}, qr/^\d+$/, "pending is numeric"); like ($get_inventory_response->{sold}, qr/^\d+$/, "sold is numeric"); my $pet_json = < Date: Thu, 5 Nov 2015 17:12:51 +0800 Subject: [PATCH 064/142] add homebrew --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index ec693d92483..f250419f216 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additi - [Docker](#docker) - [Build and run](#build-and-run-using-docker) - [Build a Node.js server stub](#build-a-nodejs-server-stub) + - [Homebrew](#homebrew) - Generators - [To generate a sample client library](#to-generate-a-sample-client-library) - [Generating libraries from your server](#generating-libraries-from-your-server) @@ -99,6 +100,15 @@ cd swagger-codegen -o samples/server/petstore/nodejs ``` +### Homebrew +To install, run `brew install swagger-codegen` + +Here is an example usage: +``` +swagger-codegen generate -i http://petstore.swagger.io/v2/swagger.json -l ruby -o /tmp/test/ +``` + + ### To generate a sample client library You can build a client against the swagger sample [petstore](http://petstore.swagger.io) API as follows: From 76eeb51af628c301444007382c1269d440f0ee8a Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 5 Nov 2015 20:02:09 +0800 Subject: [PATCH 065/142] Support collectionFormat in Ruby client for header, query and form parameters --- .../io/swagger/codegen/DefaultCodegen.java | 3 ++ .../src/main/resources/ruby/api.mustache | 12 +++---- .../main/resources/ruby/api_client.mustache | 32 +++++++++++++++++-- samples/client/petstore/ruby/lib/petstore.rb | 2 +- .../petstore/ruby/lib/petstore/api/pet_api.rb | 6 ++-- .../petstore/ruby/lib/petstore/api_client.rb | 32 +++++++++++++++++-- .../petstore/ruby/spec/api_client_spec.rb | 29 +++++++++++++++++ 7 files changed, 100 insertions(+), 16 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 675091da120..b5a6f88f14d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1446,6 +1446,9 @@ public class DefaultCodegen { } property = new ArrayProperty(inner); collectionFormat = qp.getCollectionFormat(); + if (collectionFormat == null) { + collectionFormat = "csv"; + } CodegenProperty pr = fromProperty("inner", inner); p.baseType = pr.datatype; p.isContainer = true; diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache index ad885dac94e..a43260c0607 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache @@ -36,8 +36,8 @@ module {{moduleName}} # query parameters query_params = {}{{#queryParams}}{{#required}} - query_params[:'{{{baseName}}}'] = {{{paramName}}}{{/required}}{{/queryParams}}{{#queryParams}}{{^required}} - query_params[:'{{{baseName}}}'] = opts[:'{{{paramName}}}'] if opts[:'{{{paramName}}}']{{/required}}{{/queryParams}} + query_params[:'{{{baseName}}}'] = {{#collectionFormat}}@api_client.build_collection_param({{{paramName}}}, :{{{collectionFormat}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}}{{/required}}{{/queryParams}}{{#queryParams}}{{^required}} + query_params[:'{{{baseName}}}'] = {{#collectionFormat}}@api_client.build_collection_param(opts[:'{{{paramName}}}'], :{{{collectionFormat}}}){{/collectionFormat}}{{^collectionFormat}}opts[:'{{{paramName}}}']{{/collectionFormat}} if opts[:'{{{paramName}}}']{{/required}}{{/queryParams}} # header parameters header_params = {} @@ -49,13 +49,13 @@ module {{moduleName}} # HTTP header 'Content-Type' _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}] header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type){{#headerParams}}{{#required}} - header_params[:'{{{baseName}}}'] = {{{paramName}}}{{/required}}{{/headerParams}}{{#headerParams}}{{^required}} - header_params[:'{{{baseName}}}'] = opts[:'{{{paramName}}}'] if opts[:'{{{paramName}}}']{{/required}}{{/headerParams}} + header_params[:'{{{baseName}}}'] = {{#collectionFormat}}@api_client.build_collection_param({{{paramName}}}, :{{{collectionFormat}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}}{{/required}}{{/headerParams}}{{#headerParams}}{{^required}} + header_params[:'{{{baseName}}}'] = {{#collectionFormat}}@api_client.build_collection_param(opts[:'{{{paramName}}}'], :{{{collectionFormat}}}){{/collectionFormat}}{{^collectionFormat}}opts[:'{{{paramName}}}']{{/collectionFormat}} if opts[:'{{{paramName}}}']{{/required}}{{/headerParams}} # form parameters form_params = {}{{#formParams}}{{#required}} - form_params["{{baseName}}"] = {{paramName}}{{/required}}{{/formParams}}{{#formParams}}{{^required}} - form_params["{{baseName}}"] = opts[:'{{paramName}}'] if opts[:'{{paramName}}']{{/required}}{{/formParams}} + form_params["{{baseName}}"] = {{#collectionFormat}}@api_client.build_collection_param({{{paramName}}}, :{{{collectionFormat}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}}{{/required}}{{/formParams}}{{#formParams}}{{^required}} + form_params["{{baseName}}"] = {{#collectionFormat}}@api_client.build_collection_param(opts[:'{{{paramName}}}'], :{{{collectionFormat}}}){{/collectionFormat}}{{^collectionFormat}}opts[:'{{{paramName}}}']{{/collectionFormat}} if opts[:'{{paramName}}']{{/required}}{{/formParams}} # http body (model) {{^bodyParam}}post_body = nil diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache index 2bdcf6dc7be..4ef665bddf2 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache @@ -189,9 +189,15 @@ module {{moduleName}} # http form if header_params['Content-Type'] == 'application/x-www-form-urlencoded' || header_params['Content-Type'] == 'multipart/form-data' - data = form_params.dup - data.each do |key, value| - data[key] = value.to_s if value && !value.is_a?(File) + data = {} + form_params.each do |key, value| + case value + when File, Array, nil + # let typhoeus handle File, Array and nil parameters + data[key] = value + else + data[key] = value.to_s + end end elsif body data = body.is_a?(String) ? body : body.to_json @@ -269,5 +275,25 @@ module {{moduleName}} obj end end + + # Build parameter value according to the given collection format. + # @param [String] collection_format one of :csv, :ssv, :tsv, :pipes and :multi + def build_collection_param(param, collection_format) + case collection_format + when :csv + param.join(',') + when :ssv + param.join(' ') + when :tsv + param.join("\t") + when :pipes + param.join('|') + when :multi + # return the array directly as typhoeus will handle it as expected + param + else + fail "unknown collection format: #{collection_format.inspect}" + end + end end end diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index 61640d687ac..c13e99f29fc 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -14,8 +14,8 @@ require 'petstore/models/order' # APIs require 'petstore/api/user_api' -require 'petstore/api/pet_api' require 'petstore/api/store_api' +require 'petstore/api/pet_api' module Petstore class << self diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 4b956aeadcc..887f86dd45c 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -117,7 +117,7 @@ module Petstore # query parameters query_params = {} - query_params[:'status'] = opts[:'status'] if opts[:'status'] + query_params[:'status'] = @api_client.build_collection_param(opts[:'status'], :multi) if opts[:'status'] # header parameters header_params = {} @@ -166,7 +166,7 @@ module Petstore # query parameters query_params = {} - query_params[:'tags'] = opts[:'tags'] if opts[:'tags'] + query_params[:'tags'] = @api_client.build_collection_param(opts[:'tags'], :multi) if opts[:'tags'] # header parameters header_params = {} @@ -237,7 +237,7 @@ module Petstore post_body = nil - auth_names = ['api_key', 'petstore_auth'] + auth_names = ['api_key'] result = @api_client.call_api(:GET, path, :header_params => header_params, :query_params => query_params, diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 4f747bcd6a1..92a61bac4a6 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -189,9 +189,15 @@ module Petstore # http form if header_params['Content-Type'] == 'application/x-www-form-urlencoded' || header_params['Content-Type'] == 'multipart/form-data' - data = form_params.dup - data.each do |key, value| - data[key] = value.to_s if value && !value.is_a?(File) + data = {} + form_params.each do |key, value| + case value + when File, Array, nil + # let typhoeus handle File, Array and nil parameters + data[key] = value + else + data[key] = value.to_s + end end elsif body data = body.is_a?(String) ? body : body.to_json @@ -269,5 +275,25 @@ module Petstore obj end end + + # Build parameter value according to the given collection format. + # @param [String] collection_format one of :csv, :ssv, :tsv, :pipes and :multi + def build_collection_param(param, collection_format) + case collection_format + when :csv + param.join(',') + when :ssv + param.join(' ') + when :tsv + param.join("\t") + when :pipes + param.join('|') + when :multi + # return the array directly as typhoeus will handle it as expected + param + else + fail "unknown collection format: #{collection_format.inspect}" + end + end end end diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb index cd9016c9a0b..eeb27300bf3 100644 --- a/samples/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby/spec/api_client_spec.rb @@ -116,4 +116,33 @@ describe Petstore::ApiClient do end end + describe "#build_collection_param" do + let(:param) { ['aa', 'bb', 'cc'] } + let(:api_client) { Petstore::ApiClient.new } + + it "works for csv" do + api_client.build_collection_param(param, :csv).should == 'aa,bb,cc' + end + + it "works for ssv" do + api_client.build_collection_param(param, :ssv).should == 'aa bb cc' + end + + it "works for tsv" do + api_client.build_collection_param(param, :tsv).should == "aa\tbb\tcc" + end + + it "works for pipes" do + api_client.build_collection_param(param, :pipes).should == 'aa|bb|cc' + end + + it "works for multi" do + api_client.build_collection_param(param, :multi).should == ['aa', 'bb', 'cc'] + end + + it "fails for invalid collection format" do + proc { api_client.build_collection_param(param, :INVALID) }.should raise_error + end + end + end From dadc85b6fd43153bec534093e24f2974f573cad5 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Mon, 2 Nov 2015 14:46:31 -0800 Subject: [PATCH 066/142] added resource, method stub for generator options --- .../swagger/generator/online/Generator.java | 5 +++++ .../generator/resource/SwaggerResource.java | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index fd095e6c198..7a5802ea783 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -20,10 +20,15 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Map; public class Generator { static Logger LOGGER = LoggerFactory.getLogger(Generator.class); + public static Map getOptions(String language) { + return null; + } + public enum Type { CLIENT("client"), SERVER("server"); diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java index fa6a4785c5b..256a13d3adf 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -89,6 +89,26 @@ public class SwaggerResource { return Response.status(500).build(); } } + + @GET + @Path("/clients/{language}") + @ApiOperation( + value = "Returns options for a client library", + response = String.class, + responseContainer = "map", + tags = "clients") + public Response getClientOptions( + @Context HttpServletRequest request, + @ApiParam(value = "The target language for the client library", required = true) @PathParam("language") String language) throws Exception { + + Map opts = Generator.getOptions(language); + + if (opts != null) { + return Response.ok().entity(opts).build(); + } else { + return Response.status(404).build(); + } + } @GET @Path("/clients") From 5d8c23dd09aac2a78333e2658258ee9609661dcc Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Mon, 2 Nov 2015 18:28:36 +0300 Subject: [PATCH 067/142] CliOption hah been change to allow enum values --- .../io/swagger/codegen/cmd/ConfigHelp.java | 2 +- .../java/io/swagger/codegen/CliOption.java | 58 +++++++++++++++++++ .../codegen/languages/JavaClientCodegen.java | 4 +- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java index f7a128613b9..eb2f8afea92 100644 --- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java @@ -20,7 +20,7 @@ public class ConfigHelp implements Runnable { System.out.println("CONFIG OPTIONS"); for (CliOption langCliOption : config.cliOptions()) { System.out.println("\t" + langCliOption.getOpt()); - System.out.println("\t " + langCliOption.getDescription().replaceAll("\n", "\n\t ")); + System.out.println("\t " + langCliOption.getOptionHelp().replaceAll("\n", "\n\t ")); System.out.println(); } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java index 1aa0937b31b..d8bea87d8eb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java @@ -1,12 +1,25 @@ package io.swagger.codegen; +import io.swagger.models.properties.StringProperty; + +import java.util.LinkedHashMap; +import java.util.Map; + public class CliOption { private final String opt; private String description; + private String type; + private String defaultValue; + private Map enumValues; public CliOption(String opt, String description) { + this(opt, description, StringProperty.TYPE); + } + + public CliOption(String opt, String description, String type) { this.opt = opt; this.description = description; + this.type = type; } public String getOpt() { @@ -20,4 +33,49 @@ public class CliOption { public void setDescription(String description) { this.description = description; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDefault() { + return defaultValue; + } + + public void setDefault(String defaultValue) { + this.defaultValue = defaultValue; + } + + public CliOption addEnum(String value, String description) { + if (this.enumValues == null) { + this.enumValues = new LinkedHashMap(); + } + if (!enumValues.containsKey(value)) { + enumValues.put(value, description); + } + return this; + } + + public Map getEnum() { + return enumValues; + } + + public void setEnum(Map enumValues) { + this.enumValues = enumValues; + this.type = "enum"; + } + + public String getOptionHelp() { + StringBuilder sb = new StringBuilder(description); + if (enumValues != null) { + for (Map.Entry entry : enumValues.entrySet()) { + sb.append("\n").append(entry.getKey()).append(" - ").append(entry.getValue()); + } + } + return sb.toString(); + } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 34b4e0e77d6..fd0c1826690 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -96,7 +96,9 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6"); supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1"); supportedLibraries.put("retrofit", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)"); - cliOptions.add(buildLibraryCliOption(supportedLibraries)); + CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use:"); + library.setEnum(supportedLibraries); + cliOptions.add(library); } @Override From 4eeee3b24dbddd47888b7948719879aa4c745b2e Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Tue, 3 Nov 2015 11:12:28 +0300 Subject: [PATCH 068/142] changed resource, method stub for generator options --- .../swagger/generator/online/Generator.java | 18 +++++- .../generator/resource/SwaggerResource.java | 33 ++++++++-- .../online/OnlineGeneratorOptionsTest.java | 63 ++++++++++++++++++- 3 files changed, 107 insertions(+), 7 deletions(-) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index 7a5802ea783..e709e777dd4 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -1,6 +1,8 @@ package io.swagger.generator.online; import com.fasterxml.jackson.databind.JsonNode; + +import io.swagger.codegen.CliOption; import io.swagger.codegen.ClientOptInput; import io.swagger.codegen.ClientOpts; import io.swagger.codegen.Codegen; @@ -14,19 +16,31 @@ import io.swagger.generator.util.ZipUtil; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import io.swagger.util.Json; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; public class Generator { static Logger LOGGER = LoggerFactory.getLogger(Generator.class); - public static Map getOptions(String language) { - return null; + public static Map getOptions(String language) throws ApiException { + CodegenConfig config = null; + try { + config = CodegenConfigLoader.forName(language); + } catch (Exception e) { + throw new BadRequestException(400, String.format("Unsupported target %s supplied. %s", language, e)); + } + Map map = new LinkedHashMap(); + for (CliOption option : config.cliOptions()) { + map.put(option.getOpt(), option); + } + return map; } public enum Type { diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java index 256a13d3adf..d6fa88efcf8 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -3,6 +3,7 @@ package io.swagger.generator.resource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import io.swagger.codegen.CliOption; import io.swagger.codegen.Codegen; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenType; @@ -89,19 +90,43 @@ public class SwaggerResource { return Response.status(500).build(); } } - + @GET @Path("/clients/{language}") + @Produces({MediaType.APPLICATION_JSON}) @ApiOperation( value = "Returns options for a client library", - response = String.class, + response = CliOption.class, responseContainer = "map", tags = "clients") public Response getClientOptions( @Context HttpServletRequest request, - @ApiParam(value = "The target language for the client library", required = true) @PathParam("language") String language) throws Exception { + @ApiParam(value = "The target language for the client library", required = true) + @PathParam("language") String language) throws Exception { - Map opts = Generator.getOptions(language); + Map opts = Generator.getOptions(language); + + if (opts != null) { + return Response.ok().entity(opts).build(); + } else { + return Response.status(404).build(); + } + } + + @GET + @Path("/server/{framework}") + @Produces({MediaType.APPLICATION_JSON}) + @ApiOperation( + value = "Returns options for a server framework", + response = CliOption.class, + responseContainer = "map", + tags = "clients") + public Response getServerOptions( + @Context HttpServletRequest request, + @ApiParam(value = "The target language for the server framework", required = true) + @PathParam("framework") String framework) throws Exception { + + Map opts = Generator.getOptions(framework); if (opts != null) { return Response.ok().entity(opts).build(); diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java index 31262a24a9a..4a3113613bb 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java @@ -1,7 +1,11 @@ package io.swagger.generator.online; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertNotNull; +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfigLoader; import io.swagger.codegen.options.AkkaScalaClientOptionsProvider; import io.swagger.codegen.options.AndroidClientOptionsProvider; import io.swagger.codegen.options.AsyncScalaClientOptionsProvider; @@ -37,6 +41,9 @@ import io.swagger.generator.exception.ApiException; import io.swagger.generator.model.GeneratorInput; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Function; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -47,8 +54,13 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Objects; + +import javax.annotation.Nullable; public class OnlineGeneratorOptionsTest { private static final String OPTIONS_PROVIDER = "optionsProvider"; @@ -74,7 +86,7 @@ public class OnlineGeneratorOptionsTest { } @Test(dataProvider = OPTIONS_PROVIDER) - public void optionsTest(OptionsProvider provider) throws ApiException, IOException { + public void generateOptionsTest(OptionsProvider provider) throws ApiException, IOException { final GeneratorInput input = new GeneratorInput(); final HashMap options = convertOptions(provider); @@ -137,4 +149,53 @@ public class OnlineGeneratorOptionsTest { return value; } } + + @Test(dataProvider = OPTIONS_PROVIDER) + public void getOptionsTest(OptionsProvider provider) throws ApiException { + final Map opts = Generator.getOptions(provider.getLanguage()); + + final Function cliOptionWrapper = new Function() { + @Nullable + @Override + public CliOptionProxy apply(@Nullable CliOption option) { + return new CliOptionProxy(option); + } + }; + + final List actual = Lists.transform(new ArrayList(opts.values()), cliOptionWrapper); + final List expected = Lists.transform( + CodegenConfigLoader.forName(provider.getLanguage()).cliOptions(), cliOptionWrapper); + assertEquals(actual, expected); + } + + private static class CliOptionProxy { + private final CliOption wrapped; + + public CliOptionProxy(CliOption wrapped){ + this.wrapped = wrapped; + } + + public CliOption getWrapped() { + return wrapped; + } + + @Override + public int hashCode() { + return Objects.hash(wrapped.getOpt(), wrapped.getDescription(), wrapped.getType(), + wrapped.getDefault(), wrapped.getEnum()); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof CliOptionProxy) { + final CliOption that = ((CliOptionProxy) obj).getWrapped(); + return Objects.equals(wrapped.getOpt(), that.getOpt()) + && Objects.equals(wrapped.getDescription(), that.getDescription()) + && Objects.equals(wrapped.getType(), that.getType()) + && Objects.equals(wrapped.getDefault(), that.getDefault()) + && Objects.equals(wrapped.getEnum(), that.getEnum()); + } + return false; + } + } } From dcd8302f4216596d7af64d534f70b2c7db85fbae Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Thu, 5 Nov 2015 12:02:19 +0300 Subject: [PATCH 069/142] added @ApiModelProperty and @JsonIgnore annotations, set defailtValue to java library option --- .../java/io/swagger/codegen/CliOption.java | 17 ++++++++++-- .../io/swagger/codegen/CodegenConstants.java | 2 +- .../io/swagger/codegen/DefaultCodegen.java | 3 ++- .../languages/AndroidClientCodegen.java | 3 ++- .../languages/CSharpClientCodegen.java | 5 ++-- .../languages/CsharpDotNet2ClientCodegen.java | 8 +++--- .../codegen/languages/FlashClientCodegen.java | 6 ++--- .../codegen/languages/JavaClientCodegen.java | 10 ++++--- .../codegen/languages/ObjcClientCodegen.java | 18 ++++++++----- .../codegen/languages/PerlClientCodegen.java | 4 +-- .../codegen/languages/PhpClientCodegen.java | 3 ++- .../languages/PythonClientCodegen.java | 7 ++--- .../codegen/languages/RubyClientCodegen.java | 8 +++--- .../generator/resource/SwaggerResource.java | 2 +- .../online/OnlineGeneratorOptionsTest.java | 2 +- .../online/OnlineJavaClientOptionsTest.java | 26 +++++++++++++++++++ 16 files changed, 90 insertions(+), 34 deletions(-) create mode 100644 modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java index d8bea87d8eb..b2732f9cd1e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java @@ -1,7 +1,10 @@ package io.swagger.codegen; +import io.swagger.annotations.ApiModelProperty; import io.swagger.models.properties.StringProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.util.LinkedHashMap; import java.util.Map; @@ -22,6 +25,7 @@ public class CliOption { this.type = type; } + @ApiModelProperty(name = "optionName") public String getOpt() { return opt; } @@ -34,6 +38,7 @@ public class CliOption { this.description = description; } + @ApiModelProperty(value = "Data type is based on the types supported by the JSON-Schema") public String getType() { return type; } @@ -50,6 +55,11 @@ public class CliOption { this.defaultValue = defaultValue; } + public CliOption defaultValue(String defaultValue) { + this.defaultValue = defaultValue; + return this; + } + public CliOption addEnum(String value, String description) { if (this.enumValues == null) { this.enumValues = new LinkedHashMap(); @@ -66,14 +76,17 @@ public class CliOption { public void setEnum(Map enumValues) { this.enumValues = enumValues; - this.type = "enum"; } + @JsonIgnore public String getOptionHelp() { StringBuilder sb = new StringBuilder(description); + if(defaultValue != null) { + sb.append(" (Default: ").append(defaultValue).append(")"); + } if (enumValues != null) { for (Map.Entry entry : enumValues.entrySet()) { - sb.append("\n").append(entry.getKey()).append(" - ").append(entry.getValue()); + sb.append("\n ").append(entry.getKey()).append(" - ").append(entry.getValue()); } } return sb.toString(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index 4910058034c..a5bb97e5a93 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -38,7 +38,7 @@ public class CodegenConstants { public static final String LIBRARY_DESC = "library template (sub-template)"; public static final String SORT_PARAMS_BY_REQUIRED_FLAG = "sortParamsByRequiredFlag"; - public static final String SORT_PARAMS_BY_REQUIRED_FLAG_DESC = "Sort method arguments to place required parameters before optional parameters. Default: true"; + public static final String SORT_PARAMS_BY_REQUIRED_FLAG_DESC = "Sort method arguments to place required parameters before optional parameters."; public static final String ENSURE_UNIQUE_PARAMS = "ensureUniqueParams"; public static final String ENSURE_UNIQUE_PARAMS_DESC = "Whether to ensure parameter names are unique in an operation (rename parameters that are not). Default: true"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 675091da120..8ab40633c87 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -445,7 +445,8 @@ public class DefaultCodegen { cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); - cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); + cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, + CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue("true")); cliOptions.add(new CliOption(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants.ENSURE_UNIQUE_PARAMS_DESC)); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java index 35b876aabaf..abfe970088b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java @@ -65,7 +65,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, "artifactId for use in the generated build.gradle and pom.xml")); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "artifact version for use in the generated build.gradle and pom.xml")); cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC)); - cliOptions.add(new CliOption(USE_ANDROID_MAVEN_GRADLE_PLUGIN, "A flag to toggle android-maven gradle plugin. Default is true.")); + cliOptions.add(new CliOption(USE_ANDROID_MAVEN_GRADLE_PLUGIN, "A flag to toggle android-maven gradle plugin.") + .defaultValue("true")); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index d2d14e5a2e5..a7972253188 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -80,8 +80,9 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("object", "Object"); cliOptions.clear(); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case), default: IO.Swagger")); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version, default: 1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case).") + .defaultValue("IO.Swagger")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version.").defaultValue("1.0.0")); cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java index 96f74907449..7b6bf5e7844 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java @@ -79,9 +79,11 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege typeMapping.put("object", "Object"); cliOptions.clear(); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case), default: IO.Swagger")); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version, default: 1.0.0")); - cliOptions.add(new CliOption(CLIENT_PACKAGE, "C# client package name (convention: Camel.Case), default: IO.Swagger.Client")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case).") + .defaultValue("IO.Swagger")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version.").defaultValue("1.0.0")); + cliOptions.add(new CliOption(CLIENT_PACKAGE, "C# client package name (convention: Camel.Case).") + .defaultValue("IO.Swagger.Client")); } @Override diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java index 353174df056..8608cbe8924 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java @@ -75,9 +75,9 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig cliOptions.clear(); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "flash package name (convention:" + - " package.name), default: io.swagger")); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "flash package version, " + - "default: 1.0.0")); + " package.name)").defaultValue("io.swagger")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "flash package version") + .defaultValue("1.0.0")); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, "source folder for generated " + "code. e.g. src/main/flex")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index fd0c1826690..a54ec4e038a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory; public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class); public static final String FULL_JAVA_UTIL = "fullJavaUtil"; + public static final String DEFAULT_LIBRARY = ""; protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; @@ -90,14 +91,17 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC)); cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC)); cliOptions.add(new CliOption(CodegenConstants.SERIALIZABLE_MODEL, CodegenConstants.SERIALIZABLE_MODEL_DESC)); - cliOptions.add(new CliOption(FULL_JAVA_UTIL, "whether to use fully qualified name for classes under java.util (default to false)")); + cliOptions.add(new CliOption(FULL_JAVA_UTIL, "whether to use fully qualified name for classes under java.util") + .defaultValue("false")); - supportedLibraries.put("", "HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2"); + supportedLibraries.put(DEFAULT_LIBRARY, "HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2"); supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6"); supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1"); supportedLibraries.put("retrofit", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)"); - CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use:"); + CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); + library.setDefault(DEFAULT_LIBRARY); library.setEnum(supportedLibraries); + library.setDefault(DEFAULT_LIBRARY); cliOptions.add(library); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java index a3e1463d857..4555aa5f216 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -120,13 +120,17 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { instantiationTypes.put("map", "NSMutableDictionary"); cliOptions.clear(); - cliOptions.add(new CliOption(CLASS_PREFIX, "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`), default: `SWG`")); - cliOptions.add(new CliOption(POD_NAME, "cocoapods package name (convention: CameCase), default: `SwaggerClient`")); - cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "cocoapods package version, default: `1.0.0`")); - cliOptions.add(new CliOption(AUTHOR_NAME, "Name to use in the podspec file, default: `Swagger`")); - cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file, default: `apiteam@swagger.io`")); - cliOptions.add(new CliOption(GIT_REPO_URL, "URL for the git repo where this podspec should point to, default: `https://github.com/swagger-api/swagger-codegen`")); - cliOptions.add(new CliOption(LICENSE, "License to use in the podspec file, default: `MIT`")); + cliOptions.add(new CliOption(CLASS_PREFIX, "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`).`") + .defaultValue("SWG")); + cliOptions.add(new CliOption(POD_NAME, "cocoapods package name (convention: CameCase).") + .defaultValue("SwaggerClient")); + cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "cocoapods package version.") + .defaultValue("1.0.0")); + cliOptions.add(new CliOption(AUTHOR_NAME, "Name to use in the podspec file.").defaultValue("Swagger")); + cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file.").defaultValue("apiteam@swagger.io")); + cliOptions.add(new CliOption(GIT_REPO_URL, "URL for the git repo where this podspec should point to.") + .defaultValue("https://github.com/swagger-api/swagger-codegen")); + cliOptions.add(new CliOption(LICENSE, "License to use in the podspec file.").defaultValue("MIT")); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index ba03f3944c5..0a64854712b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -70,8 +70,8 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("object", "object"); cliOptions.clear(); - cliOptions.add(new CliOption(MODULE_NAME, "perl module name (convention: CamelCase), default: SwaggerClient")); - cliOptions.add(new CliOption(MODULE_VERSION, "perl module version, default: 1.0.0")); + cliOptions.add(new CliOption(MODULE_NAME, "perl module name (convention: CamelCase).").defaultValue("SwaggerClient")); + cliOptions.add(new CliOption(MODULE_VERSION, "perl module version.").defaultValue("1.0.0")); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index cc852371573..4653d6a5299 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -91,7 +91,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("object", "object"); typeMapping.put("DateTime", "\\DateTime"); - cliOptions.add(new CliOption(VARIABLE_NAMING_CONVENTION, "naming convention of variable name, e.g. camelCase. Default: snake_case")); + cliOptions.add(new CliOption(VARIABLE_NAMING_CONVENTION, "naming convention of variable name, e.g. camelCase.") + .defaultValue("snake_case")); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore")); cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root.")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index 585493664fc..1759e515258 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -63,9 +63,10 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig "return", "def", "for", "lambda", "try")); cliOptions.clear(); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "python package name (convention: snake_case)," + - " default: swagger_client")); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "python package version, default: 1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "python package name (convention: snake_case).") + .defaultValue("swagger_client")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "python package version.") + .defaultValue("1.0.0")); cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java index 0c1275a00e5..f30b2ef8b85 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -80,9 +80,11 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { itr.remove(); } } - cliOptions.add(new CliOption(GEM_NAME, "gem name (convention: underscore_case), default: swagger_client")); - cliOptions.add(new CliOption(MODULE_NAME, "top module name (convention: CamelCase, usually corresponding to gem name), default: SwaggerClient")); - cliOptions.add(new CliOption(GEM_VERSION, "gem version, default: 1.0.0")); + cliOptions.add(new CliOption(GEM_NAME, "gem name (convention: underscore_case)."). + defaultValue("swagger_client")); + cliOptions.add(new CliOption(MODULE_NAME, "top module name (convention: CamelCase, usually corresponding" + + " to gem name).").defaultValue("SwaggerClient")); + cliOptions.add(new CliOption(GEM_VERSION, "gem version.").defaultValue("1.0.0")); } @Override diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java index d6fa88efcf8..4f9e5d99c5b 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -120,7 +120,7 @@ public class SwaggerResource { value = "Returns options for a server framework", response = CliOption.class, responseContainer = "map", - tags = "clients") + tags = "servers") public Response getServerOptions( @Context HttpServletRequest request, @ApiParam(value = "The target language for the server framework", required = true) diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java index 4a3113613bb..fc015f433ea 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java @@ -81,7 +81,7 @@ public class OnlineGeneratorOptionsTest { {new StaticDocOptionsProvider()}, {new StaticHtmlOptionsProvider()}, {new SwaggerOptionsProvider()}, {new SwaggerYamlOptionsProvider()}, {new SwiftOptionsProvider()}, {new TizenClientOptionsProvider()}, - {new TypeScriptAngularClientOptionsProvider()}, {new TypeScriptNodeClientOptionsProvider()}, + {new TypeScriptAngularClientOptionsProvider()}, {new TypeScriptNodeClientOptionsProvider()} }; } diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java new file mode 100644 index 00000000000..93277a6a2f9 --- /dev/null +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java @@ -0,0 +1,26 @@ +package io.swagger.generator.online; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.JavaClientCodegen; +import io.swagger.codegen.options.JavaOptionsProvider; +import io.swagger.generator.exception.ApiException; + +import org.testng.annotations.Test; + +import java.util.Map; + +public class OnlineJavaClientOptionsTest { + + @Test + public void getOptionsTest() throws ApiException { + final Map options = Generator.getOptions(new JavaOptionsProvider().getLanguage()); + assertNotNull(options); + final CliOption opt = options.get(CodegenConstants.LIBRARY); + assertNotNull(opt); + assertEquals(opt.getDefault(), JavaClientCodegen.DEFAULT_LIBRARY); + } +} From 4a5a8b73635fea5e9157e92d45ac36db222409af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Hovm=C3=B6ller?= Date: Thu, 5 Nov 2015 15:40:05 +0100 Subject: [PATCH 070/142] Some spelling and grammar fixes --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f250419f216..664b8e20ef1 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ You need the following installed and available in your $PATH: #### OS X Users Don't forget to install Java 7. You probably have 1.6 or 1.8. -Export JAVA_HOME in order to user proper Java version: +Export JAVA_HOME in order to use the supported Java version: ``` export JAVA_HOME=`/usr/libexec/java_home -v 1.7` export PATH=${JAVA_HOME}/bin:$PATH @@ -125,7 +125,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/client/petstore/java ``` -With a number of options. You can get the options with the `help generate` command: +with a number of options. You can get the options with the `help generate` command: ``` NAME @@ -365,7 +365,7 @@ Your config file for java can look like For all the unspecified options default values will be used. -Another way to override default options is to extend config class for specific language. +Another way to override default options is to extend the config class for the specific language. To change, for example, the prefix for the Objective-C generated files, simply subclass the ObjcClientCodegen.java: ``` @@ -486,7 +486,7 @@ Note! The templates are included in the library generated. If you want to modi ## Online generators -One can also generate API client or sever using the online generators (https://generator.swagger.io) +One can also generate API client or server using the online generators (https://generator.swagger.io) For example, to generate Ruby API client, simply send the following HTTP request using curl: ``` From 080e302c63a1d9371c82a4df49e586871dbbe91f Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 5 Nov 2015 22:47:53 +0800 Subject: [PATCH 071/142] fix csharp import for file in model files --- .../src/main/resources/csharp/model.mustache | 1 + .../main/csharp/IO/Swagger/Model/Category.cs | 1 + .../src/main/csharp/IO/Swagger/Model/Order.cs | 1 + .../src/main/csharp/IO/Swagger/Model/Pet.cs | 1 + .../src/main/csharp/IO/Swagger/Model/Tag.cs | 1 + .../src/main/csharp/IO/Swagger/Model/User.cs | 1 + .../bin/Debug/SwaggerClientTest.dll.mdb | Bin 18999 -> 18999 bytes .../obj/Debug/SwaggerClientTest.dll.mdb | Bin 18999 -> 18999 bytes 8 files changed, 6 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache index 99da4f8302a..d40ece4cc02 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Text; using System.Collections; using System.Collections.Generic; diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs index c402188b9fc..56ebfdb3b7b 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Text; using System.Collections; using System.Collections.Generic; diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs index 07b3d14e598..1fa62c1605a 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Text; using System.Collections; using System.Collections.Generic; diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs index 41216b52802..37c80259944 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Text; using System.Collections; using System.Collections.Generic; diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs index 10ace1ad185..7d2ea38833b 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Text; using System.Collections; using System.Collections.Generic; diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs index d22ac54c094..5430d1182cb 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Text; using System.Collections; using System.Collections.Generic; diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb index 1a9c96751ba6290fd50c539ee4bd6b9d4a4deced..f63c1d21fe32bf28941f603b407f4784e17247ab 100644 GIT binary patch delta 1148 zcmY+COH31C6ov0lpfjBXh!i5NKzS^n6iQei3l)PQ8WN2OooT0!8I-s%K?UPlKvd)< z@DpLdBZ44_SPE!}iJ*}R#3-UsL&Dn#E>x6mLonO5KRS!g;?|3 zTZ;~6Uu=C@*?FqxjA2);QHBKH!YJ#h#GLx5TP+Ou} zs}VP%lui@$np_@@0KZG8<+WHenV3POA(dW#MK&gT8E`RujBG*f7?Up;7-hyVl`JF3 zX$EGPSzj7Ot}?L3tYaD@KCdNjuu#t4WWBx;)sZbMw6bj?)p~M}iUe_3M-H&?kbQ)Q z6VRky?MRi4=2=)^7qKQ$9r=reO?C^@1LEv{veFDy=4!L|QHjQocg)ak?(k6D1gXeG zSxI?>8FePS-J5xW~}X-JVGmYI^Gmj7BUJ?wy|j%N;eo0iLrq~AN> zgX7~aMTIG9i&S0|UCcuXU&?zoBpOHG=An^q!c?j)lJ4Q*0q^vsvGj8uMtC=-Ml|pF z9;wV|dWDA{{73avQdIZ7OI8UxX=F^4!eph`9D`wx0?_hJA5 delta 1148 zcmY+CT}V@L7{=e@bUSC~#x|z3mUC0VoO4si=pqa(2qc1V=WJ&m=Op%dQHXclPso>;2s$%(AHa8=qoM8;}1wKwvIZWU@y z841-z``6=;j|dglGe&lrtXcvHB38AO3*T~=b0Go%B2@~B8dN0?D0P%MLR62MQ*;Ks zxM5WJ9nj?n1T_L83iISOGnz=*Ph=pq#d1kDCc792Fx`x7L2en7&lwnH#xRvE_2fqe zrkLq)Y9xO$u)?fjY7(C}kXKl!U@O^>uS8AcZ5HmZ%_21fbC8N;ao9xmu<)4e#ly*H z!lLupWusXZ=Gb|xNz_EHv9Qi=V7gD7-A!I|LY1@H8G2NrX0pWztyk zf?!d5s)f*^x2ZapTq!l@f_c{`mux{Pq~!6`x(ha3zr$$~RmDLySHp#7rHp#2m4i0! z?lwhPR-IJ}nnbmJrj!3#13l=2A>UJFec=1cg{hC~zT>pV2_O_)lx#nBIVc*y(1X#)L>hhcsMQyZEMevedU zJiW}rcm4;~GR2DH=rRGyh08+d%}ivn>wE`9Z5JI7pj&u^HHpU4qXLWxFEBkU`%DQi mEzE?|1bRh)RpD2V;-k=tqrsyjBEMaU2JJb-*&cPeb?1MBQuN;d diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb index 1a9c96751ba6290fd50c539ee4bd6b9d4a4deced..f63c1d21fe32bf28941f603b407f4784e17247ab 100644 GIT binary patch delta 1148 zcmY+COH31C6ov0lpfjBXh!i5NKzS^n6iQei3l)PQ8WN2OooT0!8I-s%K?UPlKvd)< z@DpLdBZ44_SPE!}iJ*}R#3-UsL&Dn#E>x6mLonO5KRS!g;?|3 zTZ;~6Uu=C@*?FqxjA2);QHBKH!YJ#h#GLx5TP+Ou} zs}VP%lui@$np_@@0KZG8<+WHenV3POA(dW#MK&gT8E`RujBG*f7?Up;7-hyVl`JF3 zX$EGPSzj7Ot}?L3tYaD@KCdNjuu#t4WWBx;)sZbMw6bj?)p~M}iUe_3M-H&?kbQ)Q z6VRky?MRi4=2=)^7qKQ$9r=reO?C^@1LEv{veFDy=4!L|QHjQocg)ak?(k6D1gXeG zSxI?>8FePS-J5xW~}X-JVGmYI^Gmj7BUJ?wy|j%N;eo0iLrq~AN> zgX7~aMTIG9i&S0|UCcuXU&?zoBpOHG=An^q!c?j)lJ4Q*0q^vsvGj8uMtC=-Ml|pF z9;wV|dWDA{{73avQdIZ7OI8UxX=F^4!eph`9D`wx0?_hJA5 delta 1148 zcmY+CT}V@L7{=e@bUSC~#x|z3mUC0VoO4si=pqa(2qc1V=WJ&m=Op%dQHXclPso>;2s$%(AHa8=qoM8;}1wKwvIZWU@y z841-z``6=;j|dglGe&lrtXcvHB38AO3*T~=b0Go%B2@~B8dN0?D0P%MLR62MQ*;Ks zxM5WJ9nj?n1T_L83iISOGnz=*Ph=pq#d1kDCc792Fx`x7L2en7&lwnH#xRvE_2fqe zrkLq)Y9xO$u)?fjY7(C}kXKl!U@O^>uS8AcZ5HmZ%_21fbC8N;ao9xmu<)4e#ly*H z!lLupWusXZ=Gb|xNz_EHv9Qi=V7gD7-A!I|LY1@H8G2NrX0pWztyk zf?!d5s)f*^x2ZapTq!l@f_c{`mux{Pq~!6`x(ha3zr$$~RmDLySHp#7rHp#2m4i0! z?lwhPR-IJ}nnbmJrj!3#13l=2A>UJFec=1cg{hC~zT>pV2_O_)lx#nBIVc*y(1X#)L>hhcsMQyZEMevedU zJiW}rcm4;~GR2DH=rRGyh08+d%}ivn>wE`9Z5JI7pj&u^HHpU4qXLWxFEBkU`%DQi mEzE?|1bRh)RpD2V;-k=tqrsyjBEMaU2JJb-*&cPeb?1MBQuN;d From cdd20ac4089ebccfb847f5d83d8f46ca9890284f Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 5 Nov 2015 18:19:21 -0800 Subject: [PATCH 072/142] updated swagger definitions for opts --- .../generator/DynamicSwaggerConfig.java | 35 ++++++++++--------- .../swagger/generator/online/Generator.java | 16 ++++++++- .../generator/resource/SwaggerResource.java | 35 ++++++++++++------- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java index ee5792850c5..974b938a1aa 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java @@ -26,35 +26,36 @@ public class DynamicSwaggerConfig extends BeanConfig { Parameter framework = post.getParameters().get(0); if (framework instanceof PathParameter) { PathParameter param = (PathParameter) framework; - StringBuilder b = new StringBuilder(); - for (String client : clients) { - if (b.toString().length() > 0) { - b.append(", "); - } - b.append(client); - } - param.setDescription("available clients: " + b.toString()); param.setEnum(clients); } + + Operation get = clientPath.getGet(); + if(get != null) { + framework = get.getParameters().get(0); + if (framework instanceof PathParameter) { + PathParameter param = (PathParameter) framework; + param.setEnum(clients); + } + } } Path serverPath = swagger.getPaths().get("/gen/servers/{framework}"); - // update the path description based on what servers are available via SPI if (serverPath != null) { Operation post = serverPath.getPost(); Parameter framework = post.getParameters().get(0); if (framework instanceof PathParameter) { PathParameter param = (PathParameter) framework; - StringBuilder b = new StringBuilder(); - for (String server : servers) { - if (b.toString().length() > 0) { - b.append(", "); - } - b.append(server); - } - param.setDescription("available servers: " + b.toString()); param.setEnum(servers); } + + Operation get = serverPath.getGet(); + if(get != null) { + framework = get.getParameters().get(0); + if (framework instanceof PathParameter) { + PathParameter param = (PathParameter) framework; + param.setEnum(servers); + } + } } return swagger.info(getInfo()) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index e709e777dd4..a5c14e43715 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -109,7 +109,7 @@ public class Generator { codegenConfig.setOutputDir(outputFolder); - Json.prettyPrint(clientOpts); + LOGGER.debug(Json.pretty(clientOpts)); clientOptInput.setConfig(codegenConfig); @@ -124,6 +124,20 @@ public class Generator { } else { throw new BadRequestException(400, "A target generation was attempted, but no files were created!"); } + for(File file: files) { + try { + file.delete(); + } + catch(Exception e) { + LOGGER.error("unable to delete file " + file.getAbsolutePath()); + } + } + try { + new File(outputFolder).delete(); + } + catch (Exception e) { + LOGGER.error("unable to delete output folder " + outputFolder); + } } catch (Exception e) { throw new BadRequestException(500, "Unable to build target: " + e.getMessage()); } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java index 4f9e5d99c5b..343692f8385 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -12,16 +12,14 @@ import io.swagger.generator.model.Generated; import io.swagger.generator.model.GeneratorInput; import io.swagger.generator.model.ResponseCode; import io.swagger.generator.online.Generator; +import org.apache.commons.io.FileUtils; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.*; import javax.ws.rs.core.Context; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.servlet.http.HttpServletRequest; +import java.io.File; import java.util.*; @Path("/gen") @@ -35,6 +33,9 @@ public class SwaggerResource { @Path("/download/{fileId}") @Produces({MediaType.APPLICATION_OCTET_STREAM}) @ApiOperation(value = "Downloads a pre-generated file", + notes = "A valid `fileId` is generated by the `/clients/{language}` or `/servers/{language}` POST " + + "operations. The fileId code can be used just once, after which a new `fileId` will need to " + + "be requested.", response = String.class, tags = {"clients", "servers"}) public Response downloadFile(@PathParam("fileId") String fileId) throws Exception { @@ -42,7 +43,15 @@ public class SwaggerResource { System.out.println("looking for fileId " + fileId); System.out.println("got filename " + g.getFilename()); if (g.getFilename() != null) { - byte[] bytes = org.apache.commons.io.FileUtils.readFileToByteArray(new java.io.File(g.getFilename())); + File file = new java.io.File(g.getFilename()); + byte[] bytes = org.apache.commons.io.FileUtils.readFileToByteArray(file); + + try { + FileUtils.deleteDirectory(file.getParentFile()); + } + catch (Exception e) { + System.out.println("failed to delete file " + file.getAbsolutePath()); + } return Response.ok(bytes, "application/zip") .header("Content-Disposition", "attachment; filename=\"" + g.getFriendlyName() + "-generated.zip\"") @@ -57,7 +66,8 @@ public class SwaggerResource { @POST @Path("/clients/{language}") @ApiOperation( - value = "Generates a client library based on the config", + value = "Generates a client library", + notes = "Accepts a `GeneratorInput` options map for spec location and generation options", response = ResponseCode.class, tags = "clients") public Response generateClient( @@ -78,7 +88,7 @@ public class SwaggerResource { String host = scheme + "://" + request.getServerName() + port; if (filename != null) { - String code = String.valueOf(System.currentTimeMillis()); + String code = String.valueOf(UUID.randomUUID().toString()); Generated g = new Generated(); g.setFilename(filename); g.setFriendlyName(language + "-client"); @@ -114,7 +124,7 @@ public class SwaggerResource { } @GET - @Path("/server/{framework}") + @Path("/servers/{framework}") @Produces({MediaType.APPLICATION_JSON}) @ApiOperation( value = "Returns options for a server framework", @@ -161,7 +171,8 @@ public class SwaggerResource { @POST @Path("/servers/{framework}") - @ApiOperation(value = "Generates a server library for the supplied server framework", + @ApiOperation(value = "Generates a server library", + notes = "Accepts a `GeneratorInput` options map for spec location and generation options.", response = ResponseCode.class, tags = "servers") public Response generateServerForLanguage( @@ -178,7 +189,7 @@ public class SwaggerResource { String host = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort(); if (filename != null) { - String code = String.valueOf(System.currentTimeMillis()); + String code = String.valueOf(UUID.randomUUID().toString()); Generated g = new Generated(); g.setFilename(filename); g.setFriendlyName(framework + "-server"); From c4b2f210bea2b6b03a7acef25b6702548ff42755 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 5 Nov 2015 18:49:11 -0800 Subject: [PATCH 073/142] fixed context path --- .../swagger-codegen/src/main/resources/JavaJaxRS/web.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache index ae6f6d4d692..2046f433bb9 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache @@ -41,7 +41,7 @@ jersey - /* + {{contextPath}}/* ApiOriginFilter From b30cbd92614ca4ef71db7d7bed11abe4b6ef70ad Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 5 Nov 2015 18:52:23 -0800 Subject: [PATCH 074/142] correctly set host --- .../swagger-codegen/src/main/resources/JavaJaxRS/web.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache index 2046f433bb9..8cd666106f9 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache @@ -34,7 +34,7 @@ swagger.api.basepath - http://localhost:8080 + {{basePath}} 2 From c8ea36e188b63d9188e1d89dded51362fa6d3d9b Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 5 Nov 2015 18:52:47 -0800 Subject: [PATCH 075/142] rebuilt --- .../gen/java/io/swagger/api/ApiException.java | 2 +- .../java/io/swagger/api/ApiOriginFilter.java | 2 +- .../io/swagger/api/ApiResponseMessage.java | 2 +- .../io/swagger/api/NotFoundException.java | 2 +- .../src/gen/java/io/swagger/api/PetApi.java | 22 +- .../java/io/swagger/api/PetApiService.java | 2 +- .../src/gen/java/io/swagger/api/StoreApi.java | 8 +- .../java/io/swagger/api/StoreApiService.java | 2 +- .../src/gen/java/io/swagger/api/UserApi.java | 16 +- .../java/io/swagger/api/UserApiService.java | 2 +- .../gen/java/io/swagger/model/Category.java | 2 +- .../src/gen/java/io/swagger/model/Order.java | 2 +- .../src/gen/java/io/swagger/model/Pet.java | 2 +- .../src/gen/java/io/swagger/model/Tag.java | 2 +- .../src/gen/java/io/swagger/model/User.java | 2 +- .../api/factories/PetApiServiceFactory.java | 2 +- .../api/factories/StoreApiServiceFactory.java | 2 +- .../api/factories/UserApiServiceFactory.java | 2 +- .../swagger/api/impl/PetApiServiceImpl.java | 2 +- .../swagger/api/impl/StoreApiServiceImpl.java | 2 +- .../swagger/api/impl/UserApiServiceImpl.java | 2 +- .../jaxrs/src/main/webapp/WEB-INF/web.xml | 4 +- .../java/io/swagger/client/ApiClient.java | 553 ------------------ .../java/io/swagger/client/ApiException.java | 48 -- .../java/io/swagger/client/Configuration.java | 22 - .../src/test/java/io/swagger/client/JSON.java | 52 -- .../src/test/java/io/swagger/client/Pair.java | 39 -- .../java/io/swagger/client/StringUtil.java | 42 -- .../test/java/io/swagger/client/TypeRef.java | 26 - .../java/io/swagger/client/api/PetApi.java | 407 ------------- .../java/io/swagger/client/api/StoreApi.java | 215 ------- .../java/io/swagger/client/api/UserApi.java | 386 ------------ .../io/swagger/client/auth/ApiKeyAuth.java | 59 -- .../swagger/client/auth/Authentication.java | 12 - .../io/swagger/client/auth/HttpBasicAuth.java | 41 -- .../java/io/swagger/client/auth/OAuth.java | 14 - .../io/swagger/client/model/Category.java | 53 -- .../java/io/swagger/client/model/Order.java | 114 ---- .../java/io/swagger/client/model/Pet.java | 116 ---- .../java/io/swagger/client/model/Tag.java | 53 -- .../java/io/swagger/client/model/User.java | 138 ----- .../integration/ResourceListingTestIT.java | 85 --- 42 files changed, 43 insertions(+), 2518 deletions(-) delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/StringUtil.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/TypeRef.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/User.java delete mode 100644 samples/server/petstore/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java index ad8ae3aff94..5fbf037b2ff 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java @@ -1,6 +1,6 @@ package io.swagger.api; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class ApiException extends Exception{ private int code; public ApiException (int code, String msg) { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java index 3c45b7e282f..1c5dade251c 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java @@ -5,7 +5,7 @@ import java.io.IOException; import javax.servlet.*; import javax.servlet.http.HttpServletResponse; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class ApiOriginFilter implements javax.servlet.Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java index 1bddb4087ae..91264320d2c 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java @@ -3,7 +3,7 @@ package io.swagger.api; import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class ApiResponseMessage { public static final int ERROR = 1; public static final int WARNING = 2; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java index 37f7328aaf7..7b5055536d2 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java @@ -1,6 +1,6 @@ package io.swagger.api; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class NotFoundException extends ApiException { private int code; public NotFoundException (int code, String msg) { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java index 260523279cd..d8918a855f9 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java @@ -26,7 +26,7 @@ import javax.ws.rs.*; @io.swagger.annotations.Api(value = "/pet", description = "the pet API") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class PetApi { private final PetApiService delegate = PetApiServiceFactory.getPetApi(); @@ -48,7 +48,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) - public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ) Pet body) + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ) Pet body) throws NotFoundException { return delegate.updatePet(body); } @@ -65,7 +65,7 @@ public class PetApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ) Pet body) + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ) Pet body) throws NotFoundException { return delegate.addPet(body); } @@ -121,7 +121,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class) }) - public Response getPetById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathParam("petId") Long petId) + public Response getPetById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("petId") Long petId) throws NotFoundException { return delegate.getPetById(petId); } @@ -138,9 +138,9 @@ public class PetApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathParam("petId") String petId, - @ApiParam(value = "Updated name of the pet" )@FormParam("name") String name, - @ApiParam(value = "Updated status of the pet" )@FormParam("status") String status) + public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") String petId, + @ApiParam(value = "Updated name of the pet")@FormParam("name") String name, + @ApiParam(value = "Updated status of the pet")@FormParam("status") String status) throws NotFoundException { return delegate.updatePetWithForm(petId,name,status); } @@ -157,8 +157,8 @@ public class PetApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) }) - public Response deletePet(@ApiParam(value = "Pet id to delete",required=true ) @PathParam("petId") Long petId, - @ApiParam(value = "" )@HeaderParam("api_key") String apiKey) + public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId, + @ApiParam(value = "" )@HeaderParam("api_key") String apiKey) throws NotFoundException { return delegate.deletePet(petId,apiKey); } @@ -175,8 +175,8 @@ public class PetApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathParam("petId") Long petId, - @ApiParam(value = "Additional data to pass to server" )@FormParam("additionalMetadata") String additionalMetadata, + public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId, + @ApiParam(value = "Additional data to pass to server")@FormParam("additionalMetadata") String additionalMetadata, @FormDataParam("file") InputStream inputStream, @FormDataParam("file") FormDataContentDisposition fileDetail) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java index 8171555b0d0..edb656bba4b 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public abstract class PetApiService { public abstract Response updatePet(Pet body) diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java index 63fac7c2b34..c75b7c0b005 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java @@ -26,7 +26,7 @@ import javax.ws.rs.*; @io.swagger.annotations.Api(value = "/store", description = "the store API") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class StoreApi { private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi(); @@ -55,7 +55,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) }) - public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ) Order body) + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ) Order body) throws NotFoundException { return delegate.placeOrder(body); } @@ -71,7 +71,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class) }) - public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathParam("orderId") String orderId) + public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") String orderId) throws NotFoundException { return delegate.getOrderById(orderId); } @@ -85,7 +85,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) - public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathParam("orderId") String orderId) + public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") String orderId) throws NotFoundException { return delegate.deleteOrder(orderId); } diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java index dc8274ce739..20dd92d9cd9 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public abstract class StoreApiService { public abstract Response getInventory() diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java index cade9a3b2f1..9a1b8187021 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java @@ -26,7 +26,7 @@ import javax.ws.rs.*; @io.swagger.annotations.Api(value = "/user", description = "the user API") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class UserApi { private final UserApiService delegate = UserApiServiceFactory.getUserApi(); @@ -39,7 +39,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUser(@ApiParam(value = "Created user object" ) User body) + public Response createUser(@ApiParam(value = "Created user object" ) User body) throws NotFoundException { return delegate.createUser(body); } @@ -51,7 +51,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ) List body) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ) List body) throws NotFoundException { return delegate.createUsersWithArrayInput(body); } @@ -63,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ) List body) + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ) List body) throws NotFoundException { return delegate.createUsersWithListInput(body); } @@ -106,7 +106,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) }) - public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true ) @PathParam("username") String username) + public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username) throws NotFoundException { return delegate.getUserByName(username); } @@ -120,8 +120,8 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true ) @PathParam("username") String username, - @ApiParam(value = "Updated user object" ) User body) + public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, + @ApiParam(value = "Updated user object" ) User body) throws NotFoundException { return delegate.updateUser(username,body); } @@ -135,7 +135,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathParam("username") String username) + public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username) throws NotFoundException { return delegate.deleteUser(username); } diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java index 175aa32757a..efd8a3fe9a4 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public abstract class UserApiService { public abstract Response createUser(User body) diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java index 9aed596a768..e390c5b806c 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class Category { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java index 8a5c22a38ac..59c85b3d7d8 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class Order { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java index f3e1cfa17f2..f0d2790a8ac 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class Pet { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java index fe723eea4d8..83434c8b812 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class Tag { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java index ea890100a74..6aa15fe86b4 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-10-26T17:58:55.634+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") public class User { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java index c3a7cbf8bf7..1110a6abad9 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java @@ -3,7 +3,7 @@ package io.swagger.api.factories; import io.swagger.api.PetApiService; import io.swagger.api.impl.PetApiServiceImpl; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") public class PetApiServiceFactory { private final static PetApiService service = new PetApiServiceImpl(); diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java index 9eb7af458dd..cd3cd1fa9e2 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java @@ -3,7 +3,7 @@ package io.swagger.api.factories; import io.swagger.api.StoreApiService; import io.swagger.api.impl.StoreApiServiceImpl; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") public class StoreApiServiceFactory { private final static StoreApiService service = new StoreApiServiceImpl(); diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java index 2f381c6b459..2be6d83827a 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java @@ -3,7 +3,7 @@ package io.swagger.api.factories; import io.swagger.api.UserApiService; import io.swagger.api.impl.UserApiServiceImpl; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") public class UserApiServiceFactory { private final static UserApiService service = new UserApiServiceImpl(); diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java index c7ee88aaf63..3432c17d0b0 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") public class PetApiServiceImpl extends PetApiService { @Override diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java index 7dbf5e75dd2..96a7d50cd3a 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") public class StoreApiServiceImpl extends StoreApiService { @Override diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java index cdbc9afed19..1d5eeab2cd6 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") public class UserApiServiceImpl extends UserApiService { @Override diff --git a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml index 80df1cd180d..bde33eae91a 100644 --- a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml +++ b/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml @@ -34,14 +34,14 @@ swagger.api.basepath - http://localhost:8080 + http://petstore.swagger.io/v2 2 jersey - /* + /v2/* ApiOriginFilter diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java deleted file mode 100644 index 9af0c10b543..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java +++ /dev/null @@ -1,553 +0,0 @@ -package io.swagger.client; - -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.config.ClientConfig; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.api.client.filter.LoggingFilter; -import com.sun.jersey.api.client.WebResource.Builder; - -import com.sun.jersey.multipart.FormDataMultiPart; -import com.sun.jersey.multipart.file.FileDataBodyPart; - -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.MediaType; - -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.HashMap; -import java.util.List; -import java.util.ArrayList; -import java.util.Date; -import java.util.TimeZone; - -import java.net.URLEncoder; - -import java.io.IOException; -import java.io.File; -import java.io.UnsupportedEncodingException; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.text.ParseException; - -import io.swagger.client.auth.Authentication; -import io.swagger.client.auth.HttpBasicAuth; -import io.swagger.client.auth.ApiKeyAuth; -import io.swagger.client.auth.OAuth; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class ApiClient { - private Map hostMap = new HashMap(); - private Map defaultHeaderMap = new HashMap(); - private boolean debugging = false; - private String basePath = "http://petstore.swagger.io/v2"; - private JSON json = new JSON(); - - private Map authentications; - - private DateFormat dateFormat; - - public ApiClient() { - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - - // Use UTC as the default time zone. - this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - - // Set default User-Agent. - setUserAgent("Java-Swagger"); - - // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); - authentications.put("api_key", new ApiKeyAuth("header", "api_key")); - authentications.put("petstore_auth", new OAuth()); - // Prevent the authentications from being modified. - authentications = Collections.unmodifiableMap(authentications); - } - - public String getBasePath() { - return basePath; - } - - public ApiClient setBasePath(String basePath) { - this.basePath = basePath; - return this; - } - - /** - * Get authentications (key: authentication name, value: authentication). - */ - public Map getAuthentications() { - return authentications; - } - - /** - * Get authentication for the given name. - * - * @param authName The authentication name - * @return The authentication, null if not found - */ - public Authentication getAuthentication(String authName) { - return authentications.get(authName); - } - - /** - * Helper method to set username for the first HTTP basic authentication. - */ - public void setUsername(String username) { - for (Authentication auth : authentications.values()) { - if (auth instanceof HttpBasicAuth) { - ((HttpBasicAuth) auth).setUsername(username); - return; - } - } - throw new RuntimeException("No HTTP basic authentication configured!"); - } - - /** - * Helper method to set password for the first HTTP basic authentication. - */ - public void setPassword(String password) { - for (Authentication auth : authentications.values()) { - if (auth instanceof HttpBasicAuth) { - ((HttpBasicAuth) auth).setPassword(password); - return; - } - } - throw new RuntimeException("No HTTP basic authentication configured!"); - } - - /** - * Helper method to set API key value for the first API key authentication. - */ - public void setApiKey(String apiKey) { - for (Authentication auth : authentications.values()) { - if (auth instanceof ApiKeyAuth) { - ((ApiKeyAuth) auth).setApiKey(apiKey); - return; - } - } - throw new RuntimeException("No API key authentication configured!"); - } - - /** - * Helper method to set API key prefix for the first API key authentication. - */ - public void setApiKeyPrefix(String apiKeyPrefix) { - for (Authentication auth : authentications.values()) { - if (auth instanceof ApiKeyAuth) { - ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix); - return; - } - } - throw new RuntimeException("No API key authentication configured!"); - } - - /** - * Set the User-Agent header's value (by adding to the default header map). - */ - public ApiClient setUserAgent(String userAgent) { - addDefaultHeader("User-Agent", userAgent); - return this; - } - - /** - * Add a default header. - * - * @param key The header's key - * @param value The header's value - */ - public ApiClient addDefaultHeader(String key, String value) { - defaultHeaderMap.put(key, value); - return this; - } - - /** - * Check that whether debugging is enabled for this API client. - */ - public boolean isDebugging() { - return debugging; - } - - /** - * Enable/disable debugging for this API client. - * - * @param debugging To enable (true) or disable (false) debugging - */ - public ApiClient setDebugging(boolean debugging) { - this.debugging = debugging; - return this; - } - - /** - * Get the date format used to parse/format date parameters. - */ - public DateFormat getDateFormat() { - return dateFormat; - } - - /** - * Set the date format used to parse/format date parameters. - */ - public ApiClient getDateFormat(DateFormat dateFormat) { - this.dateFormat = dateFormat; - return this; - } - - /** - * Parse the given string into Date object. - */ - public Date parseDate(String str) { - try { - return dateFormat.parse(str); - } catch (java.text.ParseException e) { - throw new RuntimeException(e); - } - } - - /** - * Format the given Date object into string. - */ - public String formatDate(Date date) { - return dateFormat.format(date); - } - - /** - * Format the given parameter object into string. - */ - public String parameterToString(Object param) { - if (param == null) { - return ""; - } else if (param instanceof Date) { - return formatDate((Date) param); - } else if (param instanceof Collection) { - StringBuilder b = new StringBuilder(); - for(Object o : (Collection)param) { - if(b.length() > 0) { - b.append(","); - } - b.append(String.valueOf(o)); - } - return b.toString(); - } else { - return String.valueOf(param); - } - } - - /* - Format to {@code Pair} objects. - */ - public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); - - // preconditions - if (name == null || name.isEmpty() || value == null) return params; - - Collection valueCollection = null; - if (value instanceof Collection) { - valueCollection = (Collection) value; - } else { - params.add(new Pair(name, parameterToString(value))); - return params; - } - - if (valueCollection.isEmpty()){ - return params; - } - - // get the collection format - collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv - - // create the params based on the collection format - if (collectionFormat.equals("multi")) { - for (Object item : valueCollection) { - params.add(new Pair(name, parameterToString(item))); - } - - return params; - } - - String delimiter = ","; - - if (collectionFormat.equals("csv")) { - delimiter = ","; - } else if (collectionFormat.equals("ssv")) { - delimiter = " "; - } else if (collectionFormat.equals("tsv")) { - delimiter = "\t"; - } else if (collectionFormat.equals("pipes")) { - delimiter = "|"; - } - - StringBuilder sb = new StringBuilder() ; - for (Object item : valueCollection) { - sb.append(delimiter); - sb.append(parameterToString(item)); - } - - params.add(new Pair(name, sb.substring(1))); - - return params; - } - - /** - * Select the Accept header's value from the given accepts array: - * if JSON exists in the given array, use it; - * otherwise use all of them (joining into a string) - * - * @param accepts The accepts array to select from - * @return The Accept header to use. If the given array is empty, - * null will be returned (not to set the Accept header explicitly). - */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) return null; - if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json"; - return StringUtil.join(accepts, ","); - } - - /** - * Select the Content-Type header's value from the given array: - * if JSON exists in the given array, use it; - * otherwise use the first one of the array. - * - * @param contentTypes The Content-Type array to select from - * @return The Content-Type header to use. If the given array is empty, - * JSON will be used. - */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) return "application/json"; - if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json"; - return contentTypes[0]; - } - - /** - * Escape the given string to be used as URL query value. - */ - public String escapeString(String str) { - try { - return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20"); - } catch (UnsupportedEncodingException e) { - return str; - } - } - - /** - * Serialize the given Java object into string according the given - * Content-Type (only JSON is supported for now). - */ - public String serialize(Object obj, String contentType) throws ApiException { - if (contentType.startsWith("application/json")) { - return json.serialize(obj); - } else { - throw new ApiException(400, "can not serialize object into Content-Type: " + contentType); - } - } - - /** - * Deserialize response body to Java object according to the Content-Type. - */ - public T deserialize(ClientResponse response, TypeRef returnType) throws ApiException { - String contentType = null; - List contentTypes = response.getHeaders().get("Content-Type"); - if (contentTypes != null && !contentTypes.isEmpty()) - contentType = contentTypes.get(0); - if (contentType == null) - throw new ApiException(500, "missing Content-Type in response"); - - String body; - if (response.hasEntity()) - body = (String) response.getEntity(String.class); - else - body = ""; - - if (contentType.startsWith("application/json")) { - return json.deserialize(body, returnType); - } else { - throw new ApiException(500, "can not deserialize Content-Type: " + contentType); - } - } - - /** - * Invoke API by sending HTTP request with the given options. - * - * @param path The sub-path of the HTTP URL - * @param method The request method, one of "GET", "POST", "PUT", and "DELETE" - * @param queryParams The query parameters - * @param body The request body object - * @param headerParams The header parameters - * @param formParams The form parameters - * @param accept The request's Accept header - * @param contentType The request's Content-Type header - * @param authNames The authentications to apply - * @param returnType The return type into which to deserialize the response - * @return The response body in type of string - */ - public T invokeAPI(String path, String method, List queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames, TypeRef returnType) throws ApiException { - updateParamsForAuth(authNames, queryParams, headerParams); - - Client client = getClient(); - - StringBuilder b = new StringBuilder(); - b.append("?"); - if (queryParams != null){ - for (Pair queryParam : queryParams){ - if (!queryParam.getName().isEmpty()) { - b.append(escapeString(queryParam.getName())); - b.append("="); - b.append(escapeString(queryParam.getValue())); - b.append("&"); - } - } - } - - String querystring = b.substring(0, b.length() - 1); - - Builder builder; - if (accept == null) - builder = client.resource(basePath + path + querystring).getRequestBuilder(); - else - builder = client.resource(basePath + path + querystring).accept(accept); - - for (String key : headerParams.keySet()) { - builder = builder.header(key, headerParams.get(key)); - } - for (String key : defaultHeaderMap.keySet()) { - if (!headerParams.containsKey(key)) { - builder = builder.header(key, defaultHeaderMap.get(key)); - } - } - - String encodedFormParams = null; - if (contentType.startsWith("multipart/form-data")) { - FormDataMultiPart mp = new FormDataMultiPart(); - for (Entry param: formParams.entrySet()) { - if (param.getValue() instanceof File) { - File file = (File) param.getValue(); - mp.field(param.getKey(), file.getName()); - mp.bodyPart(new FileDataBodyPart(param.getKey(), file, MediaType.MULTIPART_FORM_DATA_TYPE)); - } else { - mp.field(param.getKey(), parameterToString(param.getValue()), MediaType.MULTIPART_FORM_DATA_TYPE); - } - } - body = mp; - } else if (contentType.startsWith("application/x-www-form-urlencoded")) { - encodedFormParams = this.getXWWWFormUrlencodedParams(formParams); - } - - ClientResponse response = null; - - if ("GET".equals(method)) { - response = (ClientResponse) builder.get(ClientResponse.class); - } else if ("POST".equals(method)) { - if (encodedFormParams != null) { - response = builder.type(contentType).post(ClientResponse.class, encodedFormParams); - } else if (body == null) { - response = builder.post(ClientResponse.class, null); - } else if (body instanceof FormDataMultiPart) { - response = builder.type(contentType).post(ClientResponse.class, body); - } else { - response = builder.type(contentType).post(ClientResponse.class, serialize(body, contentType)); - } - } else if ("PUT".equals(method)) { - if (encodedFormParams != null) { - response = builder.type(contentType).put(ClientResponse.class, encodedFormParams); - } else if(body == null) { - response = builder.put(ClientResponse.class, serialize(body, contentType)); - } else { - response = builder.type(contentType).put(ClientResponse.class, serialize(body, contentType)); - } - } else if ("DELETE".equals(method)) { - if (encodedFormParams != null) { - response = builder.type(contentType).delete(ClientResponse.class, encodedFormParams); - } else if(body == null) { - response = builder.delete(ClientResponse.class); - } else { - response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType)); - } - } else { - throw new ApiException(500, "unknown method type " + method); - } - - if (response.getStatusInfo() == ClientResponse.Status.NO_CONTENT) { - return null; - } else if (response.getStatusInfo().getFamily() == Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.getEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } - } - throw new ApiException( - response.getStatusInfo().getStatusCode(), - message, - response.getHeaders(), - respBody); - } - } - - /** - * Update query and header parameters based on authentication settings. - * - * @param authNames The authentications to apply - */ - private void updateParamsForAuth(String[] authNames, List queryParams, Map headerParams) { - for (String authName : authNames) { - Authentication auth = authentications.get(authName); - if (auth == null) throw new RuntimeException("Authentication undefined: " + authName); - auth.applyToParams(queryParams, headerParams); - } - } - - /** - * Encode the given form parameters as request body. - */ - private String getXWWWFormUrlencodedParams(Map formParams) { - StringBuilder formParamBuilder = new StringBuilder(); - - for (Entry param : formParams.entrySet()) { - String keyStr = param.getKey(); - String valueStr = parameterToString(param.getValue()); - try { - formParamBuilder.append(URLEncoder.encode(param.getKey(), "utf8")) - .append("=") - .append(URLEncoder.encode(valueStr, "utf8")); - formParamBuilder.append("&"); - } catch (UnsupportedEncodingException e) { - // move on to next - } - } - - String encodedFormParams = formParamBuilder.toString(); - if (encodedFormParams.endsWith("&")) { - encodedFormParams = encodedFormParams.substring(0, encodedFormParams.length() - 1); - } - - return encodedFormParams; - } - - /** - * Get an existing client or create a new client to handle HTTP request. - */ - private Client getClient() { - if(!hostMap.containsKey(basePath)) { - Client client = Client.create(); - if (debugging) - client.addFilter(new LoggingFilter()); - hostMap.put(basePath, client); - } - return hostMap.get(basePath); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java deleted file mode 100644 index 605f8c3769d..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.swagger.client; - -import java.util.Map; -import java.util.List; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class ApiException extends Exception { - private int code = 0; - private String message = null; - private Map> responseHeaders = null; - private String responseBody = null; - - public ApiException() {} - - public ApiException(int code, String message) { - this.code = code; - this.message = message; - } - - public ApiException(int code, String message, Map> responseHeaders, String responseBody) { - this.code = code; - this.message = message; - this.responseHeaders = responseHeaders; - this.responseBody = responseBody; - } - - public int getCode() { - return code; - } - - public String getMessage() { - return message; - } - - /** - * Get the HTTP response headers. - */ - public Map> getResponseHeaders() { - return responseHeaders; - } - - /** - * Get the HTTP response body. - */ - public String getResponseBody() { - return responseBody; - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java deleted file mode 100644 index 524006fd7bd..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.swagger.client; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class Configuration { - private static ApiClient defaultApiClient = new ApiClient(); - - /** - * Get the default API client, which would be used when creating API - * instances without providing an API client. - */ - public static ApiClient getDefaultApiClient() { - return defaultApiClient; - } - - /** - * Set the default API client, which would be used when creating API - * instances without providing an API client. - */ - public static void setDefaultApiClient(ApiClient apiClient) { - defaultApiClient = apiClient; - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java deleted file mode 100644 index 3514e41778e..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java +++ /dev/null @@ -1,52 +0,0 @@ -package io.swagger.client; - -import com.fasterxml.jackson.annotation.*; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.datatype.joda.*; - -import java.io.IOException; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class JSON { - private ObjectMapper mapper; - - public JSON() { - mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); - mapper.registerModule(new JodaModule()); - } - - /** - * Serialize the given Java object into JSON string. - */ - public String serialize(Object obj) throws ApiException { - try { - if (obj != null) - return mapper.writeValueAsString(obj); - else - return null; - } catch (Exception e) { - throw new ApiException(400, e.getMessage()); - } - } - - /** - * Deserialize the given JSON string to Java object. - * - * @param body The JSON string - * @param returnType The type to deserialize inot - * @return The deserialized Java object - */ - public T deserialize(String body, TypeRef returnType) throws ApiException { - JavaType javaType = mapper.constructType(returnType.getType()); - try { - return mapper.readValue(body, javaType); - } catch (IOException e) { - if (returnType.getType().equals(String.class)) - return (T) body; - else - throw new ApiException(500, e.getMessage(), null, body); - } - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java deleted file mode 100644 index e7dd3350637..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.swagger.client; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class Pair { - private String name = ""; - private String value = ""; - - public Pair (String name, String value) { - setName(name); - setValue(value); - } - - private void setName(String name) { - if (!isValidString(name)) return; - - this.name = name; - } - - private void setValue(String value) { - if (!isValidString(value)) return; - - this.value = value; - } - - public String getName() { - return this.name; - } - - public String getValue() { - return this.value; - } - - private boolean isValidString(String arg) { - if (arg == null) return false; - if (arg.trim().isEmpty()) return false; - - return true; - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/StringUtil.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/StringUtil.java deleted file mode 100644 index c80bc8a1647..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/StringUtil.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.swagger.client; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class StringUtil { - /** - * Check if the given array contains the given value (with case-insensitive comparison). - * - * @param array The array - * @param value The value to search - * @return true if the array contains the value - */ - public static boolean containsIgnoreCase(String[] array, String value) { - for (String str : array) { - if (value == null && str == null) return true; - if (value != null && value.equalsIgnoreCase(str)) return true; - } - return false; - } - - /** - * Join an array of strings with the given separator. - *

- * Note: This might be replaced by utility method from commons-lang or guava someday - * if one of those libraries is added as dependency. - *

- * - * @param array The array of strings - * @param separator The separator - * @return the resulting string - */ - public static String join(String[] array, String separator) { - int len = array.length; - if (len == 0) return ""; - - StringBuilder out = new StringBuilder(); - out.append(array[0]); - for (int i = 1; i < len; i++) { - out.append(separator).append(array[i]); - } - return out.toString(); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/TypeRef.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/TypeRef.java deleted file mode 100644 index 15eb3ea05ba..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/TypeRef.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.swagger.client; - -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class TypeRef { - private final Type type; - - public TypeRef() { - this.type = getGenericType(getClass()); - } - - private static Type getGenericType(Class klass) { - Type superclass = klass.getGenericSuperclass(); - if (superclass instanceof Class) { - throw new RuntimeException("No type parameter provided"); - } - ParameterizedType parameterized = (ParameterizedType) superclass; - return parameterized.getActualTypeArguments()[0]; - } - - public Type getType() { - return type; - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java deleted file mode 100644 index 5b71f7c199c..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java +++ /dev/null @@ -1,407 +0,0 @@ -package io.swagger.client.api; - -import io.swagger.client.ApiException; -import io.swagger.client.ApiClient; -import io.swagger.client.Configuration; -import io.swagger.client.Pair; -import io.swagger.client.TypeRef; - -import io.swagger.client.model.*; - -import java.util.*; - -import io.swagger.client.model.Pet; -import java.io.File; - -import java.io.File; -import java.util.Map; -import java.util.HashMap; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class PetApi { - private ApiClient apiClient; - - public PetApi() { - this(Configuration.getDefaultApiClient()); - } - - public PetApi(ApiClient apiClient) { - this.apiClient = apiClient; - } - - public ApiClient getApiClient() { - return apiClient; - } - - public void setApiClient(ApiClient apiClient) { - this.apiClient = apiClient; - } - - - /** - * Update an existing pet - * - * @param body Pet object that needs to be added to the store - * @return void - */ - public void updatePet (Pet body) throws ApiException { - Object postBody = body; - - - // create path and map variables - String path = "/pet".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - "application/json", "application/xml" - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Add a new pet to the store - * - * @param body Pet object that needs to be added to the store - * @return void - */ - public void addPet (Pet body) throws ApiException { - Object postBody = body; - - - // create path and map variables - String path = "/pet".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - "application/json", "application/xml" - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Finds Pets by status - * Multiple status values can be provided with comma seperated strings - * @param status Status values that need to be considered for filter - * @return List - */ - public List findPetsByStatus (List status) throws ApiException { - Object postBody = null; - - - // create path and map variables - String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - queryParams.addAll(apiClient.parameterToPairs("multi", "status", status)); - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - TypeRef returnType = new TypeRef>() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Finds Pets by tags - * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. - * @param tags Tags to filter by - * @return List - */ - public List findPetsByTags (List tags) throws ApiException { - Object postBody = null; - - - // create path and map variables - String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags)); - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - TypeRef returnType = new TypeRef>() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Find pet by ID - * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions - * @param petId ID of pet that needs to be fetched - * @return Pet - */ - public Pet getPetById (Long petId) throws ApiException { - Object postBody = null; - - // verify the required parameter 'petId' is set - if (petId == null) { - throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"); - } - - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "api_key", "petstore_auth" }; - - TypeRef returnType = new TypeRef() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated - * @param name Updated name of the pet - * @param status Updated status of the pet - * @return void - */ - public void updatePetWithForm (String petId, String name, String status) throws ApiException { - Object postBody = null; - - // verify the required parameter 'petId' is set - if (petId == null) { - throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"); - } - - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - if (name != null) - formParams.put("name", name); - if (status != null) - formParams.put("status", status); - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - "application/x-www-form-urlencoded" - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Deletes a pet - * - * @param petId Pet id to delete - * @param apiKey - * @return void - */ - public void deletePet (Long petId, String apiKey) throws ApiException { - Object postBody = null; - - // verify the required parameter 'petId' is set - if (petId == null) { - throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"); - } - - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - if (apiKey != null) - headerParams.put("api_key", apiClient.parameterToString(apiKey)); - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * uploads an image - * - * @param petId ID of pet to update - * @param additionalMetadata Additional data to pass to server - * @param file file to upload - * @return void - */ - public void uploadFile (Long petId, String additionalMetadata, File file) throws ApiException { - Object postBody = null; - - // verify the required parameter 'petId' is set - if (petId == null) { - throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"); - } - - - // create path and map variables - String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - if (additionalMetadata != null) - formParams.put("additionalMetadata", additionalMetadata); - if (file != null) - formParams.put("file", file); - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - "multipart/form-data" - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "petstore_auth" }; - - apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java deleted file mode 100644 index 7c0430b5f71..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java +++ /dev/null @@ -1,215 +0,0 @@ -package io.swagger.client.api; - -import io.swagger.client.ApiException; -import io.swagger.client.ApiClient; -import io.swagger.client.Configuration; -import io.swagger.client.Pair; -import io.swagger.client.TypeRef; - -import io.swagger.client.model.*; - -import java.util.*; - -import java.util.Map; -import io.swagger.client.model.Order; - -import java.io.File; -import java.util.Map; -import java.util.HashMap; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class StoreApi { - private ApiClient apiClient; - - public StoreApi() { - this(Configuration.getDefaultApiClient()); - } - - public StoreApi(ApiClient apiClient) { - this.apiClient = apiClient; - } - - public ApiClient getApiClient() { - return apiClient; - } - - public void setApiClient(ApiClient apiClient) { - this.apiClient = apiClient; - } - - - /** - * Returns pet inventories by status - * Returns a map of status codes to quantities - * @return Map - */ - public Map getInventory () throws ApiException { - Object postBody = null; - - - // create path and map variables - String path = "/store/inventory".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { "api_key" }; - - TypeRef returnType = new TypeRef>() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Place an order for a pet - * - * @param body order placed for purchasing the pet - * @return Order - */ - public Order placeOrder (Order body) throws ApiException { - Object postBody = body; - - - // create path and map variables - String path = "/store/order".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - TypeRef returnType = new TypeRef() {}; - return apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * @param orderId ID of pet that needs to be fetched - * @return Order - */ - public Order getOrderById (String orderId) throws ApiException { - Object postBody = null; - - // verify the required parameter 'orderId' is set - if (orderId == null) { - throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"); - } - - - // create path and map variables - String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - TypeRef returnType = new TypeRef() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * @param orderId ID of the order that needs to be deleted - * @return void - */ - public void deleteOrder (String orderId) throws ApiException { - Object postBody = null; - - // verify the required parameter 'orderId' is set - if (orderId == null) { - throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"); - } - - - // create path and map variables - String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java deleted file mode 100644 index a11ac7d16ed..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java +++ /dev/null @@ -1,386 +0,0 @@ -package io.swagger.client.api; - -import io.swagger.client.ApiException; -import io.swagger.client.ApiClient; -import io.swagger.client.Configuration; -import io.swagger.client.Pair; -import io.swagger.client.TypeRef; - -import io.swagger.client.model.*; - -import java.util.*; - -import io.swagger.client.model.User; -import java.util.*; - -import java.io.File; -import java.util.Map; -import java.util.HashMap; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class UserApi { - private ApiClient apiClient; - - public UserApi() { - this(Configuration.getDefaultApiClient()); - } - - public UserApi(ApiClient apiClient) { - this.apiClient = apiClient; - } - - public ApiClient getApiClient() { - return apiClient; - } - - public void setApiClient(ApiClient apiClient) { - this.apiClient = apiClient; - } - - - /** - * Create user - * This can only be done by the logged in user. - * @param body Created user object - * @return void - */ - public void createUser (User body) throws ApiException { - Object postBody = body; - - - // create path and map variables - String path = "/user".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Creates list of users with given input array - * - * @param body List of user object - * @return void - */ - public void createUsersWithArrayInput (List body) throws ApiException { - Object postBody = body; - - - // create path and map variables - String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Creates list of users with given input array - * - * @param body List of user object - * @return void - */ - public void createUsersWithListInput (List body) throws ApiException { - Object postBody = body; - - - // create path and map variables - String path = "/user/createWithList".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Logs user into the system - * - * @param username The user name for login - * @param password The password for login in clear text - * @return String - */ - public String loginUser (String username, String password) throws ApiException { - Object postBody = null; - - - // create path and map variables - String path = "/user/login".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - queryParams.addAll(apiClient.parameterToPairs("", "username", username)); - - queryParams.addAll(apiClient.parameterToPairs("", "password", password)); - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - TypeRef returnType = new TypeRef() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Logs out current logged in user session - * - * @return void - */ - public void logoutUser () throws ApiException { - Object postBody = null; - - - // create path and map variables - String path = "/user/logout".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. - * @return User - */ - public User getUserByName (String username) throws ApiException { - Object postBody = null; - - // verify the required parameter 'username' is set - if (username == null) { - throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"); - } - - - // create path and map variables - String path = "/user/{username}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - TypeRef returnType = new TypeRef() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - - /** - * Updated user - * This can only be done by the logged in user. - * @param username name that need to be deleted - * @param body Updated user object - * @return void - */ - public void updateUser (String username, User body) throws ApiException { - Object postBody = body; - - // verify the required parameter 'username' is set - if (username == null) { - throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); - } - - - // create path and map variables - String path = "/user/{username}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - - /** - * Delete user - * This can only be done by the logged in user. - * @param username The name that needs to be deleted - * @return void - */ - public void deleteUser (String username) throws ApiException { - Object postBody = null; - - // verify the required parameter 'username' is set - if (username == null) { - throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"); - } - - - // create path and map variables - String path = "/user/{username}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null); - - } - -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java deleted file mode 100644 index 41094d08440..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.swagger.client.auth; - -import io.swagger.client.Pair; - -import java.util.Map; -import java.util.List; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class ApiKeyAuth implements Authentication { - private final String location; - private final String paramName; - - private String apiKey; - private String apiKeyPrefix; - - public ApiKeyAuth(String location, String paramName) { - this.location = location; - this.paramName = paramName; - } - - public String getLocation() { - return location; - } - - public String getParamName() { - return paramName; - } - - public String getApiKey() { - return apiKey; - } - - public void setApiKey(String apiKey) { - this.apiKey = apiKey; - } - - public String getApiKeyPrefix() { - return apiKeyPrefix; - } - - public void setApiKeyPrefix(String apiKeyPrefix) { - this.apiKeyPrefix = apiKeyPrefix; - } - - @Override - public void applyToParams(List queryParams, Map headerParams) { - String value; - if (apiKeyPrefix != null) { - value = apiKeyPrefix + " " + apiKey; - } else { - value = apiKey; - } - if (location == "query") { - queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { - headerParams.put(paramName, value); - } - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java deleted file mode 100644 index 5585eecdf1e..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.swagger.client.auth; - -import io.swagger.client.Pair; - -import java.util.Map; -import java.util.List; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public interface Authentication { - /** Apply authentication settings to header and query params. */ - void applyToParams(List queryParams, Map headerParams); -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java deleted file mode 100644 index 740d8993862..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.swagger.client.auth; - -import io.swagger.client.Pair; - -import java.util.Map; -import java.util.List; - -import java.io.UnsupportedEncodingException; -import javax.xml.bind.DatatypeConverter; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class HttpBasicAuth implements Authentication { - private String username; - private String password; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Override - public void applyToParams(List queryParams, Map headerParams) { - String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); - try { - headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8"))); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java deleted file mode 100644 index b592d67848f..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.swagger.client.auth; - -import io.swagger.client.Pair; - -import java.util.Map; -import java.util.List; - -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class OAuth implements Authentication { - @Override - public void applyToParams(List queryParams, Map headerParams) { - // TODO: support oauth - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java deleted file mode 100644 index 0d1945b5804..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.swagger.client.model; - - - - -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.JsonProperty; - - -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class Category { - - private Long id = null; - private String name = null; - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("name") - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append("}\n"); - return sb.toString(); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java deleted file mode 100644 index 2a3892f2918..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java +++ /dev/null @@ -1,114 +0,0 @@ -package io.swagger.client.model; - -import java.util.Date; - - - -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.JsonProperty; - - -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class Order { - - private Long id = null; - private Long petId = null; - private Integer quantity = null; - private Date shipDate = null; - public enum StatusEnum { - placed, approved, delivered, - }; - private StatusEnum status = null; - private Boolean complete = null; - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("petId") - public Long getPetId() { - return petId; - } - public void setPetId(Long petId) { - this.petId = petId; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("quantity") - public Integer getQuantity() { - return quantity; - } - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("shipDate") - public Date getShipDate() { - return shipDate; - } - public void setShipDate(Date shipDate) { - this.shipDate = shipDate; - } - - - /** - * Order Status - **/ - @ApiModelProperty(value = "Order Status") - @JsonProperty("status") - public StatusEnum getStatus() { - return status; - } - public void setStatus(StatusEnum status) { - this.status = status; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("complete") - public Boolean getComplete() { - return complete; - } - public void setComplete(Boolean complete) { - this.complete = complete; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" petId: ").append(petId).append("\n"); - sb.append(" quantity: ").append(quantity).append("\n"); - sb.append(" shipDate: ").append(shipDate).append("\n"); - sb.append(" status: ").append(status).append("\n"); - sb.append(" complete: ").append(complete).append("\n"); - sb.append("}\n"); - return sb.toString(); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java deleted file mode 100644 index 6cb7df1fde5..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java +++ /dev/null @@ -1,116 +0,0 @@ -package io.swagger.client.model; - -import io.swagger.client.model.Category; -import io.swagger.client.model.Tag; -import java.util.*; - - - -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.JsonProperty; - - -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class Pet { - - private Long id = null; - private Category category = null; - private String name = null; - private List photoUrls = new ArrayList(); - private List tags = new ArrayList(); - public enum StatusEnum { - available, pending, sold, - }; - private StatusEnum status = null; - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("category") - public Category getCategory() { - return category; - } - public void setCategory(Category category) { - this.category = category; - } - - - /** - **/ - @ApiModelProperty(required = true, value = "") - @JsonProperty("name") - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - - /** - **/ - @ApiModelProperty(required = true, value = "") - @JsonProperty("photoUrls") - public List getPhotoUrls() { - return photoUrls; - } - public void setPhotoUrls(List photoUrls) { - this.photoUrls = photoUrls; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("tags") - public List getTags() { - return tags; - } - public void setTags(List tags) { - this.tags = tags; - } - - - /** - * pet status in the store - **/ - @ApiModelProperty(value = "pet status in the store") - @JsonProperty("status") - public StatusEnum getStatus() { - return status; - } - public void setStatus(StatusEnum status) { - this.status = status; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Pet {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" category: ").append(category).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append(" photoUrls: ").append(photoUrls).append("\n"); - sb.append(" tags: ").append(tags).append("\n"); - sb.append(" status: ").append(status).append("\n"); - sb.append("}\n"); - return sb.toString(); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java deleted file mode 100644 index fe212ea8ab6..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.swagger.client.model; - - - - -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.JsonProperty; - - -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class Tag { - - private Long id = null; - private String name = null; - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("name") - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append("}\n"); - return sb.toString(); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/User.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/User.java deleted file mode 100644 index 5b9230b8e01..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/User.java +++ /dev/null @@ -1,138 +0,0 @@ -package io.swagger.client.model; - - - - -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.JsonProperty; - - -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00") -public class User { - - private Long id = null; - private String username = null; - private String firstName = null; - private String lastName = null; - private String email = null; - private String password = null; - private String phone = null; - private Integer userStatus = null; - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("username") - public String getUsername() { - return username; - } - public void setUsername(String username) { - this.username = username; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("firstName") - public String getFirstName() { - return firstName; - } - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("lastName") - public String getLastName() { - return lastName; - } - public void setLastName(String lastName) { - this.lastName = lastName; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("email") - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("password") - public String getPassword() { - return password; - } - public void setPassword(String password) { - this.password = password; - } - - - /** - **/ - @ApiModelProperty(value = "") - @JsonProperty("phone") - public String getPhone() { - return phone; - } - public void setPhone(String phone) { - this.phone = phone; - } - - - /** - * User Status - **/ - @ApiModelProperty(value = "User Status") - @JsonProperty("userStatus") - public Integer getUserStatus() { - return userStatus; - } - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" username: ").append(username).append("\n"); - sb.append(" firstName: ").append(firstName).append("\n"); - sb.append(" lastName: ").append(lastName).append("\n"); - sb.append(" email: ").append(email).append("\n"); - sb.append(" password: ").append(password).append("\n"); - sb.append(" phone: ").append(phone).append("\n"); - sb.append(" userStatus: ").append(userStatus).append("\n"); - sb.append("}\n"); - return sb.toString(); - } -} diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java deleted file mode 100644 index f2b6ffffa68..00000000000 --- a/samples/server/petstore/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2015 SmartBear Software - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.swagger.test.integration; - -import io.swagger.client.ApiClient; -import io.swagger.client.Pair; -import io.swagger.client.TypeRef; -import io.swagger.models.Operation; -import io.swagger.models.Response; -import io.swagger.models.Swagger; -import io.swagger.models.parameters.Parameter; -import io.swagger.models.properties.IntegerProperty; -import io.swagger.models.properties.MapProperty; -import io.swagger.models.properties.Property; -import io.swagger.util.Json; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -import static org.testng.Assert.*; - -public class ResourceListingTestIT { - ApiClient client = new ApiClient(); - Swagger swagger = null; - - @BeforeClass - public void setup() throws Exception { - TypeRef ref = new TypeRef(){}; - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - String str = client.invokeAPI("/swagger.json", "GET", queryParams, null, headerParams, formParams, "application/json", "", new String[0], ref); - swagger = Json.mapper().readValue(str, Swagger.class); - assertNotNull(swagger); - } - - @Test - public void verifyFileInput() throws Exception { - Operation op = swagger.getPath("/pet/{petId}/uploadImage").getPost(); - List parameters = op.getParameters(); - Parameter petId = parameters.get(0); - assertEquals(petId.getName(), "petId"); - assertEquals(petId.getIn(), "path"); - - Parameter additionalMetadata = parameters.get(1); - assertEquals(additionalMetadata.getName(), "additionalMetadata"); - assertEquals(additionalMetadata.getIn(), "formData"); - - Parameter file = parameters.get(2); - assertEquals(file.getName(), "file"); - assertEquals(file.getIn(), "formData"); - } - - @Test - public void verifyMapResponse() throws Exception { - Operation op = swagger.getPath("/store/inventory").getGet(); - Response response = op.getResponses().get("200"); - - Property property = response.getSchema(); - assertTrue(property instanceof MapProperty); - - MapProperty mp = (MapProperty) property; - assertTrue(mp.getAdditionalProperties() instanceof IntegerProperty); - } -} \ No newline at end of file From 5a8d2c834f0cdc952020a570b1391cd1ee8bca04 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 5 Nov 2015 16:49:38 +0800 Subject: [PATCH 076/142] add oauth support to csharp --- .../main/resources/csharp/ApiClient.mustache | 3 +-- .../resources/csharp/Configuration.mustache | 6 ++++++ .../csharp/IO/Swagger/Client/ApiClient.cs | 4 +--- .../csharp/IO/Swagger/Client/Configuration.cs | 6 ++++++ .../bin/Debug/SwaggerClientTest.dll | Bin 61952 -> 61952 bytes .../obj/Debug/SwaggerClientTest.dll | Bin 61952 -> 61952 bytes 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache index f6dd2933331..883a635472d 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache @@ -319,8 +319,7 @@ namespace {{packageName}}.Client { {{#authMethods}} case "{{name}}": - {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}} - {{#isOAuth}}//TODO support oauth{{/isOAuth}} + {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}{{#isOAuth}}headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;{{/isOAuth}} break; {{/authMethods}} default: diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache index 67b07069e2f..79b20c6062c 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache @@ -37,6 +37,12 @@ namespace {{packageName}}.Client /// The password. public static String Password { get; set; } + /// + /// Gets or sets the access token for OAuth2 authentication. + /// + /// The access token. + public static String AccessToken { get; set; } + /// /// Gets or sets the API key based on the authentication name. /// diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs index 0416f985360..049c1ef74d8 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs @@ -320,12 +320,10 @@ namespace IO.Swagger.Client case "api_key": headerParams["api_key"] = GetApiKeyWithPrefix("api_key"); - break; case "petstore_auth": - - //TODO support oauth + headerParams["Authorization"] = "Bearer " + Configuration.AccessToken; break; default: diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs index 80df0f4ec72..4168d69a2ea 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs @@ -37,6 +37,12 @@ namespace IO.Swagger.Client /// The password. public static String Password { get; set; } + /// + /// Gets or sets the access token for OAuth2 authentication. + /// + /// The access token. + public static String AccessToken { get; set; } + /// /// Gets or sets the API key based on the authentication name. /// diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll index 3541160c3b9ace66ad275322526c3a6d0c45eb8a..c292bea9bad1f0a11e25411e9c1f7c0c89c2a603 100755 GIT binary patch literal 61952 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Νe4KcHI526g>?-w%^U`N{zMLAjA+}I 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 Me^vqirw9K30Z{EVNdN!< diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll index 3541160c3b9ace66ad275322526c3a6d0c45eb8a..c292bea9bad1f0a11e25411e9c1f7c0c89c2a603 100755 GIT binary patch literal 61952 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Νe4KcHI526g>?-w%^U`N{zMLAjA+}I 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 Me^vqirw9K30Z{EVNdN!< From be0232fa3580a00c8a7d409d28948835c6e99730 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 5 Nov 2015 22:26:49 -0800 Subject: [PATCH 077/142] moved tags to extension to avoid path collisions #1518 --- .../codegen/languages/JaxRSServerCodegen.java | 54 +++++++++++++------ .../src/main/resources/JavaJaxRS/api.mustache | 7 ++- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java index fd83e38896a..375f5d72bff 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java @@ -1,23 +1,12 @@ package io.swagger.codegen.languages; -import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; -import io.swagger.codegen.CodegenModel; -import io.swagger.codegen.CodegenOperation; -import io.swagger.codegen.CodegenProperty; -import io.swagger.codegen.CodegenResponse; -import io.swagger.codegen.CodegenType; -import io.swagger.codegen.SupportingFile; +import io.swagger.codegen.*; import io.swagger.models.Operation; -import io.swagger.models.properties.Property; -import io.swagger.models.properties.StringProperty; +import io.swagger.models.Path; +import io.swagger.models.Swagger; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; +import java.util.*; public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig { protected String title = "Swagger Server"; @@ -118,6 +107,36 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf co.baseName = basePath; } + @Override + public void preprocessSwagger(Swagger swagger) { + if(swagger != null && swagger.getPaths() != null) { + for(String pathname : swagger.getPaths().keySet()) { + Path path = swagger.getPath(pathname); + if(path.getOperations() != null) { + for(Operation operation : path.getOperations()) { + if(operation.getTags() != null) { + List> tags = new ArrayList>(); + for(String tag : operation.getTags()) { + Map value = new HashMap(); + value.put("tag", tag); + value.put("hasMore", "true"); + tags.add(value); + } + if(tags.size() > 0) { + tags.get(tags.size() - 1).remove("hasMore"); + } + if(operation.getTags().size() > 0) { + String tag = operation.getTags().get(0); + operation.setTags(Arrays.asList(tag)); + } + operation.setVendorExtension("x-tags", tags); + } + } + } + } + } + } + @Override public Map postProcessModels(Map objs) { List models = (List) objs.get("models"); @@ -195,9 +214,10 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf result = result.substring(0, ix) + "/impl" + result.substring(ix, result.length() - 5) + "ServiceImpl.java"; String output = System.getProperty("swagger.codegen.jaxrs.impl.source"); - if (output != null) { - result = result.replace(apiFileFolder(), implFileFolder(output)); + if(output == null) { + output = "src" + File.separator + "main" + File.separator + "java"; } + result = result.replace(apiFileFolder(), implFileFolder(output)); } else if (templateName.endsWith("Factory.mustache")) { int ix = result.lastIndexOf('/'); result = result.substring(0, ix) + "/factories" + result.substring(ix, result.length() - 5) + "ServiceFactory.java"; diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache index e919fa7ce71..ea9f2518b01 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache @@ -22,14 +22,13 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; import javax.ws.rs.*; -@Path("{{basePathWithoutHost}}/{{baseName}}") +@Path("/{{baseName}}") {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} -@io.swagger.annotations.Api(value = "/{{baseName}}", description = "the {{baseName}} API") +@io.swagger.annotations.Api(description = "the {{baseName}} API") {{>generatedAnnotation}} {{#operations}} public class {{classname}} { - private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}(); {{#operation}} @@ -43,7 +42,7 @@ public class {{classname}} { {{/hasMore}}{{/scopes}} }{{/isOAuth}}){{#hasMore}}, {{/hasMore}}{{/authMethods}} - }{{/hasAuthMethods}}) + }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} }) @io.swagger.annotations.ApiResponses(value = { {{#responses}} @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}}, {{/hasMore}}{{/responses}} }) From 40992c0a9bfacafb08a06414137f971033beaa14 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 5 Nov 2015 22:31:56 -0800 Subject: [PATCH 078/142] rebuilt --- .../gen/java/io/swagger/api/ApiException.java | 2 +- .../java/io/swagger/api/ApiOriginFilter.java | 2 +- .../io/swagger/api/ApiResponseMessage.java | 2 +- .../io/swagger/api/NotFoundException.java | 2 +- .../src/gen/java/io/swagger/api/PetApi.java | 23 +++++++++---------- .../java/io/swagger/api/PetApiService.java | 2 +- .../src/gen/java/io/swagger/api/StoreApi.java | 15 ++++++------ .../java/io/swagger/api/StoreApiService.java | 2 +- .../src/gen/java/io/swagger/api/UserApi.java | 23 +++++++++---------- .../java/io/swagger/api/UserApiService.java | 2 +- .../gen/java/io/swagger/model/Category.java | 2 +- .../src/gen/java/io/swagger/model/Order.java | 2 +- .../src/gen/java/io/swagger/model/Pet.java | 2 +- .../src/gen/java/io/swagger/model/Tag.java | 2 +- .../src/gen/java/io/swagger/model/User.java | 2 +- .../api/factories/PetApiServiceFactory.java | 2 +- .../api/factories/StoreApiServiceFactory.java | 2 +- .../api/factories/UserApiServiceFactory.java | 2 +- .../swagger/api/impl/PetApiServiceImpl.java | 2 +- .../swagger/api/impl/StoreApiServiceImpl.java | 2 +- .../swagger/api/impl/UserApiServiceImpl.java | 2 +- 21 files changed, 47 insertions(+), 50 deletions(-) diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java index 5fbf037b2ff..765ae959367 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java @@ -1,6 +1,6 @@ package io.swagger.api; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class ApiException extends Exception{ private int code; public ApiException (int code, String msg) { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java index 1c5dade251c..9559bd394aa 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java @@ -5,7 +5,7 @@ import java.io.IOException; import javax.servlet.*; import javax.servlet.http.HttpServletResponse; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class ApiOriginFilter implements javax.servlet.Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java index 91264320d2c..2460847cf6a 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java @@ -3,7 +3,7 @@ package io.swagger.api; import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class ApiResponseMessage { public static final int ERROR = 1; public static final int WARNING = 2; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java index 7b5055536d2..58dc8bcd1ad 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java @@ -1,6 +1,6 @@ package io.swagger.api; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class NotFoundException extends ApiException { private int code; public NotFoundException (int code, String msg) { diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java index d8918a855f9..e8db743f900 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java @@ -22,13 +22,12 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; import javax.ws.rs.*; -@Path("/v2/pet") +@Path("/pet") -@io.swagger.annotations.Api(value = "/pet", description = "the pet API") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@io.swagger.annotations.Api(description = "the pet API") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class PetApi { - private final PetApiService delegate = PetApiServiceFactory.getPetApi(); @PUT @@ -40,7 +39,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), @@ -61,7 +60,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) @@ -78,7 +77,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @@ -97,7 +96,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @@ -113,7 +112,7 @@ public class PetApi { @Produces({ "application/json", "application/xml" }) @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = { @io.swagger.annotations.Authorization(value = "api_key") - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class), @@ -134,7 +133,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) @@ -153,7 +152,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) }) @@ -171,7 +170,7 @@ public class PetApi { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }) + }, tags={ "pet" }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java index edb656bba4b..b7e1ead74cc 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public abstract class PetApiService { public abstract Response updatePet(Pet body) diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java index c75b7c0b005..7c9b500470a 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java @@ -22,13 +22,12 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; import javax.ws.rs.*; -@Path("/v2/store") +@Path("/store") -@io.swagger.annotations.Api(value = "/store", description = "the store API") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@io.swagger.annotations.Api(description = "the store API") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class StoreApi { - private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi(); @GET @@ -37,7 +36,7 @@ public class StoreApi { @Produces({ "application/json", "application/xml" }) @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { @io.swagger.annotations.Authorization(value = "api_key") - }) + }, tags={ "store", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") }) @@ -49,7 +48,7 @@ public class StoreApi { @Path("/order") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class) + @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @@ -63,7 +62,7 @@ public class StoreApi { @Path("/order/{orderId}") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class) + @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @@ -79,7 +78,7 @@ public class StoreApi { @Path("/order/{orderId}") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store" }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java index 20dd92d9cd9..721117cf3b3 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public abstract class StoreApiService { public abstract Response getInventory() diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java index 9a1b8187021..718fbbe9a9a 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java @@ -22,20 +22,19 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; import javax.ws.rs.*; -@Path("/v2/user") +@Path("/user") -@io.swagger.annotations.Api(value = "/user", description = "the user API") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@io.swagger.annotations.Api(description = "the user API") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class UserApi { - private final UserApiService delegate = UserApiServiceFactory.getUserApi(); @POST @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) @@ -47,7 +46,7 @@ public class UserApi { @Path("/createWithArray") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) @@ -59,7 +58,7 @@ public class UserApi { @Path("/createWithList") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) @@ -71,7 +70,7 @@ public class UserApi { @Path("/login") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class) + @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class), @@ -86,7 +85,7 @@ public class UserApi { @Path("/logout") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) @@ -98,7 +97,7 @@ public class UserApi { @Path("/{username}") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class) + @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class), @@ -114,7 +113,7 @@ public class UserApi { @Path("/{username}") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), @@ -129,7 +128,7 @@ public class UserApi { @Path("/{username}") @Produces({ "application/json", "application/xml" }) - @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class) + @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java index efd8a3fe9a4..aebc957e25c 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public abstract class UserApiService { public abstract Response createUser(User body) diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java index e390c5b806c..0acf355555c 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class Category { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java index 59c85b3d7d8..07b422a67f5 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class Order { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java index f0d2790a8ac..af735dcc3b2 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class Pet { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java index 83434c8b812..1102fa408bf 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class Tag { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java index 6aa15fe86b4..d170b2c7df0 100644 --- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:51:39.623-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class User { private Long id = null; diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java index 1110a6abad9..1096ef30806 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java @@ -3,7 +3,7 @@ package io.swagger.api.factories; import io.swagger.api.PetApiService; import io.swagger.api.impl.PetApiServiceImpl; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class PetApiServiceFactory { private final static PetApiService service = new PetApiServiceImpl(); diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java index cd3cd1fa9e2..2fb1234323a 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java @@ -3,7 +3,7 @@ package io.swagger.api.factories; import io.swagger.api.StoreApiService; import io.swagger.api.impl.StoreApiServiceImpl; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class StoreApiServiceFactory { private final static StoreApiService service = new StoreApiServiceImpl(); diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java index 2be6d83827a..4c654779ed9 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java @@ -3,7 +3,7 @@ package io.swagger.api.factories; import io.swagger.api.UserApiService; import io.swagger.api.impl.UserApiServiceImpl; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class UserApiServiceFactory { private final static UserApiService service = new UserApiServiceImpl(); diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java index 3432c17d0b0..5137ffe7912 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class PetApiServiceImpl extends PetApiService { @Override diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java index 96a7d50cd3a..4d9011b4943 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class StoreApiServiceImpl extends StoreApiService { @Override diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java index 1d5eeab2cd6..991849edc17 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java @@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T18:43:02.375-08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00") public class UserApiServiceImpl extends UserApiService { @Override From 8d3e555f8aa2dc05406e0efb981070faa746ed32 Mon Sep 17 00:00:00 2001 From: xhh Date: Fri, 6 Nov 2015 17:15:32 +0800 Subject: [PATCH 079/142] Add README.md to Java clients containing documentation like how to build and use the client --- .../codegen/languages/JavaClientCodegen.java | 1 + .../src/main/resources/Java/README.mustache | 43 +++++++++++++++++++ .../client/petstore/java/default/README.md | 43 +++++++++++++++++++ .../client/petstore/java/jersey2/README.md | 43 +++++++++++++++++++ .../petstore/java/okhttp-gson/README.md | 43 +++++++++++++++++++ .../client/petstore/java/retrofit/README.md | 43 +++++++++++++++++++ 6 files changed, 216 insertions(+) create mode 100644 modules/swagger-codegen/src/main/resources/Java/README.mustache create mode 100644 samples/client/petstore/java/default/README.md create mode 100644 samples/client/petstore/java/jersey2/README.md create mode 100644 samples/client/petstore/java/okhttp-gson/README.md create mode 100644 samples/client/petstore/java/retrofit/README.md diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index a54ec4e038a..decd8daae2a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -202,6 +202,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle")); supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties")); diff --git a/modules/swagger-codegen/src/main/resources/Java/README.mustache b/modules/swagger-codegen/src/main/resources/Java/README.mustache new file mode 100644 index 00000000000..7ce9bac3ca0 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/README.mustache @@ -0,0 +1,43 @@ +# {{artifactId}} + +## Requirements + +Building the API client library requires [Maven](https://maven.apache.org/) to be installed. + +## Installation & Usage + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn deploy +``` + +Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. + +After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*: + +```xml + + {{groupId}} + {{artifactId}} + {{artifactVersion}} + compile + + +``` + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue. + +## Author + +{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}} +{{/hasMore}}{{/apis}}{{/apiInfo}} + diff --git a/samples/client/petstore/java/default/README.md b/samples/client/petstore/java/default/README.md new file mode 100644 index 00000000000..8afc37518fc --- /dev/null +++ b/samples/client/petstore/java/default/README.md @@ -0,0 +1,43 @@ +# swagger-java-client + +## Requirements + +Building the API client library requires [Maven](https://maven.apache.org/) to be installed. + +## Installation & Usage + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn deploy +``` + +Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. + +After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*: + +```xml + + io.swagger + swagger-java-client + 1.0.0 + compile + + +``` + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue. + +## Author + +apiteam@swagger.io + + diff --git a/samples/client/petstore/java/jersey2/README.md b/samples/client/petstore/java/jersey2/README.md new file mode 100644 index 00000000000..473892d2321 --- /dev/null +++ b/samples/client/petstore/java/jersey2/README.md @@ -0,0 +1,43 @@ +# swagger-petstore-jersey2 + +## Requirements + +Building the API client library requires [Maven](https://maven.apache.org/) to be installed. + +## Installation & Usage + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn deploy +``` + +Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. + +After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*: + +```xml + + io.swagger + swagger-petstore-jersey2 + 1.0.0 + compile + + +``` + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue. + +## Author + +apiteam@swagger.io + + diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md new file mode 100644 index 00000000000..be7ff686b7a --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/README.md @@ -0,0 +1,43 @@ +# swagger-petstore-okhttp-gson + +## Requirements + +Building the API client library requires [Maven](https://maven.apache.org/) to be installed. + +## Installation & Usage + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn deploy +``` + +Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. + +After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*: + +```xml + + io.swagger + swagger-petstore-okhttp-gson + 1.0.0 + compile + + +``` + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue. + +## Author + +apiteam@swagger.io + + diff --git a/samples/client/petstore/java/retrofit/README.md b/samples/client/petstore/java/retrofit/README.md new file mode 100644 index 00000000000..b687b09ab26 --- /dev/null +++ b/samples/client/petstore/java/retrofit/README.md @@ -0,0 +1,43 @@ +# swagger-petstore-retrofit + +## Requirements + +Building the API client library requires [Maven](https://maven.apache.org/) to be installed. + +## Installation & Usage + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn deploy +``` + +Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. + +After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*: + +```xml + + io.swagger + swagger-petstore-retrofit + 1.0.0 + compile + + +``` + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue. + +## Author + +apiteam@swagger.io + + From 2f76f28dd45e33945a2b94a1af4b00334c8527f0 Mon Sep 17 00:00:00 2001 From: Nadezhda Makarkina Date: Fri, 6 Nov 2015 15:44:32 +0300 Subject: [PATCH 080/142] apiPackage and modelPackage options haave been moved from DefaultCodegen to classes, that uses it --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 2 -- .../swagger/codegen/languages/AkkaScalaClientCodegen.java | 5 +++++ .../io/swagger/codegen/languages/AndroidClientCodegen.java | 2 ++ .../swagger/codegen/languages/AsyncScalaClientCodegen.java | 4 ++++ .../io/swagger/codegen/languages/JavaClientCodegen.java | 2 ++ .../java/io/swagger/codegen/languages/PhpClientCodegen.java | 2 ++ .../io/swagger/codegen/languages/ScalaClientCodegen.java | 4 ++++ .../io/swagger/codegen/languages/ScalatraServerCodegen.java | 4 ++++ .../java/io/swagger/codegen/dart/DartClientOptionsTest.java | 4 ---- .../io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java | 4 ---- .../swagger/codegen/options/DartClientOptionsProvider.java | 6 +----- .../codegen/options/NodeJSServerOptionsProvider.java | 6 +----- .../io/swagger/codegen/options/Qt5CPPOptionsProvider.java | 6 +----- .../swagger/codegen/options/SilexServerOptionsProvider.java | 6 +----- .../swagger/codegen/options/StaticDocOptionsProvider.java | 6 +----- .../swagger/codegen/options/StaticHtmlOptionsProvider.java | 6 +----- .../io/swagger/codegen/options/SwaggerOptionsProvider.java | 6 +----- .../swagger/codegen/options/SwaggerYamlOptionsProvider.java | 6 +----- .../io/swagger/codegen/options/SwiftOptionsProvider.java | 6 +----- .../swagger/codegen/options/TizenClientOptionsProvider.java | 6 +----- .../options/TypeScriptAngularClientOptionsProvider.java | 6 +----- .../options/TypeScriptNodeClientOptionsProvider.java | 6 +----- .../io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java | 4 ---- .../io/swagger/codegen/silex/SilexServerOptionsTest.java | 4 ---- .../io/swagger/codegen/staticDocs/StaticDocOptionsTest.java | 4 ---- .../swagger/codegen/statichtml/StaticHtmlOptionsTest.java | 4 ---- .../java/io/swagger/codegen/swagger/SwaggerOptionsTest.java | 4 ---- .../swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java | 4 ---- .../java/io/swagger/codegen/swift/SwiftOptionsTest.java | 4 ---- .../io/swagger/codegen/tizen/TizenClientOptionsTest.java | 4 ---- .../TypeScriptAngularClientOptionsTest.java | 4 ---- .../typescriptnode/TypeScriptNodeClientOptionsTest.java | 4 ---- 32 files changed, 35 insertions(+), 110 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 8ab40633c87..2a37556c774 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -443,8 +443,6 @@ public class DefaultCodegen { importMapping.put("LocalDate", "org.joda.time.*"); importMapping.put("LocalTime", "org.joda.time.*"); - cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); - cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue("true")); cliOptions.add(new CliOption(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants.ENSURE_UNIQUE_PARAMS_DESC)); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java index 312f087f83c..29732f1d45a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java @@ -3,6 +3,8 @@ package io.swagger.codegen.languages; import com.google.common.base.CaseFormat; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; + +import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenOperation; @@ -147,6 +149,9 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon ); instantiationTypes.put("array", "ListBuffer"); instantiationTypes.put("map", "Map"); + + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java index abfe970088b..7983d83cea1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java @@ -60,6 +60,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("map", "HashMap"); + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, "groupId for use in the generated build.gradle and pom.xml")); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, "artifactId for use in the generated build.gradle and pom.xml")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java index e033b9f3cf3..5e85712ffcd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java @@ -1,5 +1,6 @@ package io.swagger.codegen.languages; +import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; @@ -105,6 +106,9 @@ public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenCo ); instantiationTypes.put("array", "ListBuffer"); instantiationTypes.put("map", "HashMap"); + + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index a54ec4e038a..028b360987d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -84,6 +84,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("map", "HashMap"); + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC)); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC)); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 4653d6a5299..5b22fbdbadb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -91,6 +91,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("object", "object"); typeMapping.put("DateTime", "\\DateTime"); + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(VARIABLE_NAMING_CONVENTION, "naming convention of variable name, e.g. camelCase.") .defaultValue("snake_case")); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java index 3da348ad530..b2f5b9571dd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java @@ -1,5 +1,6 @@ package io.swagger.codegen.languages; +import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; @@ -106,6 +107,9 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig ); instantiationTypes.put("array", "ListBuffer"); instantiationTypes.put("map", "HashMap"); + + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java index 81106955d84..d50fa867887 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java @@ -1,5 +1,6 @@ package io.swagger.codegen.languages; +import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenOperation; @@ -117,6 +118,9 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf importMapping.put("LocalDateTime", "org.joda.time.LocalDateTime"); importMapping.put("LocalDate", "org.joda.time.LocalDate"); importMapping.put("LocalTime", "org.joda.time.LocalTime"); + + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); + cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java index b4ac84be47f..b002fd99978 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java @@ -25,10 +25,6 @@ public class DartClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(DartClientOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(DartClientOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(DartClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; clientCodegen.setBrowserClient(Boolean.valueOf(DartClientOptionsProvider.BROWSER_CLIENT_VALUE)); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java index 6b24bc6f251..ce905315ae3 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java @@ -25,10 +25,6 @@ public class NodeJSServerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(NodeJSServerOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(NodeJSServerOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(NodeJSServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java index 018913fa3ba..72066f54053 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/DartClientOptionsProvider.java @@ -8,8 +8,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class DartClientOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "packagedart"; - public static final String API_PACKAGE_VALUE = "apiPackageDart"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; public static final String BROWSER_CLIENT_VALUE = "true"; @@ -26,9 +24,7 @@ public class DartClientOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(DartClientCodegen.BROWSER_CLIENT, BROWSER_CLIENT_VALUE) .put(DartClientCodegen.PUB_NAME, PUB_NAME_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java index d4cfce1c9b7..3d49fcb8d01 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class NodeJSServerOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class NodeJSServerOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java index c0583639fbe..05f9f1f068c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/Qt5CPPOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class Qt5CPPOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class Qt5CPPOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java index 553b24414f6..ae6596923d2 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SilexServerOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class SilexServerOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class SilexServerOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java index 5cd8325606c..5e198a0e91a 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class StaticDocOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class StaticDocOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java index 5fe534b52c1..f236ff40dc0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class StaticHtmlOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class StaticHtmlOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java index 4d1997484e2..e97860e83ab 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class SwaggerOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class SwaggerOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java index 1797e2888fb..ff5daa86797 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwaggerYamlOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class SwaggerYamlOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class SwaggerYamlOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java index a31159abf1c..507d3b62829 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java @@ -8,8 +8,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class SwiftOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; public static final String PROJECT_NAME_VALUE = "Swagger"; @@ -36,9 +34,7 @@ public class SwiftOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(SwiftCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) .put(SwiftCodegen.RESPONSE_AS, RESPONSE_AS_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java index 80194388da0..ff8659627f4 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TizenClientOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class TizenClientOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class TizenClientOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java index 2b69f5e12f1..d7d4e5392fc 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class TypeScriptAngularClientOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class TypeScriptAngularClientOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java index 6a7ac239f15..e1c0259222e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java @@ -7,8 +7,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class TypeScriptNodeClientOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; public static final String SORT_PARAMS_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -20,9 +18,7 @@ public class TypeScriptNodeClientOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .build(); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java index c7bb169de21..389721d3841 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java @@ -25,10 +25,6 @@ public class Qt5CPPOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(Qt5CPPOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(Qt5CPPOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(Qt5CPPOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java index 54635f02799..11681230289 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java @@ -25,10 +25,6 @@ public class SilexServerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(SilexServerOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(SilexServerOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SilexServerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java index 5ae4064c4ec..bc2da143efb 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java @@ -25,10 +25,6 @@ public class StaticDocOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(StaticDocOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(StaticDocOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(StaticDocOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java index c09ada506f0..befe62e32c4 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java @@ -25,10 +25,6 @@ public class StaticHtmlOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(StaticHtmlOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(StaticHtmlOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(StaticHtmlOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java index 85368a44486..f2f461f2b70 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java @@ -25,10 +25,6 @@ public class SwaggerOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(SwaggerOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(SwaggerOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SwaggerOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java index 5ea5a7c346b..a1478a8ba05 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java @@ -25,10 +25,6 @@ public class SwaggerYamlOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(SwaggerYamlOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(SwaggerYamlOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SwaggerYamlOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java index f76f1500f8b..7d3504f67de 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java @@ -25,10 +25,6 @@ public class SwiftOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(SwiftOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(SwiftOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SwiftOptionsProvider.SORT_PARAMS_VALUE)); times = 1; clientCodegen.setProjectName(SwiftOptionsProvider.PROJECT_NAME_VALUE); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java index 670c32017de..83ebb8be15e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java @@ -25,10 +25,6 @@ public class TizenClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(TizenClientOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(TizenClientOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TizenClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java index d8e6589f17a..3fdf817dc58 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java @@ -25,10 +25,6 @@ public class TypeScriptAngularClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(TypeScriptAngularClientOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(TypeScriptAngularClientOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TypeScriptAngularClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java index 7d94f21f048..2374011b1b9 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java @@ -25,10 +25,6 @@ public class TypeScriptNodeClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(TypeScriptNodeClientOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(TypeScriptNodeClientOptionsProvider.API_PACKAGE_VALUE); - times = 1; clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TypeScriptNodeClientOptionsProvider.SORT_PARAMS_VALUE)); times = 1; }}; From 0d12f32b05197955aca99483c73e297e5cde8877 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 6 Nov 2015 21:00:04 +0800 Subject: [PATCH 081/142] update cli option for perl --- .../io/swagger/codegen/languages/PerlClientCodegen.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index 0a64854712b..43abf9f1ce5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -70,8 +70,11 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("object", "object"); cliOptions.clear(); - cliOptions.add(new CliOption(MODULE_NAME, "perl module name (convention: CamelCase).").defaultValue("SwaggerClient")); - cliOptions.add(new CliOption(MODULE_VERSION, "perl module version.").defaultValue("1.0.0")); + cliOptions.add(new CliOption(MODULE_NAME, "Perl module name (convention: CamelCase).").defaultValue("SwaggerClient")); + cliOptions.add(new CliOption(MODULE_VERSION, "Perl module version.").defaultValue("1.0.0")); + cliOptions.add(new CliOption(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC)); + cliOptions.add(new CliOption(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants.ENSURE_UNIQUE_PARAMS_DESC)); + } From f7ffc7f118b33bae2765c05af7cbdf40957d90d6 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 6 Nov 2015 21:24:04 +0800 Subject: [PATCH 082/142] update test case for perl --- .../java/io/swagger/codegen/languages/PerlClientCodegen.java | 3 ++- .../io/swagger/codegen/options/PerlClientOptionsProvider.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index 43abf9f1ce5..ddbd6c7e217 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -4,10 +4,11 @@ import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CliOption; import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; -import io.swagger.codegen.CliOption; import java.io.File; import java.util.Arrays; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java index 5bf55f4d160..5ffe04bff2b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/PerlClientOptionsProvider.java @@ -1,5 +1,7 @@ package io.swagger.codegen.options; +import io.swagger.codegen.CodegenConstants; + import io.swagger.codegen.languages.PerlClientCodegen; import com.google.common.collect.ImmutableMap; @@ -20,6 +22,8 @@ public class PerlClientOptionsProvider implements OptionsProvider { ImmutableMap.Builder builder = new ImmutableMap.Builder(); return builder.put(PerlClientCodegen.MODULE_NAME, MODULE_NAME_VALUE) .put(PerlClientCodegen.MODULE_VERSION, MODULE_VERSION_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "true") + .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, "true") .build(); } From 3ff060fa900e6af856cb2fd1296a76bc8aafc14d Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 6 Nov 2015 21:46:47 +0800 Subject: [PATCH 083/142] add reserved word handling for typescript --- .../AbstractTypeScriptClientCodegen.java | 29 ++-- .../typescript-angular/API/Client/Category.ts | 11 -- .../typescript-angular/API/Client/Order.ts | 35 ----- .../typescript-angular/API/Client/Pet.ts | 35 ----- .../typescript-angular/API/Client/PetApi.ts | 101 ------------- .../typescript-angular/API/Client/StoreApi.ts | 83 +++++----- .../typescript-angular/API/Client/Tag.ts | 11 -- .../typescript-angular/API/Client/User.ts | 24 --- .../typescript-angular/API/Client/UserApi.ts | 143 +++++++----------- 9 files changed, 115 insertions(+), 357 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java index 38c0c5307ba..a8d66491851 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -6,6 +6,8 @@ import io.swagger.models.properties.*; import java.util.*; import java.io.File; +import org.apache.commons.lang.StringUtils; + public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public CodegenType getTag() { @@ -15,14 +17,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp public AbstractTypeScriptClientCodegen() { super(); supportsInheritance = true; - reservedWords = new HashSet(Arrays.asList("abstract", - "continue", "for", "new", "switch", "assert", "default", "if", - "package", "synchronized", "do", "goto", "private", - "this", "break", "double", "implements", "protected", "throw", - "byte", "else", "import", "public", "throws", "case", "enum", - "instanceof", "return", "transient", "catch", "extends", "int", - "short", "try", "char", "final", "interface", "static", "void", - "class", "finally", "const", "super", "while")); + reservedWords = new HashSet(Arrays.asList("abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield")); languageSpecificPrimitives = new HashSet(Arrays.asList( "String", @@ -79,7 +74,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp return name; // camelize the variable name - // pet_id => PetId + // pet_id => petId name = camelize(name, true); // for reserved word or word starting with number, append _ @@ -141,4 +136,20 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp type = swaggerType; return type; } + + @Override + public String toOperationId(String operationId) { + // throw exception if method name is empty + if (StringUtils.isEmpty(operationId)) { + throw new RuntimeException("Empty method name (operationId) not allowed"); + } + + // method name cannot use reserved keyword, e.g. return + // append _ at the beginning, e.g. _return + if (reservedWords.contains(operationId)) { + return escapeReservedWord(camelize(sanitizeName(operationId), true)); + } + + return camelize(sanitizeName(operationId), true); + } } diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts index 532d9bb0856..ad34870b31a 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Category.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts @@ -3,22 +3,11 @@ namespace API.Client { 'use strict'; - - - export interface Category { - - id: number; - - name: string; - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts index 11a0fafe293..dfffcd3d828 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Order.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts @@ -3,65 +3,30 @@ namespace API.Client { 'use strict'; - - - export interface Order { - - id: number; - - petId: number; - - quantity: number; - - shipDate: Date; - - /** * Order Status */ - status: Order.StatusEnum; - - complete: boolean; - } - export namespace Order { - - - - - - - - - - export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } - - - - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts index acbb6bcb6c2..fa86c457fcf 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts @@ -3,65 +3,30 @@ namespace API.Client { 'use strict'; - - - export interface Pet { - - id: number; - - category: Category; - - name: string; - - photoUrls: Array; - - tags: Array; - - /** * pet status in the store */ - status: Pet.StatusEnum; - } - export namespace Pet { - - - - - - - - - - - - export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } - - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts index 6e7dd50c6aa..7c89b754914 100644 --- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts @@ -2,11 +2,9 @@ /* tslint:disable:no-unused-variable member-ordering */ - namespace API.Client { 'use strict'; - export class PetApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -29,20 +27,11 @@ namespace API.Client { } - public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'PUT', url: path, @@ -61,20 +50,11 @@ namespace API.Client { return this.$http(httpRequestParams); } - public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'POST', url: path, @@ -93,25 +73,15 @@ namespace API.Client { return this.$http(httpRequestParams); } - public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { const path = this.basePath + '/pet/findByStatus'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - if (status !== undefined) { queryParameters['status'] = status; } - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -129,25 +99,15 @@ namespace API.Client { return this.$http(httpRequestParams); } - public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { const path = this.basePath + '/pet/findByTags'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - if (tags !== undefined) { queryParameters['tags'] = tags; } - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -165,26 +125,16 @@ namespace API.Client { return this.$http(httpRequestParams); } - public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling getPetById'); } - - - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -202,42 +152,24 @@ namespace API.Client { return this.$http(httpRequestParams); } - public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } - - - - - - - - - headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; - - formParams['name'] = name; - formParams['status'] = status; - let httpRequestParams: any = { method: 'POST', url: path, @@ -256,31 +188,18 @@ namespace API.Client { return this.$http(httpRequestParams); } - public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling deletePet'); } - - - - - - headerParams['api_key'] = apiKey; - - - let httpRequestParams: any = { method: 'DELETE', url: path, @@ -298,42 +217,24 @@ namespace API.Client { return this.$http(httpRequestParams); } - public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling uploadFile'); } - - - - - - - - - headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; - - formParams['additionalMetadata'] = additionalMetadata; - formParams['file'] = file; - let httpRequestParams: any = { method: 'POST', url: path, @@ -351,7 +252,5 @@ namespace API.Client { return this.$http(httpRequestParams); } - } } - diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts index 739f6039e6c..801a86a4a04 100644 --- a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts @@ -2,26 +2,37 @@ /* tslint:disable:no-unused-variable member-ordering */ -module API.Client { +namespace API.Client { 'use strict'; export class StoreApi { - private basePath = 'http://petstore.swagger.io/v2'; + protected basePath = 'http://petstore.swagger.io/v2'; + public defaultHeaders : any = {}; static $inject: string[] = ['$http', '$httpParamSerializer']; - constructor(private $http: ng.IHttpService, basePath?: string, private $httpParamSerializer?: (any) => any) { + constructor(protected $http: ng.IHttpService, protected $httpParamSerializer?: (d: any) => any, basePath?: string) { if (basePath) { this.basePath = basePath; } } - public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> { - var path = this.basePath + '/store/inventory'; + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + + public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> { + const path = this.basePath + '/store/inventory'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -32,22 +43,18 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public placeOrder (body?: Order, extraHttpRequestParams?: any ) : ng.IHttpPromise { - var path = this.basePath + '/store/order'; + const path = this.basePath + '/store/order'; - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let httpRequestParams: any = { method: 'POST', url: path, json: true, @@ -59,29 +66,23 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { - var path = this.basePath + '/store/order/{orderId}'; + const path = this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); - path = path.replace('{' + 'orderId' + '}', String(orderId)); - - var queryParameters: any = {}; - var headerParams: any = {}; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling getOrderById'); } - - var httpRequestParams: any = { + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -92,29 +93,23 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/store/order/{orderId}'; + const path = this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); - path = path.replace('{' + 'orderId' + '}', String(orderId)); - - var queryParameters: any = {}; - var headerParams: any = {}; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling deleteOrder'); } - - var httpRequestParams: any = { + let httpRequestParams: any = { method: 'DELETE', url: path, json: true, @@ -125,11 +120,7 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); diff --git a/samples/client/petstore/typescript-angular/API/Client/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts index 525d5ff8ab1..d206559a0ef 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Tag.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts @@ -3,22 +3,11 @@ namespace API.Client { 'use strict'; - - - export interface Tag { - - id: number; - - name: string; - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts index 274b2e866e3..e60f84bb6c6 100644 --- a/samples/client/petstore/typescript-angular/API/Client/User.ts +++ b/samples/client/petstore/typescript-angular/API/Client/User.ts @@ -3,50 +3,26 @@ namespace API.Client { 'use strict'; - - - export interface User { - - id: number; - - username: string; - - firstName: string; - - lastName: string; - - email: string; - - password: string; - - phone: string; - - /** * User Status */ - userStatus: number; - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts index 26ebd693db9..4deb8bc6ebe 100644 --- a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts @@ -2,26 +2,37 @@ /* tslint:disable:no-unused-variable member-ordering */ -module API.Client { +namespace API.Client { 'use strict'; export class UserApi { - private basePath = 'http://petstore.swagger.io/v2'; + protected basePath = 'http://petstore.swagger.io/v2'; + public defaultHeaders : any = {}; static $inject: string[] = ['$http', '$httpParamSerializer']; - constructor(private $http: ng.IHttpService, basePath?: string, private $httpParamSerializer?: (any) => any) { + constructor(protected $http: ng.IHttpService, protected $httpParamSerializer?: (d: any) => any, basePath?: string) { if (basePath) { this.basePath = basePath; } } - public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/user'; + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + + public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { + const path = this.basePath + '/user'; + + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let httpRequestParams: any = { method: 'POST', url: path, json: true, @@ -33,22 +44,18 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public createUsersWithArrayInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/user/createWithArray'; + const path = this.basePath + '/user/createWithArray'; - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let httpRequestParams: any = { method: 'POST', url: path, json: true, @@ -60,22 +67,18 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public createUsersWithListInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/user/createWithList'; + const path = this.basePath + '/user/createWithList'; - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let httpRequestParams: any = { method: 'POST', url: path, json: true, @@ -87,21 +90,17 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { - var path = this.basePath + '/user/login'; + const path = this.basePath + '/user/login'; - var queryParameters: any = {}; - var headerParams: any = {}; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); if (username !== undefined) { queryParameters['username'] = username; } @@ -110,7 +109,7 @@ module API.Client { queryParameters['password'] = password; } - var httpRequestParams: any = { + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -121,22 +120,18 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/user/logout'; + const path = this.basePath + '/user/logout'; - var queryParameters: any = {}; - var headerParams: any = {}; - var httpRequestParams: any = { + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -147,29 +142,23 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { - var path = this.basePath + '/user/{username}'; + const path = this.basePath + '/user/{username}' + .replace('{' + 'username' + '}', String(username)); - path = path.replace('{' + 'username' + '}', String(username)); - - var queryParameters: any = {}; - var headerParams: any = {}; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling getUserByName'); } - - var httpRequestParams: any = { + let httpRequestParams: any = { method: 'GET', url: path, json: true, @@ -180,29 +169,23 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/user/{username}'; + const path = this.basePath + '/user/{username}' + .replace('{' + 'username' + '}', String(username)); - path = path.replace('{' + 'username' + '}', String(username)); - - var queryParameters: any = {}; - var headerParams: any = {}; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling updateUser'); } - - var httpRequestParams: any = { + let httpRequestParams: any = { method: 'PUT', url: path, json: true, @@ -214,29 +197,23 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); } public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { - var path = this.basePath + '/user/{username}'; + const path = this.basePath + '/user/{username}' + .replace('{' + 'username' + '}', String(username)); - path = path.replace('{' + 'username' + '}', String(username)); - - var queryParameters: any = {}; - var headerParams: any = {}; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling deleteUser'); } - - var httpRequestParams: any = { + let httpRequestParams: any = { method: 'DELETE', url: path, json: true, @@ -247,11 +224,7 @@ module API.Client { }; if (extraHttpRequestParams) { - for (var k in extraHttpRequestParams) { - if (extraHttpRequestParams.hasOwnProperty(k)) { - httpRequestParams[k] = extraHttpRequestParams[k]; - } - } + httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams); } return this.$http(httpRequestParams); From 147d8047fe2155a936154b2a7e7d612247b9e190 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 6 Nov 2015 21:49:03 +0800 Subject: [PATCH 084/142] update typescript sample --- .../client/petstore/typescript-node/api.ts | 832 +++++------------- 1 file changed, 228 insertions(+), 604 deletions(-) diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 7ee27e06dd1..47026929d81 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -8,181 +8,69 @@ import http = require('http'); /* tslint:disable:no-unused-variable */ - - - export class User { - - id: number; - - username: string; - - firstName: string; - - lastName: string; - - email: string; - - password: string; - - phone: string; - - /** * User Status */ - userStatus: number; - } - - - - - export class Category { - - id: number; - - name: string; - } - - - - - export class Pet { - - id: number; - - category: Category; - - name: string; - - photoUrls: Array; - - tags: Array; - - /** * pet status in the store */ - status: Pet.StatusEnum; - } - export namespace Pet { - - - - - - - - - - - - export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } - - } - - - - - export class Tag { - - id: number; - - name: string; - } - - - - - export class Order { - - id: number; - - petId: number; - - quantity: number; - - shipDate: Date; - - /** * Order Status */ - status: Order.StatusEnum; - - complete: boolean; - } - export namespace Order { - - - - - - - - - - export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } - - - - } - - - interface Authentication { /** * Apply authentication settings to header and query params. @@ -229,10 +117,6 @@ class VoidAuth implements Authentication { } } - - - - export class UserApi { protected basePath = 'http://petstore.swagger.io/v2'; protected defaultHeaders : any = {}; @@ -241,34 +125,13 @@ export class UserApi { public authentications = { 'default': new VoidAuth(), - - - - - 'petstore_auth': new OAuth(), - - - - 'api_key': new ApiKeyAuth('header', 'api_key'), - - - + 'petstore_auth': new OAuth(), } constructor(url: string, basePath?: string); - - - - - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { - - - - - if (basePath) { this.basePath = basePath; } @@ -279,20 +142,9 @@ export class UserApi { } } - - - - - - - - set apiKey(key: string) { this.authentications.api_key.apiKey = key; } - - - private extendObj(objA: T1, objB: T2) { for(let key in objB){ if(objB.hasOwnProperty(key)){ @@ -302,7 +154,6 @@ export class UserApi { return objA; } - public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user'; let queryParameters: any = {}; @@ -310,11 +161,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -323,12 +171,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -354,7 +199,6 @@ export class UserApi { return deferred.promise; } - public createUsersWithArrayInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/createWithArray'; let queryParameters: any = {}; @@ -362,11 +206,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -375,12 +216,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -406,7 +244,6 @@ export class UserApi { return deferred.promise; } - public createUsersWithListInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/createWithList'; let queryParameters: any = {}; @@ -414,11 +251,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -427,12 +261,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -458,7 +289,6 @@ export class UserApi { return deferred.promise; } - public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string; }> { const path = this.url + this.basePath + '/user/login'; let queryParameters: any = {}; @@ -466,21 +296,16 @@ export class UserApi { let formParams: any = {}; - if (username !== undefined) { queryParameters['username'] = username; } - if (password !== undefined) { queryParameters['password'] = password; } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); let requestOptions: request.Options = { @@ -489,10 +314,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -518,7 +341,6 @@ export class UserApi { return deferred.promise; } - public logoutUser () : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/logout'; let queryParameters: any = {}; @@ -526,11 +348,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -539,10 +358,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -568,7 +385,6 @@ export class UserApi { return deferred.promise; } - public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User; }> { const path = this.url + this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); @@ -582,11 +398,8 @@ export class UserApi { throw new Error('Missing required parameter username when calling getUserByName'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); let requestOptions: request.Options = { @@ -595,10 +408,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -624,7 +435,6 @@ export class UserApi { return deferred.promise; } - public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); @@ -638,11 +448,8 @@ export class UserApi { throw new Error('Missing required parameter username when calling updateUser'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -651,12 +458,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -682,7 +486,6 @@ export class UserApi { return deferred.promise; } - public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); @@ -696,11 +499,8 @@ export class UserApi { throw new Error('Missing required parameter username when calling deleteUser'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -709,10 +509,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -737,303 +535,7 @@ export class UserApi { return deferred.promise; } - } - - - - -export class StoreApi { - protected basePath = 'http://petstore.swagger.io/v2'; - protected defaultHeaders : any = {}; - - - - public authentications = { - 'default': new VoidAuth(), - - - - - 'petstore_auth': new OAuth(), - - - - - 'api_key': new ApiKeyAuth('header', 'api_key'), - - - - } - - constructor(url: string, basePath?: string); - - - - - - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { - if (password) { - - - - - - if (basePath) { - this.basePath = basePath; - } - } else { - if (basePathOrUsername) { - this.basePath = basePathOrUsername - } - } - } - - - - - - - - - - set apiKey(key: string) { - this.authentications.api_key.apiKey = key; - } - - - - private extendObj(objA: T1, objB: T2) { - for(let key in objB){ - if(objB.hasOwnProperty(key)){ - objA[key] = objB[key]; - } - } - return objA; - } - - - public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { - const path = this.url + this.basePath + '/store/inventory'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - } - - - this.authentications.api_key.applyToRequest(requestOptions); - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - - public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { - const path = this.url + this.basePath + '/store/order'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); - - let requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - body: body, - - } - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - - public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { - const path = this.url + this.basePath + '/store/order/{orderId}' - .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling getOrderById'); - } - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - } - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - - public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/store/order/{orderId}' - .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling deleteOrder'); - } - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'DELETE', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - } - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - -} - - - - export class PetApi { protected basePath = 'http://petstore.swagger.io/v2'; protected defaultHeaders : any = {}; @@ -1042,34 +544,13 @@ export class PetApi { public authentications = { 'default': new VoidAuth(), - - - - - 'petstore_auth': new OAuth(), - - - - 'api_key': new ApiKeyAuth('header', 'api_key'), - - - + 'petstore_auth': new OAuth(), } constructor(url: string, basePath?: string); - - - - - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { - - - - - if (basePath) { this.basePath = basePath; } @@ -1080,20 +561,9 @@ export class PetApi { } } - - - - - - - - set apiKey(key: string) { this.authentications.api_key.apiKey = key; } - - - private extendObj(objA: T1, objB: T2) { for(let key in objB){ if(objB.hasOwnProperty(key)){ @@ -1103,7 +573,6 @@ export class PetApi { return objA; } - public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet'; let queryParameters: any = {}; @@ -1111,11 +580,8 @@ export class PetApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1124,15 +590,11 @@ export class PetApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1158,7 +620,6 @@ export class PetApi { return deferred.promise; } - public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet'; let queryParameters: any = {}; @@ -1166,11 +627,8 @@ export class PetApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1179,15 +637,11 @@ export class PetApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1213,7 +667,6 @@ export class PetApi { return deferred.promise; } - public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { const path = this.url + this.basePath + '/pet/findByStatus'; let queryParameters: any = {}; @@ -1221,16 +674,12 @@ export class PetApi { let formParams: any = {}; - if (status !== undefined) { queryParameters['status'] = status; } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); let requestOptions: request.Options = { @@ -1239,13 +688,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1271,7 +717,6 @@ export class PetApi { return deferred.promise; } - public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { const path = this.url + this.basePath + '/pet/findByTags'; let queryParameters: any = {}; @@ -1279,16 +724,12 @@ export class PetApi { let formParams: any = {}; - if (tags !== undefined) { queryParameters['tags'] = tags; } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); let requestOptions: request.Options = { @@ -1297,13 +738,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1329,7 +767,6 @@ export class PetApi { return deferred.promise; } - public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { const path = this.url + this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); @@ -1343,11 +780,8 @@ export class PetApi { throw new Error('Missing required parameter petId when calling getPetById'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); let requestOptions: request.Options = { @@ -1356,13 +790,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.api_key.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1388,7 +819,6 @@ export class PetApi { return deferred.promise; } - public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); @@ -1402,23 +832,16 @@ export class PetApi { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } - - let useFormData = false; - if (name !== undefined) { formParams['name'] = name; } - - if (status !== undefined) { formParams['status'] = status; } - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1427,13 +850,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1459,7 +879,6 @@ export class PetApi { return deferred.promise; } - public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); @@ -1473,14 +892,10 @@ export class PetApi { throw new Error('Missing required parameter petId when calling deletePet'); } - - headerParams['api_key'] = apiKey; - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1489,13 +904,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1521,7 +933,6 @@ export class PetApi { return deferred.promise; } - public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); @@ -1535,25 +946,17 @@ export class PetApi { throw new Error('Missing required parameter petId when calling uploadFile'); } - - let useFormData = false; - if (additionalMetadata !== undefined) { formParams['additionalMetadata'] = additionalMetadata; } - - if (file !== undefined) { formParams['file'] = file; } - useFormData = true; - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1562,12 +965,92 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } +} +export class StoreApi { + protected basePath = 'http://petstore.swagger.io/v2'; + protected defaultHeaders : any = {}; + + + + public authentications = { + 'default': new VoidAuth(), + 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), + } + + constructor(url: string, basePath?: string); + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { + if (password) { + if (basePath) { + this.basePath = basePath; + } + } else { + if (basePathOrUsername) { + this.basePath = basePathOrUsername + } + } + } + + set apiKey(key: string) { + this.authentications.api_key.apiKey = key; + } + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } + + public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { + const path = this.url + this.basePath + '/store/inventory'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + } + + this.authentications.api_key.applyToRequest(requestOptions); this.authentications.default.applyToRequest(requestOptions); @@ -1594,7 +1077,148 @@ export class PetApi { return deferred.promise; } + public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { + const path = this.url + this.basePath + '/store/order'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + body: body, + } + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { + const path = this.url + this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling getOrderById'); + } + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + } + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling deleteOrder'); + } + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'DELETE', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + } + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } } - - - From 33df72ff5b85a60e12b42362b5264e2bbfaad281 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Fri, 6 Nov 2015 09:13:15 -0800 Subject: [PATCH 085/142] made host+scheme configurable --- .../java/io/swagger/generator/Bootstrap.java | 20 +++++++++++++------ .../src/main/webapp/WEB-INF/web.xml | 8 ++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java index a13995505c7..018d3416149 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java @@ -16,15 +16,14 @@ package io.swagger.generator; -import java.io.IOException; -import java.io.InputStream; +import org.apache.commons.io.IOUtils; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; - -import org.apache.commons.io.IOUtils; +import java.io.IOException; +import java.io.InputStream; public class Bootstrap extends HttpServlet { public void init(ServletConfig config) throws ServletException { @@ -50,8 +49,17 @@ public class Bootstrap extends HttpServlet { } } - bc.setSchemes(new String[]{"https"}); - bc.setHost("generator.swagger.io"); + String host = config.getInitParameter("generator.host"); + if(host == null) { + host = "generator.swagger.io"; + } + bc.setHost(host); + + String scheme = config.getInitParameter("generator.protocol"); + if(host == null) { + scheme = "https"; + } + bc.setSchemes(new String[]{scheme}); bc.setLicenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html"); bc.setResourcePackage("io.swagger.generator.resource"); bc.setScan(true); diff --git a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml index b7e33258a5f..e9176739532 100644 --- a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml +++ b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml @@ -26,6 +26,14 @@ jersey.config.server.wadl.disableWadl true + + generator.host + localhost:8001 + + + generator.protocol + http + 1 From 195359008a94d4ef07ae7992fcf948b5c830f4f4 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Fri, 6 Nov 2015 10:11:23 -0800 Subject: [PATCH 086/142] improved definitions, messages, fixed init params --- .../swagger/generator/model/GeneratorInput.java | 1 + .../io/swagger/generator/model/ResponseCode.java | 4 ++++ .../io/swagger/generator/online/Generator.java | 4 ++++ .../src/main/webapp/WEB-INF/web.xml | 16 ++++++++-------- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java index 2a653888625..5175ac3b60a 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java @@ -29,6 +29,7 @@ public class GeneratorInput { this.options = options; } + @ApiModelProperty(example = "http://petstore.swagger.io/v2/swagger.json") public String getSwaggerUrl() { return swaggerUrl; } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java index ad5b9cdec8f..0fcc5312dac 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java @@ -1,5 +1,7 @@ package io.swagger.generator.model; +import io.swagger.annotations.ApiModelProperty; + public class ResponseCode { private String code; private String link; @@ -12,6 +14,7 @@ public class ResponseCode { setLink(link); } + @ApiModelProperty(value = "File download code", example = "d40029be-eda6-4d62-b1ef-d05e2e91a72a") public String getCode() { return code; } @@ -20,6 +23,7 @@ public class ResponseCode { this.code = code; } + @ApiModelProperty(value = "URL for fetching the generated client", example = "http://generator.swagger.io:80/api/gen/download/d40029be-eda6-4d62-b1ef-d05e2e91a72a") public String getLink() { return link; } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index a5c14e43715..bc7f4a8cc68 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -72,6 +72,10 @@ public class Generator { throw new BadRequestException(400, "No options were supplied"); } JsonNode node = opts.getSpec(); + if(node != null && "{}".equals(node.toString())) { + LOGGER.debug("ignoring empty spec"); + node = null; + } Swagger swagger; if (node == null) { if (opts.getSwaggerUrl() != null) { diff --git a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml index e9176739532..74e3828a8f4 100644 --- a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml +++ b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml @@ -26,14 +26,6 @@ jersey.config.server.wadl.disableWadl true - - generator.host - localhost:8001 - - - generator.protocol - http - 1 @@ -50,6 +42,14 @@ Bootstrap io.swagger.generator.Bootstrap 2 + + generator.host + localhost:8001 + + + generator.protocol + http + ApiOriginFilter From c59be88a3ef129acece69999086690166ba5f9ab Mon Sep 17 00:00:00 2001 From: xhh Date: Sat, 7 Nov 2015 15:16:13 +0800 Subject: [PATCH 087/142] Support customizing date format in model (de)serialization in Java client and update the default date format to conform to RFC3339 --- .../main/resources/Java/ApiClient.mustache | 17 ++++-- .../src/main/resources/Java/JSON.mustache | 9 ++++ .../java/io/swagger/client/ApiClient.java | 19 +++++-- .../src/main/java/io/swagger/client/JSON.java | 11 +++- .../java/io/swagger/client/ApiClientTest.java | 22 ++++++++ .../test/java/io/swagger/client/JSONTest.java | 52 +++++++++++++++++++ 6 files changed, 122 insertions(+), 8 deletions(-) create mode 100644 samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache index c81b75d73db..91d1eb93daf 100644 --- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache @@ -55,13 +55,15 @@ public class ApiClient { private DateFormat dateFormat; public ApiClient() { - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + // Use RFC3339 format for date and datetime. + // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); // Use UTC as the default time zone. this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + this.json.setDateFormat((DateFormat) dateFormat.clone()); + // Set default User-Agent. setUserAgent("Java-Swagger"); @@ -74,6 +76,13 @@ public class ApiClient { authentications = Collections.unmodifiableMap(authentications); } + /** + * Gets the JSON instance to do JSON serialization and deserialization. + */ + public JSON getJSON() { + return json; + } + public String getBasePath() { return basePath; } @@ -227,6 +236,8 @@ public class ApiClient { */ public ApiClient setDateFormat(DateFormat dateFormat) { this.dateFormat = dateFormat; + // also set the date format for model (de)serialization with Date properties + this.json.setDateFormat((DateFormat) dateFormat.clone()); return this; } diff --git a/modules/swagger-codegen/src/main/resources/Java/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/JSON.mustache index 43b38f6e21d..54faed8dcb3 100644 --- a/modules/swagger-codegen/src/main/resources/Java/JSON.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/JSON.mustache @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.datatype.joda.*; +import java.text.DateFormat; + import java.io.IOException; {{>generatedAnnotation}} @@ -20,6 +22,13 @@ public class JSON { mapper.registerModule(new JodaModule()); } + /** + * Set the date format for JSON (de)serialization with Date properties. + */ + public void setDateFormat(DateFormat dateFormat) { + mapper.setDateFormat(dateFormat); + } + /** * Serialize the given Java object into JSON string. */ diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java index da7f3ba5a4e..bb8aaa7b990 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java @@ -39,7 +39,7 @@ import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T21:16:46.418+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-07T15:05:10.376+08:00") public class ApiClient { private Map hostMap = new HashMap(); private Map defaultHeaderMap = new HashMap(); @@ -55,13 +55,15 @@ public class ApiClient { private DateFormat dateFormat; public ApiClient() { - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + // Use RFC3339 format for date and datetime. + // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); // Use UTC as the default time zone. this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + this.json.setDateFormat((DateFormat) dateFormat.clone()); + // Set default User-Agent. setUserAgent("Java-Swagger"); @@ -73,6 +75,13 @@ public class ApiClient { authentications = Collections.unmodifiableMap(authentications); } + /** + * Gets the JSON instance to do JSON serialization and deserialization. + */ + public JSON getJSON() { + return json; + } + public String getBasePath() { return basePath; } @@ -226,6 +235,8 @@ public class ApiClient { */ public ApiClient setDateFormat(DateFormat dateFormat) { this.dateFormat = dateFormat; + // also set the date format for model (de)serialization with Date properties + this.json.setDateFormat((DateFormat) dateFormat.clone()); return this; } diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java index 60872714a37..180f9b8cc19 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java @@ -4,9 +4,11 @@ import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.datatype.joda.*; +import java.text.DateFormat; + import java.io.IOException; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-30T16:36:47.681+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-07T15:05:10.376+08:00") public class JSON { private ObjectMapper mapper; @@ -20,6 +22,13 @@ public class JSON { mapper.registerModule(new JodaModule()); } + /** + * Set the date format for JSON (de)serialization with Date properties. + */ + public void setDateFormat(DateFormat dateFormat) { + mapper.setDateFormat(dateFormat); + } + /** * Serialize the given Java object into JSON string. */ diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java index 802c0cae3b9..3d57f3fa84c 100644 --- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java +++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java @@ -2,6 +2,8 @@ package io.swagger.client; import io.swagger.client.auth.*; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.junit.*; @@ -16,6 +18,26 @@ public class ApiClientTest { apiClient = new ApiClient(); } + @Test + public void testParseAndFormatDate() { + // default date format + String dateStr = "2015-11-07T03:49:09.356Z"; + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00"))); + + // custom date format: without milli-seconds, custom time zone + DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + format.setTimeZone(TimeZone.getTimeZone("GMT+10")); + apiClient.setDateFormat(format); + dateStr = "2015-11-07T13:49:09+10:00"; + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00"))); + } + @Test public void testSelectHeaderAccept() { String[] accepts = {"APPLICATION/JSON", "APPLICATION/XML"}; diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java new file mode 100644 index 00000000000..94c7a93c637 --- /dev/null +++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java @@ -0,0 +1,52 @@ +package io.swagger.client; + +import io.swagger.client.model.Order; + +import java.lang.Exception; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.TimeZone; + +import org.junit.*; +import static org.junit.Assert.*; + + +public class JSONTest { + JSON json = null; + Order order = null; + + @Before + public void setup() { + json = new JSON(); + order = new Order(); + } + + @Test + public void testDefaultDate() throws Exception { + final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + final String dateStr = "2015-11-07T14:11:05.267Z"; + order.setShipDate(dateFormat.parse(dateStr)); + + String str = json.serialize(order); + TypeRef typeRef = new TypeRef() { }; + Order o = json.deserialize(str, typeRef); + assertEquals(dateStr, dateFormat.format(o.getShipDate())); + } + + @Test + public void testCustomDate() throws Exception { + final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-2")); + final String dateStr = "2015-11-07T14:11:05-0200"; + order.setShipDate(dateFormat.parse(dateStr)); + + json.setDateFormat(dateFormat); + String str = json.serialize(order); + TypeRef typeRef = new TypeRef() { }; + Order o = json.deserialize(str, typeRef); + assertEquals(dateStr, dateFormat.format(o.getShipDate())); + } +} \ No newline at end of file From 6c19f0c26ced406b7e0cfe2134c2cf79bb50615f Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Sat, 7 Nov 2015 20:37:13 +0100 Subject: [PATCH 088/142] Flatten entire API into a single class Added a Moose role which flattens all the individual endpoint APIs into a single class. --- .gitignore | 4 ++ .../codegen/languages/PerlClientCodegen.java | 1 + .../main/resources/perl/ApiClient.mustache | 5 +- .../main/resources/perl/ApiFactory.mustache | 33 ++++++++---- .../src/main/resources/perl/Role.mustache | 54 +++++++++++++++++++ .../perl/lib/WWW/SwaggerClient/ApiClient.pm | 5 +- .../perl/lib/WWW/SwaggerClient/ApiFactory.pm | 33 ++++++++---- .../perl/lib/WWW/SwaggerClient/Role.pm | 54 +++++++++++++++++++ 8 files changed, 165 insertions(+), 24 deletions(-) create mode 100644 modules/swagger-codegen/src/main/resources/perl/Role.mustache create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm diff --git a/.gitignore b/.gitignore index c904ba4a5fe..37b18e5e3cc 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,7 @@ samples/client/petstore/python/.projectile samples/client/petstore/python/.venv/ */.settings + +*.mustache~ +*.java~ +*.pm~ \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index ba03f3944c5..ee2fa0ddbf3 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -95,6 +95,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Configuration.pm")); supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Object/BaseObject.pm")); supportingFiles.add(new SupportingFile("ApiFactory.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiFactory.pm")); + supportingFiles.add(new SupportingFile("Role.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Role.pm")); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index 06aae8a0e55..02f9ff2221f 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -305,8 +305,9 @@ sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; # we can defer to the application - if ($self->{auth_setup_handler} && ref($self->{auth_setup_handler}) eq 'CODE') { - $self->{auth_setup_handler}->( api_client => $self, + if ($self->{auth_setup_handler_object}) { + $self->{auth_setup_handler_object}->auth_setup_handler( + api_client => $self, header_params => $header_params, query_params => $query_params, auth_settings => $auth_settings, # presumably this won't be defined if we're doing it this way diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache index fc309c91b9c..724ad63b048 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache @@ -49,18 +49,17 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } All parameters are optional, and are passed to and stored on the api_client object. - base_url: supply this to change the default base URL taken from the Swagger definition. + base_url: (optional) + supply this to change the default base URL taken from the Swagger definition. - auth_setup_handler: a coderef you can supply to set up authentication. - - The coderef receives a hashref with keys: api_client, query_params, header_params, auth_settings. + auth_setup_handler_object: (optional) + An object (or class name) that implements an auth_setup_handler() method. - my $api_factory = WWW::{{moduleName}}::ApiFactory->new( auth_setup_handler => \&setup_auth ); ); - - sub setup_auth { - my %p = @_; - $p{header_params}->{'X-SomeApp-FunkyKeyName'} = 'aaaaabbbbbcccccddddd'; - } + If set, the auth_setup_handler() method will be called on the object, and + passed a hashref with keys: api_client, query_params, header_params, auth_settings. + + The method should implement the required auth policy, for example, by setting + secret keys in the header, or username and password in the URL, etc. =cut @@ -95,4 +94,18 @@ sub get_api { sub api_client { $_[0]->{api_client} } +=head1 apis_available() +=cut + +sub apis_available { return map { $_ =~ s/Api$//; $_ } sort keys %_apis } + +=head1 classname_for() +=cut + +sub classname_for { + my ($self, $api_name) = @_; + return $_apis{"${api_name}Api"}; +} + + 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache new file mode 100644 index 00000000000..f349317c9ab --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -0,0 +1,54 @@ +package WWW::{{moduleName}}::Role; +use utf8; + +use Moose::Role; +use namespace::autoclean; +use Class::Inspector; + +use WWW::{{moduleName}}::ApiFactory; + +requires 'auth_setup_handler'; + +has base_url => ( is => 'ro', + required => 0, + isa => 'Str', + ); + +has api_factory => ( is => 'ro', + isa => 'WWW::{{moduleName}}::ApiFactory', + builder => '_build_af', + lazy => 1, + ); + +sub BUILD { + my $self = shift; + + my %outsiders = map {$_ => 1} qw( croak ); + + foreach my $name ($self->api_factory->apis_available) { + + my $att_name = sprintf "%s_api", lc($name); + my $api_class = $self->api_factory->classname_for($name); + my $methods = Class::Inspector->methods($api_class, 'expanded'); + my @local_methods = grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; + + $self->meta->add_attribute( $att_name => ( + is => 'ro', + isa => $api_class, + default => sub {$self->api_factory->get_api($name)}, + lazy => 1, + handles => \@local_methods, + ) ); + } +} + +sub _build_af { + my $self = shift; + my %args = ( auth_setup_handler_object => $self ); + $args{base_url} = $self->base_url if $self->base_url; + return WWW::{{moduleName}}::ApiFactory->new(%args); +} + + + +1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index de4a3e2d2fb..028b983808a 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -305,8 +305,9 @@ sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; # we can defer to the application - if ($self->{auth_setup_handler} && ref($self->{auth_setup_handler}) eq 'CODE') { - $self->{auth_setup_handler}->( api_client => $self, + if ($self->{auth_setup_handler_object}) { + $self->{auth_setup_handler_object}->auth_setup_handler( + api_client => $self, header_params => $header_params, query_params => $query_params, auth_settings => $auth_settings, # presumably this won't be defined if we're doing it this way diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm index 701a22603c5..bf3617d86f1 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm @@ -49,18 +49,17 @@ my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ } All parameters are optional, and are passed to and stored on the api_client object. - base_url: supply this to change the default base URL taken from the Swagger definition. + base_url: (optional) + supply this to change the default base URL taken from the Swagger definition. - auth_setup_handler: a coderef you can supply to set up authentication. - - The coderef receives a hashref with keys: api_client, query_params, header_params, auth_settings. + auth_setup_handler_object: (optional) + An object (or class name) that implements an auth_setup_handler() method. - my $api_factory = WWW::SwaggerClient::ApiFactory->new( auth_setup_handler => \&setup_auth ); ); - - sub setup_auth { - my %p = @_; - $p{header_params}->{'X-SomeApp-FunkyKeyName'} = 'aaaaabbbbbcccccddddd'; - } + If set, the auth_setup_handler() method will be called on the object, and + passed a hashref with keys: api_client, query_params, header_params, auth_settings. + + The method should implement the required auth policy, for example, by setting + secret keys in the header, or username and password in the URL, etc. =cut @@ -95,4 +94,18 @@ sub get_api { sub api_client { $_[0]->{api_client} } +=head1 apis_available() +=cut + +sub apis_available { return map { $_ =~ s/Api$//; $_ } sort keys %_apis } + +=head1 classname_for() +=cut + +sub classname_for { + my ($self, $api_name) = @_; + return $_apis{"${api_name}Api"}; +} + + 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm new file mode 100644 index 00000000000..c47f0908844 --- /dev/null +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -0,0 +1,54 @@ +package WWW::SwaggerClient::Role; +use utf8; + +use Moose::Role; +use namespace::autoclean; +use Class::Inspector; + +use WWW::SwaggerClient::ApiFactory; + +requires 'auth_setup_handler'; + +has base_url => ( is => 'ro', + required => 0, + isa => 'Str', + ); + +has api_factory => ( is => 'ro', + isa => 'WWW::SwaggerClient::ApiFactory', + builder => '_build_af', + lazy => 1, + ); + +sub BUILD { + my $self = shift; + + my %outsiders = map {$_ => 1} qw( croak ); + + foreach my $name ($self->api_factory->apis_available) { + + my $att_name = sprintf "%s_api", lc($name); + my $api_class = $self->api_factory->classname_for($name); + my $methods = Class::Inspector->methods($api_class, 'expanded'); + my @local_methods = grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; + + $self->meta->add_attribute( $att_name => ( + is => 'ro', + isa => $api_class, + default => sub {$self->api_factory->get_api($name)}, + lazy => 1, + handles => \@local_methods, + ) ); + } +} + +sub _build_af { + my $self = shift; + my %args = ( auth_setup_handler_object => $self ); + $args{base_url} = $self->base_url if $self->base_url; + return WWW::SwaggerClient::ApiFactory->new(%args); +} + + + +1; From 730202deb280d79cb8dc11fe1a57dc91f8b2894a Mon Sep 17 00:00:00 2001 From: rostskadat Date: Sun, 8 Nov 2015 17:24:22 +0100 Subject: [PATCH 089/142] Added @RequestBody annotation in order for the generated code to properly create API Model object. @RequestBody Annotation Ref: http://docs.spring.io/spring/docs/current/spring-framework-reference/html/mvc.html#mvc-ann-requestbody --- .../src/main/resources/JavaSpringMVC/bodyParams.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache index 86546afb9ca..f1137ba7073 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestBody {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file From f0f43f5fdf1af2e92ba04aab7cc7ecd83f7c06ff Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Sun, 8 Nov 2015 21:51:26 +0100 Subject: [PATCH 090/142] Fix method names clash in Moose Role When flattening all endpoint API methods into a single class, some method names may clash, e.g. every API has a new() method. So we skip them, they must be accessed via the API method. Warnings are emitted to document skipped methods. --- .gitignore | 4 +- .../src/main/resources/perl/Role.mustache | 38 ++++++++++--- .../perl/lib/WWW/SwaggerClient/Role.pm | 38 ++++++++++--- samples/client/petstore/perl/pom.xml | 13 +++++ .../client/petstore/perl/t/03_api_factory.t | 14 ++++- samples/client/petstore/perl/t/04_role.t | 56 +++++++++++++++++++ 6 files changed, 143 insertions(+), 20 deletions(-) create mode 100644 samples/client/petstore/perl/t/04_role.t diff --git a/.gitignore b/.gitignore index 37b18e5e3cc..d55a8014a34 100644 --- a/.gitignore +++ b/.gitignore @@ -58,4 +58,6 @@ samples/client/petstore/python/.venv/ *.mustache~ *.java~ -*.pm~ \ No newline at end of file +*.pm~ +*.xml~ +*.t~ \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index f349317c9ab..fee13feb040 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -4,7 +4,7 @@ use utf8; use Moose::Role; use namespace::autoclean; use Class::Inspector; - +use Log::Any qw($log); use WWW::{{moduleName}}::ApiFactory; requires 'auth_setup_handler'; @@ -23,21 +23,41 @@ has api_factory => ( is => 'ro', sub BUILD { my $self = shift; - my %outsiders = map {$_ => 1} qw( croak ); + # ignore these symbols imported into API namespaces + my %outsiders = map {$_ => 1} qw( new croak ); - foreach my $name ($self->api_factory->apis_available) { - - my $att_name = sprintf "%s_api", lc($name); - my $api_class = $self->api_factory->classname_for($name); + my %delegates; + + # collect the methods callable on each API + foreach my $api_name ($self->api_factory->apis_available) { + my $api_class = $self->api_factory->classname_for($api_name); my $methods = Class::Inspector->methods($api_class, 'expanded'); my @local_methods = grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; - + push( @{$delegates{$_}}, {api_name => $api_name, api_class => $api_class} ) for @local_methods; + } + + # remove clashes + foreach my $method (keys %delegates) { + if ( @{$delegates{$method}} > 1 ) { + my ($apis) = delete $delegates{$method}; + foreach my $api (@$apis) { + warn sprintf "Cannot delegate %s (use \$self->%s_api->%s instead)\n", $method, lc($api->{api_name}), $method; + } + } + } + + # build the flattened API + foreach my $api_name ($self->api_factory->apis_available) { + my $att_name = sprintf "%s_api", lc($api_name); + my $api_class = $self->api_factory->classname_for($api_name); + my @delegated = grep { $delegates{$_}->[0]->{api_name} eq $api_name } keys %delegates; + $log->debugf("Adding API: '%s' handles %s", $att_name, join ', ', @delegated); $self->meta->add_attribute( $att_name => ( is => 'ro', isa => $api_class, - default => sub {$self->api_factory->get_api($name)}, + default => sub {$self->api_factory->get_api($api_name)}, lazy => 1, - handles => \@local_methods, + handles => \@delegated, ) ); } } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index c47f0908844..4b63a483eae 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -4,7 +4,7 @@ use utf8; use Moose::Role; use namespace::autoclean; use Class::Inspector; - +use Log::Any qw($log); use WWW::SwaggerClient::ApiFactory; requires 'auth_setup_handler'; @@ -23,21 +23,41 @@ has api_factory => ( is => 'ro', sub BUILD { my $self = shift; - my %outsiders = map {$_ => 1} qw( croak ); + # ignore these symbols imported into API namespaces + my %outsiders = map {$_ => 1} qw( new croak ); - foreach my $name ($self->api_factory->apis_available) { - - my $att_name = sprintf "%s_api", lc($name); - my $api_class = $self->api_factory->classname_for($name); + my %delegates; + + # collect the methods callable on each API + foreach my $api_name ($self->api_factory->apis_available) { + my $api_class = $self->api_factory->classname_for($api_name); my $methods = Class::Inspector->methods($api_class, 'expanded'); my @local_methods = grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; - + push( @{$delegates{$_}}, {api_name => $api_name, api_class => $api_class} ) for @local_methods; + } + + # remove clashes + foreach my $method (keys %delegates) { + if ( @{$delegates{$method}} > 1 ) { + my ($apis) = delete $delegates{$method}; + foreach my $api (@$apis) { + warn sprintf "Cannot delegate %s (use \$self->%s_api->%s instead)\n", $method, lc($api->{api_name}), $method; + } + } + } + + # build the flattened API + foreach my $api_name ($self->api_factory->apis_available) { + my $att_name = sprintf "%s_api", lc($api_name); + my $api_class = $self->api_factory->classname_for($api_name); + my @delegated = grep { $delegates{$_}->[0]->{api_name} eq $api_name } keys %delegates; + $log->debugf("Adding API: '%s' handles %s", $att_name, join ', ', @delegated); $self->meta->add_attribute( $att_name => ( is => 'ro', isa => $api_class, - default => sub {$self->api_factory->get_api($name)}, + default => sub {$self->api_factory->get_api($api_name)}, lazy => 1, - handles => \@local_methods, + handles => \@delegated, ) ); } } diff --git a/samples/client/petstore/perl/pom.xml b/samples/client/petstore/perl/pom.xml index 4034cf0a687..4aa0040f82e 100644 --- a/samples/client/petstore/perl/pom.xml +++ b/samples/client/petstore/perl/pom.xml @@ -65,6 +65,19 @@ + + Test::More for Role + integration-test + + exec + + + perl + + t/04_role.t + + + diff --git a/samples/client/petstore/perl/t/03_api_factory.t b/samples/client/petstore/perl/t/03_api_factory.t index f96bffa7a84..2e6ee6317f9 100644 --- a/samples/client/petstore/perl/t/03_api_factory.t +++ b/samples/client/petstore/perl/t/03_api_factory.t @@ -1,4 +1,4 @@ -use Test::More tests => 13; +use Test::More tests => 19; use Test::Exception; use lib 'lib'; @@ -32,3 +32,15 @@ is $pet->category->id, '22', 'got the proper category id'; is $pet->category->name, 'perl', 'got the proper category name'; is $pet->tags->[0]->name, 'just kidding', 'got the proper tag name'; is $pet->tags->[0]->id, '11', 'got the proper tag id'; + + +my $add_pet = $pet_api->add_pet(body => $pet); +my $get_pet = $pet_api->get_pet_by_id(pet_id => $pet_id); + +is $get_pet->id, '10008', 'stored and retrieved: got the proper pet id'; +is $get_pet->name, 'perl test', 'stored and retrieved: got the proper pet name'; +is $get_pet->category->id, '22', 'stored and retrieved: got the proper category id'; +is $get_pet->category->name, 'perl', 'stored and retrieved: got the proper category name'; +is $get_pet->tags->[0]->name, 'just kidding', 'stored and retrieved: got the proper tag name'; +is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id'; + diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t new file mode 100644 index 00000000000..b35149c9d83 --- /dev/null +++ b/samples/client/petstore/perl/t/04_role.t @@ -0,0 +1,56 @@ +use Test::More tests => 15; +use Test::Exception; + +use lib 'lib'; +use strict; +use warnings; + +use MooseX::amine; +use Class::Inspector; +use Data::Dumper; + +use Log::Any::Adapter ('File', '/home/dave/bookeo_api.log'); + + +SKIP: { + eval " + package MyApp; + use Moose; + with 'WWW::SwaggerClient::Role'; + + sub auth_setup_handler {} + "; + + skip 'Moose not installed', 15 if $@; + + +my $api = MyApp->new; + +my $pet_id = 10008; +# note - we don't need to 'use' these modules because they've already been loaded by ApiFactory +my ($category, $tag, $pet); +lives_ok { $category = WWW::SwaggerClient::Object::Category->new('id' => '22', 'name' => 'perl') } 'Category.pm loaded OK'; +lives_ok { $tag = WWW::SwaggerClient::Object::Tag->new('id' => '11', 'name' => 'just kidding') } 'Tag.pm loaded OK'; +lives_ok { $pet = WWW::SwaggerClient::Object::Pet->new('id' => $pet_id, 'name' => 'perl test', + "photoUrls" => ['123', 'oop'], 'tags' => [$tag], 'status' => 'pending', 'category' => $category) } 'Pet.pm loaded OK'; + +is $pet->id, '10008', 'got the proper pet id'; +is $pet->name, 'perl test', 'got the proper pet name'; +is $pet->category->id, '22', 'got the proper category id'; +is $pet->category->name, 'perl', 'got the proper category name'; +is $pet->tags->[0]->name, 'just kidding', 'got the proper tag name'; +is $pet->tags->[0]->id, '11', 'got the proper tag id'; + + +my $add_pet = $api->add_pet(body => $pet); +my $get_pet = $api->get_pet_by_id(pet_id => $pet_id); + +is $get_pet->id, '10008', 'stored and retrieved: got the proper pet id'; +is $get_pet->name, 'perl test', 'stored and retrieved: got the proper pet name'; +is $get_pet->category->id, '22', 'stored and retrieved: got the proper category id'; +is $get_pet->category->name, 'perl', 'stored and retrieved: got the proper category name'; +is $get_pet->tags->[0]->name, 'just kidding', 'stored and retrieved: got the proper tag name'; +is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id'; + +} # / SKIP + From a45af48e35d866ea11fbe87c07189a2ffba9be3f Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 9 Nov 2015 10:23:46 +0800 Subject: [PATCH 091/142] Fix test --- .../java/default/src/test/java/io/swagger/client/JSONTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java index 94c7a93c637..1250a135078 100644 --- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java +++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/JSONTest.java @@ -40,7 +40,7 @@ public class JSONTest { public void testCustomDate() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-2")); - final String dateStr = "2015-11-07T14:11:05-0200"; + final String dateStr = "2015-11-07T14:11:05-02:00"; order.setShipDate(dateFormat.parse(dateStr)); json.setDateFormat(dateFormat); From cbc18c97ba8591996a653e08373b196ef3c13951 Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 9 Nov 2015 11:58:41 +0800 Subject: [PATCH 092/142] Customizing date format in Java jersey2 client --- .../Java/libraries/jersey2/ApiClient.mustache | 17 ++++-- .../java/io/swagger/client/ApiClient.java | 19 +++++-- .../src/main/java/io/swagger/client/JSON.java | 11 +++- .../java/io/swagger/client/ApiClientTest.java | 22 ++++++++ .../test/java/io/swagger/client/JSONTest.java | 52 +++++++++++++++++++ 5 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache index c71b6089358..bd64a6fe659 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache @@ -60,13 +60,15 @@ public class ApiClient { private DateFormat dateFormat; public ApiClient() { - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + // Use RFC3339 format for date and datetime. + // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); // Use UTC as the default time zone. this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + this.json.setDateFormat((DateFormat) dateFormat.clone()); + // Set default User-Agent. setUserAgent("Java-Swagger"); @@ -81,6 +83,13 @@ public class ApiClient { authentications = Collections.unmodifiableMap(authentications); } + /** + * Gets the JSON instance to do JSON serialization and deserialization. + */ + public JSON getJSON() { + return json; + } + public String getBasePath() { return basePath; } @@ -235,6 +244,8 @@ public class ApiClient { */ public ApiClient setDateFormat(DateFormat dateFormat) { this.dateFormat = dateFormat; + // also set the date format for model (de)serialization with Date properties + this.json.setDateFormat((DateFormat) dateFormat.clone()); return this; } diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java index 1fc3258b9dc..9bbc5407af0 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java @@ -43,7 +43,7 @@ import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T22:10:35.641+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-09T11:02:32.553+08:00") public class ApiClient { private Client client; private Map hostMap = new HashMap(); @@ -60,13 +60,15 @@ public class ApiClient { private DateFormat dateFormat; public ApiClient() { - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + // Use RFC3339 format for date and datetime. + // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); // Use UTC as the default time zone. this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + this.json.setDateFormat((DateFormat) dateFormat.clone()); + // Set default User-Agent. setUserAgent("Java-Swagger"); @@ -80,6 +82,13 @@ public class ApiClient { authentications = Collections.unmodifiableMap(authentications); } + /** + * Gets the JSON instance to do JSON serialization and deserialization. + */ + public JSON getJSON() { + return json; + } + public String getBasePath() { return basePath; } @@ -234,6 +243,8 @@ public class ApiClient { */ public ApiClient setDateFormat(DateFormat dateFormat) { this.dateFormat = dateFormat; + // also set the date format for model (de)serialization with Date properties + this.json.setDateFormat((DateFormat) dateFormat.clone()); return this; } diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java index 8ce930ce5c1..35ab10fd9c6 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java @@ -4,9 +4,11 @@ import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.datatype.joda.*; +import java.text.DateFormat; + import java.io.IOException; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:20.020+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-09T11:02:32.553+08:00") public class JSON { private ObjectMapper mapper; @@ -20,6 +22,13 @@ public class JSON { mapper.registerModule(new JodaModule()); } + /** + * Set the date format for JSON (de)serialization with Date properties. + */ + public void setDateFormat(DateFormat dateFormat) { + mapper.setDateFormat(dateFormat); + } + /** * Serialize the given Java object into JSON string. */ diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java index 802c0cae3b9..3d57f3fa84c 100644 --- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java +++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java @@ -2,6 +2,8 @@ package io.swagger.client; import io.swagger.client.auth.*; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.junit.*; @@ -16,6 +18,26 @@ public class ApiClientTest { apiClient = new ApiClient(); } + @Test + public void testParseAndFormatDate() { + // default date format + String dateStr = "2015-11-07T03:49:09.356Z"; + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00"))); + + // custom date format: without milli-seconds, custom time zone + DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + format.setTimeZone(TimeZone.getTimeZone("GMT+10")); + apiClient.setDateFormat(format); + dateStr = "2015-11-07T13:49:09+10:00"; + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00"))); + } + @Test public void testSelectHeaderAccept() { String[] accepts = {"APPLICATION/JSON", "APPLICATION/XML"}; diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java new file mode 100644 index 00000000000..1250a135078 --- /dev/null +++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java @@ -0,0 +1,52 @@ +package io.swagger.client; + +import io.swagger.client.model.Order; + +import java.lang.Exception; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.TimeZone; + +import org.junit.*; +import static org.junit.Assert.*; + + +public class JSONTest { + JSON json = null; + Order order = null; + + @Before + public void setup() { + json = new JSON(); + order = new Order(); + } + + @Test + public void testDefaultDate() throws Exception { + final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + final String dateStr = "2015-11-07T14:11:05.267Z"; + order.setShipDate(dateFormat.parse(dateStr)); + + String str = json.serialize(order); + TypeRef typeRef = new TypeRef() { }; + Order o = json.deserialize(str, typeRef); + assertEquals(dateStr, dateFormat.format(o.getShipDate())); + } + + @Test + public void testCustomDate() throws Exception { + final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-2")); + final String dateStr = "2015-11-07T14:11:05-02:00"; + order.setShipDate(dateFormat.parse(dateStr)); + + json.setDateFormat(dateFormat); + String str = json.serialize(order); + TypeRef typeRef = new TypeRef() { }; + Order o = json.deserialize(str, typeRef); + assertEquals(dateStr, dateFormat.format(o.getShipDate())); + } +} \ No newline at end of file From 8cab7e785d99f37861e224c57618dcc4fd7461e1 Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 9 Nov 2015 13:49:50 +0800 Subject: [PATCH 093/142] Customizing date format in Java okhttp-gson client --- .../libraries/okhttp-gson/ApiClient.mustache | 84 +++++++++++-------- .../java/io/swagger/client/ApiClient.java | 84 +++++++++++-------- .../java/io/swagger/client/ApiClientTest.java | 61 ++++++++++++++ .../test/java/io/swagger/client/JSONTest.java | 55 ++++++++++++ 4 files changed, 210 insertions(+), 74 deletions(-) create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache index 2ee5ab3e887..a19a16743f0 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache @@ -75,13 +75,11 @@ public class ApiClient { private int statusCode; private Map> responseHeaders; - private String dateFormat; - private DateFormat dateFormatter; + private DateFormat dateFormat; + private DateFormat datetimeFormat; + private boolean lenientDatetimeFormat; private int dateLength; - private String datetimeFormat; - private DateFormat datetimeFormatter; - private InputStream sslCaCert; private boolean verifyingSsl; @@ -95,10 +93,19 @@ public class ApiClient { json = new JSON(this); - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - setDateFormat("yyyy-MM-dd"); - setDatetimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + /* + * Use RFC3339 format for date and datetime. + * See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + */ + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + // Always use UTC as the default time zone when dealing with date (without time). + this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + // Use the system's default time zone when dealing with datetime (mainly formatting). + this.datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + + // Be lenient on datetime formats when parsing datetime from string. + // See parseDatetime. + this.lenientDatetimeFormat = true; // Set default User-Agent. setUserAgent("Java-Swagger"); @@ -186,32 +193,35 @@ public class ApiClient { return this; } - public String getDateFormat() { + public DateFormat getDateFormat() { return dateFormat; } - public ApiClient setDateFormat(String dateFormat) { + public ApiClient setDateFormat(DateFormat dateFormat) { this.dateFormat = dateFormat; - - this.dateFormatter = new SimpleDateFormat(dateFormat); - // Use UTC as the default time zone. - this.dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); - - this.dateLength = this.dateFormatter.format(new Date()).length(); - + this.dateLength = this.dateFormat.format(new Date()).length(); return this; } - public String getDatetimeFormat() { + public DateFormat getDatetimeFormat() { return datetimeFormat; } - public ApiClient setDatetimeFormat(String datetimeFormat) { + public ApiClient setDatetimeFormat(DateFormat datetimeFormat) { this.datetimeFormat = datetimeFormat; + return this; + } - this.datetimeFormatter = new SimpleDateFormat(datetimeFormat); - // Note: The datetime formatter uses the system's default time zone. + /** + * Whether to allow various ISO 8601 datetime formats when parsing a datetime string. + * @see #parseDatetime(String) + */ + public boolean isLenientDatetimeFormat() { + return lenientDatetimeFormat; + } + public ApiClient setLenientDatetimeFormat(boolean lenientDatetimeFormat) { + this.lenientDatetimeFormat = lenientDatetimeFormat; return this; } @@ -225,15 +235,15 @@ public class ApiClient { if (str == null) return null; try { - return dateFormatter.parse(str); + return dateFormat.parse(str); } catch (ParseException e) { throw new RuntimeException(e); } } /** - * Parse the given date-time string into Date object. - * The default datetimeFormat supports these ISO 8601 datetime formats: + * Parse the given datetime string into Date object. + * When lenientDatetimeFormat is enabled, the following ISO 8601 datetime formats are supported: * 2015-08-16T08:20:05Z * 2015-8-16T8:20:05Z * 2015-08-16T08:20:05+00:00 @@ -253,25 +263,25 @@ public class ApiClient { if (str == null) return null; - if ("yyyy-MM-dd'T'HH:mm:ss.SSSZ".equals(datetimeFormat)) { + if (lenientDatetimeFormat) { /* * When the default datetime format is used, process the given string * to support various formats defined by ISO 8601. */ // normalize time zone - // trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000 - str = str.replaceAll("[zZ]\\z", "+0000"); - // remove colon: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000 - str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2"); - // expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000 - str = str.replaceAll("([+-]\\d{2})\\z", "$100"); + // trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+00:00 + str = str.replaceAll("[zZ]\\z", "+00:00"); + // add colon: 2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05+00:00 + str = str.replaceAll("([+-]\\d{2})(\\d{2})\\z", "$1:$2"); + // expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+00:00 + str = str.replaceAll("([+-]\\d{2})\\z", "$1:00"); // add milliseconds when missing - // 2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000 - str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2"); + // 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05.000+00:00 + str = str.replaceAll("(:\\d{1,2})([+-]\\d{2}:\\d{2})\\z", "$1.000$2"); } try { - return datetimeFormatter.parse(str); + return datetimeFormat.parse(str); } catch (ParseException e) { throw new RuntimeException(e); } @@ -290,14 +300,14 @@ public class ApiClient { * Format the given Date object into string. */ public String formatDate(Date date) { - return dateFormatter.format(date); + return dateFormat.format(date); } /** * Format the given Date object into string. */ public String formatDatetime(Date date) { - return datetimeFormatter.format(date); + return datetimeFormat.format(date); } /** diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java index 88b8f5602d1..eac3d025df1 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java @@ -75,13 +75,11 @@ public class ApiClient { private int statusCode; private Map> responseHeaders; - private String dateFormat; - private DateFormat dateFormatter; + private DateFormat dateFormat; + private DateFormat datetimeFormat; + private boolean lenientDatetimeFormat; private int dateLength; - private String datetimeFormat; - private DateFormat datetimeFormatter; - private InputStream sslCaCert; private boolean verifyingSsl; @@ -95,10 +93,19 @@ public class ApiClient { json = new JSON(this); - // Use ISO 8601 format for date and datetime. - // See https://en.wikipedia.org/wiki/ISO_8601 - setDateFormat("yyyy-MM-dd"); - setDatetimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + /* + * Use RFC3339 format for date and datetime. + * See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + */ + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + // Always use UTC as the default time zone when dealing with date (without time). + this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + // Use the system's default time zone when dealing with datetime (mainly formatting). + this.datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + + // Be lenient on datetime formats when parsing datetime from string. + // See parseDatetime. + this.lenientDatetimeFormat = true; // Set default User-Agent. setUserAgent("Java-Swagger"); @@ -185,32 +192,35 @@ public class ApiClient { return this; } - public String getDateFormat() { + public DateFormat getDateFormat() { return dateFormat; } - public ApiClient setDateFormat(String dateFormat) { + public ApiClient setDateFormat(DateFormat dateFormat) { this.dateFormat = dateFormat; - - this.dateFormatter = new SimpleDateFormat(dateFormat); - // Use UTC as the default time zone. - this.dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); - - this.dateLength = this.dateFormatter.format(new Date()).length(); - + this.dateLength = this.dateFormat.format(new Date()).length(); return this; } - public String getDatetimeFormat() { + public DateFormat getDatetimeFormat() { return datetimeFormat; } - public ApiClient setDatetimeFormat(String datetimeFormat) { + public ApiClient setDatetimeFormat(DateFormat datetimeFormat) { this.datetimeFormat = datetimeFormat; + return this; + } - this.datetimeFormatter = new SimpleDateFormat(datetimeFormat); - // Note: The datetime formatter uses the system's default time zone. + /** + * Whether to allow various ISO 8601 datetime formats when parsing a datetime string. + * @see #parseDatetime(String) + */ + public boolean isLenientDatetimeFormat() { + return lenientDatetimeFormat; + } + public ApiClient setLenientDatetimeFormat(boolean lenientDatetimeFormat) { + this.lenientDatetimeFormat = lenientDatetimeFormat; return this; } @@ -224,15 +234,15 @@ public class ApiClient { if (str == null) return null; try { - return dateFormatter.parse(str); + return dateFormat.parse(str); } catch (ParseException e) { throw new RuntimeException(e); } } /** - * Parse the given date-time string into Date object. - * The default datetimeFormat supports these ISO 8601 datetime formats: + * Parse the given datetime string into Date object. + * When lenientDatetimeFormat is enabled, the following ISO 8601 datetime formats are supported: * 2015-08-16T08:20:05Z * 2015-8-16T8:20:05Z * 2015-08-16T08:20:05+00:00 @@ -252,25 +262,25 @@ public class ApiClient { if (str == null) return null; - if ("yyyy-MM-dd'T'HH:mm:ss.SSSZ".equals(datetimeFormat)) { + if (lenientDatetimeFormat) { /* * When the default datetime format is used, process the given string * to support various formats defined by ISO 8601. */ // normalize time zone - // trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000 - str = str.replaceAll("[zZ]\\z", "+0000"); - // remove colon: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000 - str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2"); - // expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000 - str = str.replaceAll("([+-]\\d{2})\\z", "$100"); + // trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+00:00 + str = str.replaceAll("[zZ]\\z", "+00:00"); + // add colon: 2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05+00:00 + str = str.replaceAll("([+-]\\d{2})(\\d{2})\\z", "$1:$2"); + // expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+00:00 + str = str.replaceAll("([+-]\\d{2})\\z", "$1:00"); // add milliseconds when missing - // 2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000 - str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2"); + // 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05.000+00:00 + str = str.replaceAll("(:\\d{1,2})([+-]\\d{2}:\\d{2})\\z", "$1.000$2"); } try { - return datetimeFormatter.parse(str); + return datetimeFormat.parse(str); } catch (ParseException e) { throw new RuntimeException(e); } @@ -289,14 +299,14 @@ public class ApiClient { * Format the given Date object into string. */ public String formatDate(Date date) { - return dateFormatter.format(date); + return dateFormat.format(date); } /** * Format the given Date object into string. */ public String formatDatetime(Date date) { - return datetimeFormatter.format(date); + return datetimeFormat.format(date); } /** diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java index 802c0cae3b9..aaf4f33c49e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java @@ -2,7 +2,10 @@ package io.swagger.client; import io.swagger.client.auth.*; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; +import java.util.TimeZone; import org.junit.*; import static org.junit.Assert.*; @@ -16,6 +19,64 @@ public class ApiClientTest { apiClient = new ApiClient(); } + @Test + public void testParseAndFormatDatetime() { + // default datetime format with UTC time zone + apiClient.getDatetimeFormat().setTimeZone(TimeZone.getTimeZone("UTC")); + String dateStr = "2015-11-07T03:49:09.356Z"; + assertTrue(apiClient.isLenientDatetimeFormat()); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T03:49:09.356+00:00"))); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T05:49:09.356+02:00"))); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T02:49:09.356-01:00"))); + // support various cases + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T03:49:09.356Z"))); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T03:49:09.356+00"))); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T02:49:09.356-0100"))); + dateStr = "2015-11-07T03:49:09.000Z"; + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T05:49:09+02"))); + + // custom datetime format: without milli-seconds, custom time zone + DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + format.setTimeZone(TimeZone.getTimeZone("GMT+10")); + apiClient.setDatetimeFormat(format); + // disable support of various datetime format + apiClient.setLenientDatetimeFormat(false); + dateStr = "2015-11-07T13:49:09+10:00"; + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T03:49:09+00:00"))); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T03:49:09Z"))); + assertEquals(dateStr, apiClient.formatDatetime(apiClient.parseDatetime("2015-11-07T00:49:09-03:00"))); + + try { + // invalid time zone format + apiClient.parseDatetime("2015-11-07T03:49:09+00"); + fail("parseDatetime should fail"); + } catch (RuntimeException e) { + // OK + } + try { + // unexpected miliseconds + apiClient.parseDatetime("2015-11-07T03:49:09.000Z"); + fail("parseDatetime should fail"); + } catch (RuntimeException e) { + // OK + } + } + + @Test + public void testParseAndFormatDate() { + // default date format + String dateStr = "2015-11-07"; + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDatetime("2015-11-07T03:49:09.356+00:00"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07"))); + + // custom date format: without day + DateFormat format = new SimpleDateFormat("yyyy-MM"); + apiClient.setDateFormat(format); + dateStr = "2015-11"; + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDatetime("2015-11-07T03:49:09Z"))); + assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11"))); + } + @Test public void testSelectHeaderAccept() { String[] accepts = {"APPLICATION/JSON", "APPLICATION/XML"}; diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java new file mode 100644 index 00000000000..fdc2e4c7d4a --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java @@ -0,0 +1,55 @@ +package io.swagger.client; + +import com.google.gson.reflect.TypeToken; + +import io.swagger.client.model.Order; + +import java.lang.Exception; +import java.lang.reflect.Type; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; + +import org.junit.*; +import static org.junit.Assert.*; + +public class JSONTest { + ApiClient apiClient = null; + JSON json = null; + Order order = null; + + @Before + public void setup() { + apiClient = new ApiClient(); + json = new JSON(apiClient); + order = new Order(); + } + + @Test + public void testDefaultDate() throws Exception { + final DateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + datetimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + final String dateStr = "2015-11-07T14:11:05.267Z"; + order.setShipDate(datetimeFormat.parse(dateStr)); + + String str = json.serialize(order); + Type type = new TypeToken() { }.getType(); + Order o = json.deserialize(str, type); + assertEquals(dateStr, datetimeFormat.format(o.getShipDate())); + } + + @Test + public void testCustomDate() throws Exception { + final DateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + datetimeFormat.setTimeZone(TimeZone.getTimeZone("GMT-2")); + final String dateStr = "2015-11-07T14:11:05-02:00"; + order.setShipDate(datetimeFormat.parse(dateStr)); + + apiClient.setDatetimeFormat(datetimeFormat); + apiClient.setLenientDatetimeFormat(false); + String str = json.serialize(order); + Type type = new TypeToken() { }.getType(); + Order o = json.deserialize(str, type); + assertEquals(dateStr, datetimeFormat.format(o.getShipDate())); + } +} \ No newline at end of file From e3c44b5af34bb057d927a63bd71c955e437ea5e0 Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 9 Nov 2015 16:47:33 +0800 Subject: [PATCH 094/142] Improvement on comment --- .../resources/Java/libraries/okhttp-gson/ApiClient.mustache | 2 +- .../okhttp-gson/src/main/java/io/swagger/client/ApiClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache index a19a16743f0..f238c37fb47 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache @@ -265,7 +265,7 @@ public class ApiClient { if (lenientDatetimeFormat) { /* - * When the default datetime format is used, process the given string + * When lenientDatetimeFormat is enabled, process the given string * to support various formats defined by ISO 8601. */ // normalize time zone diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java index eac3d025df1..51c3d5464f2 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java @@ -264,7 +264,7 @@ public class ApiClient { if (lenientDatetimeFormat) { /* - * When the default datetime format is used, process the given string + * When lenientDatetimeFormat is enabled, process the given string * to support various formats defined by ISO 8601. */ // normalize time zone From 99c503319bc1a985d863f706ccb545f66eb53137 Mon Sep 17 00:00:00 2001 From: cbornet Date: Mon, 9 Nov 2015 11:38:26 +0100 Subject: [PATCH 095/142] use platform independant file separator --- .../io/swagger/codegen/languages/JavaClientCodegen.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 46e213eccd3..00b4130e6d2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -42,8 +42,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String groupId = "io.swagger"; protected String artifactId = "swagger-java-client"; protected String artifactVersion = "1.0.0"; - protected String projectFolder = "src/main"; - protected String sourceFolder = projectFolder + "/java"; + protected String projectFolder = "src" + File.separator + "main"; + protected String sourceFolder = projectFolder + File.separator + "java"; protected String localVariablePrefix = ""; protected boolean fullJavaUtil = false; protected String javaUtilPrefix = ""; @@ -51,7 +51,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { public JavaClientCodegen() { super(); - outputFolder = "generated-code/java"; + outputFolder = "generated-code" + File.separator + "java"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); templateDir = "Java"; From dad28dcba01738b426ead012c140d1682df7afea Mon Sep 17 00:00:00 2001 From: cbornet Date: Mon, 9 Nov 2015 16:10:55 +0100 Subject: [PATCH 096/142] don't retry if the access token doesn't change This is to avoid an infinite loop if the server always gives an invalid token --- .../libraries/retrofit/auth/OAuth.mustache | 75 +++++++++++-------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache index 68ee918601e..647ff141329 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache @@ -1,6 +1,7 @@ package {{invokerPackage}}.auth; import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; +import static java.net.HttpURLConnection.HTTP_FORBIDDEN; import java.io.IOException; import java.util.Map; @@ -85,42 +86,55 @@ public class OAuth implements Interceptor { updateAccessToken(null); } - // Build the request - Builder rb = request.newBuilder(); - - String requestAccessToken = new String(getAccessToken()); - try { - oAuthRequest = new OAuthBearerClientRequest(request.urlString()) - .setAccessToken(requestAccessToken) - .buildHeaderMessage(); - } catch (OAuthSystemException e) { - throw new IOException(e); + if (getAccessToken() != null) { + // Build the request + Builder rb = request.newBuilder(); + + String requestAccessToken = new String(getAccessToken()); + try { + oAuthRequest = new OAuthBearerClientRequest(request.urlString()) + .setAccessToken(requestAccessToken) + .buildHeaderMessage(); + } catch (OAuthSystemException e) { + throw new IOException(e); + } + + for ( Map.Entry header : oAuthRequest.getHeaders().entrySet() ) { + rb.addHeader(header.getKey(), header.getValue()); + } + rb.url( oAuthRequest.getLocationUri()); + + //Execute the request + Response response = chain.proceed(rb.build()); + + // 401 most likely indicates that access token has expired. + // Time to refresh and resend the request + if ( response != null && (response.code() == HTTP_UNAUTHORIZED | response.code() == HTTP_FORBIDDEN) ) { + if (updateAccessToken(requestAccessToken)) { + return intercept( chain ); + } + } + return response; + } else { + return chain.proceed(chain.request()); } - - for ( Map.Entry header : oAuthRequest.getHeaders().entrySet() ) { - rb.addHeader(header.getKey(), header.getValue()); - } - rb.url( oAuthRequest.getLocationUri()); - - //Execute the request - Response response = chain.proceed(rb.build()); - - // 401 most likely indicates that access token has expired. - // Time to refresh and resend the request - if ( response.code() == HTTP_UNAUTHORIZED ) { - updateAccessToken(requestAccessToken); - return intercept( chain ); - } - return response; } - public synchronized void updateAccessToken(String requestAccessToken) throws IOException { + /* + * Returns true if the access token has been updated + */ + public synchronized boolean updateAccessToken(String requestAccessToken) throws IOException { if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) { try { OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); - setAccessToken(accessTokenResponse.getAccessToken()); - if (accessTokenListener != null) { - accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken()); + if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) { + setAccessToken(accessTokenResponse.getAccessToken()); + if (accessTokenListener != null) { + accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken()); + } + return getAccessToken().equals(requestAccessToken); + } else { + return false; } } catch (OAuthSystemException e) { throw new IOException(e); @@ -128,6 +142,7 @@ public class OAuth implements Interceptor { throw new IOException(e); } } + return true; } public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { From 49034946a065c7f4094349776ea042bf5c5b4f9d Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Mon, 9 Nov 2015 17:04:19 +0100 Subject: [PATCH 097/142] Make class and method documentation available Documentation from the swagger spec is available via methods class_documentation() and method_documentation() on object and API classes. --- .../main/resources/perl/BaseObject.mustache | 6 +- .../src/main/resources/perl/Role.mustache | 4 +- .../src/main/resources/perl/api.mustache | 25 ++- .../src/main/resources/perl/object.mustache | 2 + .../WWW/SwaggerClient/Object/BaseObject.pm | 6 +- .../lib/WWW/SwaggerClient/Object/Category.pm | 2 + .../lib/WWW/SwaggerClient/Object/Order.pm | 2 + .../perl/lib/WWW/SwaggerClient/Object/Pet.pm | 2 + .../perl/lib/WWW/SwaggerClient/Object/Tag.pm | 2 + .../perl/lib/WWW/SwaggerClient/Object/User.pm | 2 + .../perl/lib/WWW/SwaggerClient/PetApi.pm | 143 ++++++++++++++++++ .../perl/lib/WWW/SwaggerClient/Role.pm | 4 +- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 57 +++++++ .../perl/lib/WWW/SwaggerClient/UserApi.pm | 123 +++++++++++++++ samples/client/petstore/perl/t/04_role.t | 42 ++++- 15 files changed, 406 insertions(+), 16 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index f2a58efdb68..2bc48770632 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -20,8 +20,10 @@ use base ("Class::Accessor", "Class::Data::Inheritable"); #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->mk_classdata('attribute_map'); -__PACKAGE__->mk_classdata('swagger_types'); +__PACKAGE__->mk_classdata('attribute_map' => {}); +__PACKAGE__->mk_classdata('swagger_types' => {}); +__PACKAGE__->mk_classdata('method_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('class_documentation' => {}); # new object sub new { diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index fee13feb040..be41efe44c5 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -24,7 +24,7 @@ sub BUILD { my $self = shift; # ignore these symbols imported into API namespaces - my %outsiders = map {$_ => 1} qw( new croak ); + my %outsiders = map {$_ => 1} qw( croak ); my %delegates; @@ -32,7 +32,7 @@ sub BUILD { foreach my $api_name ($self->api_factory->apis_available) { my $api_class = $self->api_factory->classname_for($api_name); my $methods = Class::Inspector->methods($api_class, 'expanded'); - my @local_methods = grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; + my @local_methods = grep {! /^_/} grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; push( @{$delegates{$_}}, {api_name => $api_name, api_class => $api_class} ) for @local_methods; } diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index d305d69b7fa..7cdbc30aaf4 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -30,6 +30,12 @@ use Log::Any qw($log); use WWW::{{moduleName}}::ApiClient; use WWW::{{moduleName}}::Configuration; +use base "Class::Data::Inheritable"; + +__PACKAGE__->mk_classdata('method_documentation' => {}); +__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO + + sub new { my $class = shift; my $default_api_client = $WWW::{{moduleName}}::Configuration::api_client ? $WWW::{{moduleName}}::Configuration::api_client : WWW::{{moduleName}}::ApiClient->new; @@ -49,13 +55,30 @@ sub new { {{#operations}} {{#operation}} + # # {{{nickname}}} # # {{{summary}}} # {{#allParams}}# @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}} -{{/allParams}}# @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} +{{/allParams}} +{ + my $params = { +{{#allParams}} + '{{paramName}}' => { + data_type => '{{dataType}}', + description => '{{description}}', + required => {{#required}}'1'{{/required}}{{^required}}'0'{{/required}}, + }, +{{/allParams}} + }; + __PACKAGE__->method_documentation->{ {{{nickname}}} } = { summary => '{{{summary}}}', + params => $params, + returns => {{#returnType}}'{{{returnType}}}'{{/returnType}}{{^returnType}}undef{{/returnType}}, + }; +} +# @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} # sub {{nickname}} { my ($self, %args) = @_; diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache index bbddd3c7f32..c397569c396 100644 --- a/modules/swagger-codegen/src/main/resources/perl/object.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache @@ -21,6 +21,8 @@ use base "WWW::{{moduleName}}::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->class_documentation({description => '{{description}}'}); + __PACKAGE__->swagger_types( { {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, {{/hasMore}}{{/vars}} diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm index fee2b06fb0e..d85ecf8a749 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm @@ -20,8 +20,10 @@ use base ("Class::Accessor", "Class::Data::Inheritable"); #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->mk_classdata('attribute_map'); -__PACKAGE__->mk_classdata('swagger_types'); +__PACKAGE__->mk_classdata('attribute_map' => {}); +__PACKAGE__->mk_classdata('swagger_types' => {}); +__PACKAGE__->mk_classdata('method_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('class_documentation' => {}); # new object sub new { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm index 1e062925037..a08ae19ac43 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm @@ -19,6 +19,8 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->class_documentation({description => ''}); + __PACKAGE__->swagger_types( { 'id' => 'int', 'name' => 'string' diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm index 70b3db2cfc0..fa411b8e254 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm @@ -19,6 +19,8 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->class_documentation({description => ''}); + __PACKAGE__->swagger_types( { 'id' => 'int', 'pet_id' => 'int', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm index 3ff3f50b399..58fc85d3f17 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm @@ -19,6 +19,8 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->class_documentation({description => ''}); + __PACKAGE__->swagger_types( { 'id' => 'int', 'category' => 'Category', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm index bf97f210a37..c3e6ca993ba 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm @@ -19,6 +19,8 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->class_documentation({description => ''}); + __PACKAGE__->swagger_types( { 'id' => 'int', 'name' => 'string' diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm index 36fc7baf6ee..1da22e6431b 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm @@ -19,6 +19,8 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # +__PACKAGE__->class_documentation({description => ''}); + __PACKAGE__->swagger_types( { 'id' => 'int', 'username' => 'string', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 26b9f42e620..0404c9c74be 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -30,6 +30,12 @@ use Log::Any qw($log); use WWW::SwaggerClient::ApiClient; use WWW::SwaggerClient::Configuration; +use base "Class::Data::Inheritable"; + +__PACKAGE__->mk_classdata('method_documentation' => {}); +__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO + + sub new { my $class = shift; my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new; @@ -47,12 +53,26 @@ sub new { } + # # update_pet # # Update an existing pet # # @param Pet $body Pet object that needs to be added to the store (optional) +{ + my $params = { + 'body' => { + data_type => 'Pet', + description => 'Pet object that needs to be added to the store', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ update_pet } = { summary => 'Update an existing pet', + params => $params, + returns => undef, + }; +} # @return void # sub update_pet { @@ -97,12 +117,26 @@ sub update_pet { return; } + # # add_pet # # Add a new pet to the store # # @param Pet $body Pet object that needs to be added to the store (optional) +{ + my $params = { + 'body' => { + data_type => 'Pet', + description => 'Pet object that needs to be added to the store', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ add_pet } = { summary => 'Add a new pet to the store', + params => $params, + returns => undef, + }; +} # @return void # sub add_pet { @@ -147,12 +181,26 @@ sub add_pet { return; } + # # find_pets_by_status # # Finds Pets by status # # @param ARRAY[string] $status Status values that need to be considered for filter (optional) +{ + my $params = { + 'status' => { + data_type => 'ARRAY[string]', + description => 'Status values that need to be considered for filter', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ find_pets_by_status } = { summary => 'Finds Pets by status', + params => $params, + returns => 'ARRAY[Pet]', + }; +} # @return ARRAY[Pet] # sub find_pets_by_status { @@ -200,12 +248,26 @@ sub find_pets_by_status { return $_response_object; } + # # find_pets_by_tags # # Finds Pets by tags # # @param ARRAY[string] $tags Tags to filter by (optional) +{ + my $params = { + 'tags' => { + data_type => 'ARRAY[string]', + description => 'Tags to filter by', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ find_pets_by_tags } = { summary => 'Finds Pets by tags', + params => $params, + returns => 'ARRAY[Pet]', + }; +} # @return ARRAY[Pet] # sub find_pets_by_tags { @@ -253,12 +315,26 @@ sub find_pets_by_tags { return $_response_object; } + # # get_pet_by_id # # Find pet by ID # # @param int $pet_id ID of pet that needs to be fetched (required) +{ + my $params = { + 'pet_id' => { + data_type => 'int', + description => 'ID of pet that needs to be fetched', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ get_pet_by_id } = { summary => 'Find pet by ID', + params => $params, + returns => 'Pet', + }; +} # @return Pet # sub get_pet_by_id { @@ -313,6 +389,7 @@ sub get_pet_by_id { return $_response_object; } + # # update_pet_with_form # @@ -321,6 +398,29 @@ sub get_pet_by_id { # @param string $pet_id ID of pet that needs to be updated (required) # @param string $name Updated name of the pet (optional) # @param string $status Updated status of the pet (optional) +{ + my $params = { + 'pet_id' => { + data_type => 'string', + description => 'ID of pet that needs to be updated', + required => '1', + }, + 'name' => { + data_type => 'string', + description => 'Updated name of the pet', + required => '0', + }, + 'status' => { + data_type => 'string', + description => 'Updated status of the pet', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ update_pet_with_form } = { summary => 'Updates a pet in the store with form data', + params => $params, + returns => undef, + }; +} # @return void # sub update_pet_with_form { @@ -382,6 +482,7 @@ sub update_pet_with_form { return; } + # # delete_pet # @@ -389,6 +490,24 @@ sub update_pet_with_form { # # @param int $pet_id Pet id to delete (required) # @param string $api_key (optional) +{ + my $params = { + 'pet_id' => { + data_type => 'int', + description => 'Pet id to delete', + required => '1', + }, + 'api_key' => { + data_type => 'string', + description => '', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ delete_pet } = { summary => 'Deletes a pet', + params => $params, + returns => undef, + }; +} # @return void # sub delete_pet { @@ -443,6 +562,7 @@ sub delete_pet { return; } + # # upload_file # @@ -451,6 +571,29 @@ sub delete_pet { # @param int $pet_id ID of pet to update (required) # @param string $additional_metadata Additional data to pass to server (optional) # @param file $file file to upload (optional) +{ + my $params = { + 'pet_id' => { + data_type => 'int', + description => 'ID of pet to update', + required => '1', + }, + 'additional_metadata' => { + data_type => 'string', + description => 'Additional data to pass to server', + required => '0', + }, + 'file' => { + data_type => 'file', + description => 'file to upload', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ upload_file } = { summary => 'uploads an image', + params => $params, + returns => undef, + }; +} # @return void # sub upload_file { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index 4b63a483eae..c21c428b85f 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -24,7 +24,7 @@ sub BUILD { my $self = shift; # ignore these symbols imported into API namespaces - my %outsiders = map {$_ => 1} qw( new croak ); + my %outsiders = map {$_ => 1} qw( croak ); my %delegates; @@ -32,7 +32,7 @@ sub BUILD { foreach my $api_name ($self->api_factory->apis_available) { my $api_class = $self->api_factory->classname_for($api_name); my $methods = Class::Inspector->methods($api_class, 'expanded'); - my @local_methods = grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; + my @local_methods = grep {! /^_/} grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; push( @{$delegates{$_}}, {api_name => $api_name, api_class => $api_class} ) for @local_methods; } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index a2ac9010e77..d8cd0cbff7d 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -30,6 +30,12 @@ use Log::Any qw($log); use WWW::SwaggerClient::ApiClient; use WWW::SwaggerClient::Configuration; +use base "Class::Data::Inheritable"; + +__PACKAGE__->mk_classdata('method_documentation' => {}); +__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO + + sub new { my $class = shift; my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new; @@ -47,11 +53,20 @@ sub new { } + # # get_inventory # # Returns pet inventories by status # +{ + my $params = { + }; + __PACKAGE__->method_documentation->{ get_inventory } = { summary => 'Returns pet inventories by status', + params => $params, + returns => 'HASH[string,int]', + }; +} # @return HASH[string,int] # sub get_inventory { @@ -96,12 +111,26 @@ sub get_inventory { return $_response_object; } + # # place_order # # Place an order for a pet # # @param Order $body order placed for purchasing the pet (optional) +{ + my $params = { + 'body' => { + data_type => 'Order', + description => 'order placed for purchasing the pet', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ place_order } = { summary => 'Place an order for a pet', + params => $params, + returns => 'Order', + }; +} # @return Order # sub place_order { @@ -149,12 +178,26 @@ sub place_order { return $_response_object; } + # # get_order_by_id # # Find purchase order by ID # # @param string $order_id ID of pet that needs to be fetched (required) +{ + my $params = { + 'order_id' => { + data_type => 'string', + description => 'ID of pet that needs to be fetched', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ get_order_by_id } = { summary => 'Find purchase order by ID', + params => $params, + returns => 'Order', + }; +} # @return Order # sub get_order_by_id { @@ -209,12 +252,26 @@ sub get_order_by_id { return $_response_object; } + # # delete_order # # Delete purchase order by ID # # @param string $order_id ID of the order that needs to be deleted (required) +{ + my $params = { + 'order_id' => { + data_type => 'string', + description => 'ID of the order that needs to be deleted', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ delete_order } = { summary => 'Delete purchase order by ID', + params => $params, + returns => undef, + }; +} # @return void # sub delete_order { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index e1088a0839e..18d69ed5883 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -30,6 +30,12 @@ use Log::Any qw($log); use WWW::SwaggerClient::ApiClient; use WWW::SwaggerClient::Configuration; +use base "Class::Data::Inheritable"; + +__PACKAGE__->mk_classdata('method_documentation' => {}); +__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO + + sub new { my $class = shift; my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new; @@ -47,12 +53,26 @@ sub new { } + # # create_user # # Create user # # @param User $body Created user object (optional) +{ + my $params = { + 'body' => { + data_type => 'User', + description => 'Created user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ create_user } = { summary => 'Create user', + params => $params, + returns => undef, + }; +} # @return void # sub create_user { @@ -97,12 +117,26 @@ sub create_user { return; } + # # create_users_with_array_input # # Creates list of users with given input array # # @param ARRAY[User] $body List of user object (optional) +{ + my $params = { + 'body' => { + data_type => 'ARRAY[User]', + description => 'List of user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ create_users_with_array_input } = { summary => 'Creates list of users with given input array', + params => $params, + returns => undef, + }; +} # @return void # sub create_users_with_array_input { @@ -147,12 +181,26 @@ sub create_users_with_array_input { return; } + # # create_users_with_list_input # # Creates list of users with given input array # # @param ARRAY[User] $body List of user object (optional) +{ + my $params = { + 'body' => { + data_type => 'ARRAY[User]', + description => 'List of user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ create_users_with_list_input } = { summary => 'Creates list of users with given input array', + params => $params, + returns => undef, + }; +} # @return void # sub create_users_with_list_input { @@ -197,6 +245,7 @@ sub create_users_with_list_input { return; } + # # login_user # @@ -204,6 +253,24 @@ sub create_users_with_list_input { # # @param string $username The user name for login (optional) # @param string $password The password for login in clear text (optional) +{ + my $params = { + 'username' => { + data_type => 'string', + description => 'The user name for login', + required => '0', + }, + 'password' => { + data_type => 'string', + description => 'The password for login in clear text', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ login_user } = { summary => 'Logs user into the system', + params => $params, + returns => 'string', + }; +} # @return string # sub login_user { @@ -254,11 +321,20 @@ sub login_user { return $_response_object; } + # # logout_user # # Logs out current logged in user session # +{ + my $params = { + }; + __PACKAGE__->method_documentation->{ logout_user } = { summary => 'Logs out current logged in user session', + params => $params, + returns => undef, + }; +} # @return void # sub logout_user { @@ -300,12 +376,26 @@ sub logout_user { return; } + # # get_user_by_name # # Get user by user name # # @param string $username The name that needs to be fetched. Use user1 for testing. (required) +{ + my $params = { + 'username' => { + data_type => 'string', + description => 'The name that needs to be fetched. Use user1 for testing.', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ get_user_by_name } = { summary => 'Get user by user name', + params => $params, + returns => 'User', + }; +} # @return User # sub get_user_by_name { @@ -360,6 +450,7 @@ sub get_user_by_name { return $_response_object; } + # # update_user # @@ -367,6 +458,24 @@ sub get_user_by_name { # # @param string $username name that need to be deleted (required) # @param User $body Updated user object (optional) +{ + my $params = { + 'username' => { + data_type => 'string', + description => 'name that need to be deleted', + required => '1', + }, + 'body' => { + data_type => 'User', + description => 'Updated user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ update_user } = { summary => 'Updated user', + params => $params, + returns => undef, + }; +} # @return void # sub update_user { @@ -421,12 +530,26 @@ sub update_user { return; } + # # delete_user # # Delete user # # @param string $username The name that needs to be deleted (required) +{ + my $params = { + 'username' => { + data_type => 'string', + description => 'The name that needs to be deleted', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ delete_user } = { summary => 'Delete user', + params => $params, + returns => undef, + }; +} # @return void # sub delete_user { diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t index b35149c9d83..6fd37afabda 100644 --- a/samples/client/petstore/perl/t/04_role.t +++ b/samples/client/petstore/perl/t/04_role.t @@ -1,5 +1,7 @@ -use Test::More tests => 15; +use Test::More tests => 21; use Test::Exception; +use Test::Warnings 'warnings'; +use Test::Deep; use lib 'lib'; use strict; @@ -9,22 +11,33 @@ use MooseX::amine; use Class::Inspector; use Data::Dumper; -use Log::Any::Adapter ('File', '/home/dave/bookeo_api.log'); - - SKIP: { eval " package MyApp; use Moose; with 'WWW::SwaggerClient::Role'; - sub auth_setup_handler {} "; - skip 'Moose not installed', 15 if $@; + skip 'Moose not installed', 21 if $@; -my $api = MyApp->new; +my $api; +cmp_deeply( + [ warnings { $api = MyApp->new } ], + bag( + "Cannot delegate new (use \$self->pet_api->new instead)\n", + "Cannot delegate new (use \$self->store_api->new instead)\n", + "Cannot delegate new (use \$self->user_api->new instead)\n", + "Cannot delegate class_documentation (use \$self->pet_api->class_documentation instead)\n", + "Cannot delegate class_documentation (use \$self->store_api->class_documentation instead)\n", + "Cannot delegate class_documentation (use \$self->user_api->class_documentation instead)\n", + "Cannot delegate method_documentation (use \$self->pet_api->method_documentation instead)\n", + "Cannot delegate method_documentation (use \$self->store_api->method_documentation instead)\n", + "Cannot delegate method_documentation (use \$self->user_api->method_documentation instead)\n", + ), + 'got expected warnings about non-delegatable methods', + ); my $pet_id = 10008; # note - we don't need to 'use' these modules because they've already been loaded by ApiFactory @@ -52,5 +65,20 @@ is $get_pet->category->name, 'perl', 'stored and retrieved: got the proper categ is $get_pet->tags->[0]->name, 'just kidding', 'stored and retrieved: got the proper tag name'; is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id'; +# documentation tests +TODO: { + local $TODO = "Swagger spec doesn't populate all the description fields"; + is $api->pet_api->class_documentation->{description}, 'Pet API description', 'got corrrect Pet API description'; + is $get_pet->method_documentation->{name}, 'Description of the Pet object name() method', 'Pet object method_documentation is available'; +} + +is_deeply( [sort keys %{$api->pet_api->method_documentation}], + [ 'add_pet', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'update_pet', 'update_pet_with_form', 'upload_file'], + "Pet API method_documentation has the correct keys"); + +my $pet_class_doco = { 'description' => '' }; +is_deeply($get_pet->class_documentation, $pet_class_doco, 'Pet object class_documentation is available'); +# / documentation tests + } # / SKIP From d9f7944102509ce06a9e2306d95fe34de58bd0dd Mon Sep 17 00:00:00 2001 From: crissdev Date: Fri, 6 Nov 2015 19:02:25 +0200 Subject: [PATCH 098/142] typescript: mark optional model properties --- .../resources/TypeScript-Angular/model.mustache | 2 +- .../typescript-angular/API/Client/Category.ts | 4 ++-- .../typescript-angular/API/Client/Order.ts | 12 ++++++------ .../typescript-angular/API/Client/Pet.ts | 8 ++++---- .../typescript-angular/API/Client/Tag.ts | 4 ++-- .../typescript-angular/API/Client/User.ts | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache index 4096e078518..f4cfe923baa 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache @@ -18,7 +18,7 @@ namespace {{package}} { * {{{description}}} */ {{/description}} - {{name}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}; + {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}; {{/vars}} } diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts index ad34870b31a..a802fe4ebdf 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Category.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts @@ -5,9 +5,9 @@ namespace API.Client { export interface Category { - id: number; + id?: number; - name: string; + name?: string; } } diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts index dfffcd3d828..1dd84e6d0ad 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Order.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts @@ -5,20 +5,20 @@ namespace API.Client { export interface Order { - id: number; + id?: number; - petId: number; + petId?: number; - quantity: number; + quantity?: number; - shipDate: Date; + shipDate?: Date; /** * Order Status */ - status: Order.StatusEnum; + status?: Order.StatusEnum; - complete: boolean; + complete?: boolean; } export namespace Order { diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts index fa86c457fcf..60431f69c83 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts @@ -5,20 +5,20 @@ namespace API.Client { export interface Pet { - id: number; + id?: number; - category: Category; + category?: Category; name: string; photoUrls: Array; - tags: Array; + tags?: Array; /** * pet status in the store */ - status: Pet.StatusEnum; + status?: Pet.StatusEnum; } export namespace Pet { diff --git a/samples/client/petstore/typescript-angular/API/Client/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts index d206559a0ef..1c0284cce48 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Tag.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts @@ -5,9 +5,9 @@ namespace API.Client { export interface Tag { - id: number; + id?: number; - name: string; + name?: string; } } diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts index e60f84bb6c6..7c2b0b78b0c 100644 --- a/samples/client/petstore/typescript-angular/API/Client/User.ts +++ b/samples/client/petstore/typescript-angular/API/Client/User.ts @@ -5,24 +5,24 @@ namespace API.Client { export interface User { - id: number; + id?: number; - username: string; + username?: string; - firstName: string; + firstName?: string; - lastName: string; + lastName?: string; - email: string; + email?: string; - password: string; + password?: string; - phone: string; + phone?: string; /** * User Status */ - userStatus: number; + userStatus?: number; } } From c06af6d14178885185d5b999e050a4952a44e039 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Mon, 9 Nov 2015 23:04:59 +0100 Subject: [PATCH 099/142] Documentation and automatic documentation - added POD to Role.pm - added README.md files translated from Role.pm POD - added an autodoc script (based on AutoDoc.pm role). The script prints a listing of the methods built in Role.pm - added class_documentation() and method_documentation() accessors on all object and API classes which return the documentation supplied in the Swagger spec for the API --- .../codegen/languages/PerlClientCodegen.java | 2 + .../src/main/resources/perl/AutoDoc.mustache | 156 ++++++++++++++++ .../src/main/resources/perl/README.md | 164 +++++++++++++++++ .../src/main/resources/perl/Role.mustache | 167 ++++++++++++++++++ .../src/main/resources/perl/api.mustache | 2 +- .../resources/perl/autodoc.script.mustache | 19 ++ samples/client/petstore/perl/README.md | 164 +++++++++++++++++ samples/client/petstore/perl/bin/autodoc | 19 ++ .../perl/lib/WWW/SwaggerClient/Role.pm | 167 ++++++++++++++++++ .../lib/WWW/SwaggerClient/Role/AutoDoc.pm | 156 ++++++++++++++++ samples/client/petstore/perl/t/04_role.t | 4 - 11 files changed, 1015 insertions(+), 5 deletions(-) create mode 100644 modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache create mode 100644 modules/swagger-codegen/src/main/resources/perl/README.md create mode 100644 modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache create mode 100644 samples/client/petstore/perl/README.md create mode 100644 samples/client/petstore/perl/bin/autodoc create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index 3213f0b9716..27f39f11ed0 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -100,6 +100,8 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Object/BaseObject.pm")); supportingFiles.add(new SupportingFile("ApiFactory.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiFactory.pm")); supportingFiles.add(new SupportingFile("Role.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Role.pm")); + supportingFiles.add(new SupportingFile("AutoDoc.mustache", ("lib/WWW/" + moduleName + "/Role").replace('/', File.separatorChar), "AutoDoc.pm")); + supportingFiles.add(new SupportingFile("autodoc.script.mustache", ("bin/").replace('/', File.separatorChar), "autodoc")); } public CodegenType getTag() { diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache new file mode 100644 index 00000000000..c756915f80f --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache @@ -0,0 +1,156 @@ +package WWW::{{moduleName}}::Role::AutoDoc; +use List::MoreUtils qw(uniq); + +use Moose::Role; + +sub autodoc { + my $self = shift; + + $self->_printisa; + $self->_printmethods; + $self->_printattrs; + print "\n"; +} + +sub _printisa { + my $self = shift; + my $meta = $self->meta; + + my $myclass = ref $self; + + my $super = join ', ', $meta->superclasses; + my @roles = $meta->calculate_all_roles; + shift(@roles); # the first is a composite, the rest are the roles + + my $isa = join ', ', $meta->linearized_isa; + my $sub = join ', ', $meta->subclasses; + my $dsub = join ', ', $meta->direct_subclasses; + + my ($rolepkg, $role_reqs); + + $~ = 'INHERIT'; + write; + + foreach my $role (@roles) { + $rolepkg = $role->{package}; + $role_reqs = join ', ', keys %{$role->{required_methods}}; + $~ = 'ROLES'; + write; + } + +# ----- format specs ----- + format INHERIT = + +@* - +$myclass + ISA: @* + $isa + Direct subclasses: @* + $dsub + All subclasses: @* + $sub +. + format ROLES = + Composes: @* + $rolepkg + requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $role_reqs +. +# ----- / format specs ----- +} + +sub _printmethods { + my $self = shift; + $~ = 'METHODHEAD'; + write; + $self->_printmethod($_) for uniq sort $self->meta->get_method_list, $self->meta->get_all_method_names; +} + +sub _printmethod { + my ($self, $methodname) = @_; + return if $methodname =~ /^_/; + return if $self->meta->has_attribute($methodname); + my %internal = map {$_ => 1} qw(BUILD BUILDARGS meta can new DEMOLISHALL DESTROY + DOES isa BUILDALL does VERSION dump + ); + return if $internal{$methodname}; + my $method = $self->meta->get_method($methodname) or return; # symbols imported into namespaces i.e. not known by Moose + + return if $method->original_package_name eq __PACKAGE__; + + my $delegation = ''; + my $delegate_to = ''; + my $via = ''; + my $on = ''; + if ($method->can('associated_attribute')) { + $delegate_to = $method->delegate_to_method; + my $aa = $method->associated_attribute; + $on = $aa->{isa}; + $via = $aa->{name}; + } + + $~ = 'METHOD'; + write; + +# ----- format specs ----- + format METHODHEAD = + +METHODS +------- +Name delegate to on via +=================================================================================================================================== +. + format METHOD = +@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<... +$methodname, $delegate_to, $on, $via +. +# ----- / format specs ----- +} + +sub _printattrs { + my $self = shift; + $~ = 'ATTRHEAD'; + write; + $self->_printattr($_) for sort $self->meta->get_attribute_list; +} + +sub _printattr { + my ($self, $attrname) = @_; + return if $attrname =~ /^_/; + my $attr = $self->meta->get_attribute($attrname) or die "No attr for $attrname"; + + my $is; + $is = 'rw' if $attr->get_read_method && $attr->get_write_method; + $is = 'ro' if $attr->get_read_method && ! $attr->get_write_method; + $is = 'wo' if $attr->get_write_method && ! $attr->get_read_method; + $is = '--' if ! $attr->get_write_method && ! $attr->get_read_method; + $is or die "No \$is for $attrname"; + + my $tc = $attr->type_constraint || ''; + my $from = $attr->associated_class->name || ''; + my $reqd = $attr->is_required ? 'reqd' : 'opt'; + my $lazy = $attr->is_lazy ? 'lazy' : ''; + my $doc = $attr->has_documentation ? 'yes' : ''; + my $handles = join ', ', sort @{$attr->handles || []}; + + $~ = 'ATTR'; + write; + +# ----- format specs ----- + format ATTRHEAD = + +ATTRIBUTES +---------- +Name is isa reqd lazy doc handles +============================================================================================================== +. + format ATTR = +@<<<<<<<<<<<<<<<<< @< @<<<<<<<<<<<<<<<<<<<<<<<< @<<< @<<< @<< ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +$attrname, $is, $tc, $reqd, $lazy, $doc, $handles + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $handles +. +# ----- / format specs ----- +} + +1; \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md new file mode 100644 index 00000000000..3cc2fda6528 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -0,0 +1,164 @@ +# NAME + +WWW::{{moduleName}}::Role - a Moose role for the Perl Swagger Codegen project + +## A note on Moose + +This role is the only component of the library that uses Moose. See +WWW::{{moduleName}}::ApiFactory for non-Moosey usage. + +# SYNOPSIS + +The Perl Swagger Codegen project builds a library of Perl modules to interact with +a web service defined by a Swagger specification. See below for how to build the +library. + +This module provides an interface to the generated library. All the classes, +objects, and methods (well, not quite \*all\*, see below) are flattened into this +role. + + package MyApp; + use Moose; + has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); + with 'WWW::{{moduleName}}::Role'; + sub auth_setup_handler {...} + + package main; + + my $api = MyApp->new({username => $username, password => $password}); + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + + +Notice that you need to provide the code to accept the parameters passed in to `new()` +(by setting up attributes via the `has` keyword). They should be used by +`auth_setup_handler()` to configure authentication (see below). + +## Structure of the library + +The library consists of a set of API classes, one for each endpoint. These APIs +implement the method calls available on each endpoint. + +Additionally, there is a set of "object" classes, which represent the objects +returned by and sent to the methods on the endpoints. + +An API factory class is provided, which builds instances of each endpoint API. + +This Moose role flattens all the methods from the endpoint APIs onto the consuming +class. It also provides methods to retrieve the endpoint API objects, and the API +factory object, should you need it. + +For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. + +# METHODS + +## `auth_setup_handler()` + +This method is NOT provided - you must write it yourself. Its task is to configure +authentication for each request. + +The method is called on your `$api` object and passed the following parameters: + +- `header_params` + + A hashref that will become the request headers. You can insert auth + parameters. + +- `query_params` + + A hashref that will be encoded into the request URL. You can insert auth + parameters. + +- `auth_settings` + + TODO. + +- `api_client` + + A reference to the `WWW::{{moduleName}}::ApiClient` object that is responsible + for communicating with the server. + +For example: + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + +## base\_url + +The generated code has the `base_url` already set as a default value. This method +returns (and optionally sets) the current value of `base_url`. + +## api\_factory + +Returns an API factory object. You probably won't need to call this directly. + + $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance + + $self->pet_api; # the same + +# MISSING METHODS + +Most of the methods on the API are delegated to individual sub-API objects (e.g. +Pet API, Store API, User API etc). Where different sub-APIs use the same method +name (e.g. `new()`), these methods can't be delegated. So you need to call +`$api->pet_api->new()`. + +In principle, every API is susceptible to the presence of a few, random, undelegatable +method names. In practice, because of the way method names are constructed, it's +unlikely in general that any methods will be undelegatable, except for: + + new() + class_documentation() + method_documentation() + +To call these methods, you need to get a handle on the relevant object, either +by calling `$api->foo_api` or by retrieving an object, e.g. +`$api->get_pet_by_id(pet_id => $pet_id)`. + +# BUILDING YOUR LIBRARY + +See the homepage `https://github.com/swagger-api/swagger-codegen` for full details. +But briefly, clone the git repository, build the codegen codebase, set up your build +config file, then run the API build script. You will need git, Java 7 and Apache +maven 3.0.3 or better already installed. + +The config file should specify the project name for the generated library: + + {"moduleName":"MyProjectName"} + +Your library files will be built under `WWW::MyProjectName`. + + $ git clone https://github.com/swagger-api/swagger-codegen.git + $ cd swagger-codegen + $ mvn package + $ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ + -i [URL or file path to JSON swagger API spec] \ + -l perl \ + -c /path/to/config/file.json \ + -o /path/to/output/folder + +Bang, all done. Run the `autodoc` script in the `bin` directory to see the API +you just built. + +# AUTOMATIC DOCUMENTATION + +You can print out a summary of the generated API by running the included +`autodoc` script in the `bin` directory of your generated library. + +# DOCUMENTATION FROM THE SWAGGER SPEC + +Additional documentation for each class and method may be provided by the Swagger +spec. If so, this is available via the `class_documentation()` and +`method_documentation()` methods on each generated API and class: + + my $cdoc = $api->pet_api->class_documentation; + my $cmdoc = $api->pet_api->method_documentation->{$method_name}; + + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; + + +Each of these calls returns a hashref with various useful pieces of information. diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index be41efe44c5..951f05bab74 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -69,6 +69,173 @@ sub _build_af { return WWW::{{moduleName}}::ApiFactory->new(%args); } +=head1 NAME +WWW::{{moduleName}}::Role - a Moose role for the Perl Swagger Codegen project + +=head2 A note on Moose + +This role is the only component of the library that uses Moose. See +WWW::{{moduleName}}::ApiFactory for non-Moosey usage. + +=head1 SYNOPSIS + +The Perl Swagger Codegen project builds a library of Perl modules to interact with +a web service defined by a Swagger specification. See below for how to build the +library. + +This module provides an interface to the generated library. All the classes, +objects, and methods (well, not quite *all*, see below) are flattened into this +role. + + package MyApp; + use Moose; + has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); + with 'WWW::{{moduleName}}::Role'; + sub auth_setup_handler {...} + + package main; + + my $api = MyApp->new({username => $username, password => $password}); + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + +Notice that you need to provide the code to accept the parameters passed in to C +(by setting up attributes via the C keyword). They should be used by +C to configure authentication (see below). + +=head2 Structure of the library + +The library consists of a set of API classes, one for each endpoint. These APIs +implement the method calls available on each endpoint. + +Additionally, there is a set of "object" classes, which represent the objects +returned by and sent to the methods on the endpoints. + +An API factory class is provided, which builds instances of each endpoint API. + +This Moose role flattens all the methods from the endpoint APIs onto the consuming +class. It also provides methods to retrieve the endpoint API objects, and the API +factory object, should you need it. + +For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. + +=head1 METHODS + +=head2 C + +This method is NOT provided - you must write it yourself. Its task is to configure +authentication for each request. + +The method is called on your C<$api> object and passed the following parameters: + +=over 4 + +=item C + +A hashref that will become the request headers. You can insert auth +parameters. + +=item C + +A hashref that will be encoded into the request URL. You can insert auth +parameters. + +=item C + +TODO. + +=item C + +A reference to the C object that is responsible +for communicating with the server. + +=back + +For example: + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + +=head2 base_url + +The generated code has the C already set as a default value. This method +returns (and optionally sets) the current value of C. + +=head2 api_factory + +Returns an API factory object. You probably won't need to call this directly. + + $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance + + $self->pet_api; # the same + +=head1 MISSING METHODS + +Most of the methods on the API are delegated to individual sub-API objects (e.g. +Pet API, Store API, User API etc). Where different sub-APIs use the same method +name (e.g. C), these methods can't be delegated. So you need to call +C<$api-Epet_api-Enew()>. + +In principle, every API is susceptible to the presence of a few, random, undelegatable +method names. In practice, because of the way method names are constructed, it's +unlikely in general that any methods will be undelegatable, except for: + + new() + class_documentation() + method_documentation() + +To call these methods, you need to get a handle on the relevant object, either +by calling C<$api-Efoo_api> or by retrieving an object, e.g. +C<$api-Eget_pet_by_id(pet_id =E $pet_id)>. + +=head1 BUILDING YOUR LIBRARY + +See the homepage C for full details. +But briefly, clone the git repository, build the codegen codebase, set up your build +config file, then run the API build script. You will need git, Java 7 and Apache +maven 3.0.3 or better already installed. + +The config file should specify the project name for the generated library: + + {"moduleName":"MyProjectName"} + +Your library files will be built under C. + + $ git clone https://github.com/swagger-api/swagger-codegen.git + $ cd swagger-codegen + $ mvn package + $ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ + -i [URL or file path to JSON swagger API spec] \ + -l perl \ + -c /path/to/config/file.json \ + -o /path/to/output/folder + +Bang, all done. Run the C script in the C directory to see the API +you just built. + +=head1 AUTOMATIC DOCUMENTATION + +You can print out a summary of the generated API by running the included +C script in the C directory of your generated library. + +=head1 DOCUMENTATION FROM THE SWAGGER SPEC + +Additional documentation for each class and method may be provided by the Swagger +spec. If so, this is available via the C and +C methods on each generated API and class: + + my $cdoc = $api->pet_api->class_documentation; + my $cmdoc = $api->pet_api->method_documentation->{$method_name}; + + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; + +Each of these calls returns a hashref with various useful pieces of information. + +=cut 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index 7cdbc30aaf4..a93cbc2b4a4 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -73,7 +73,7 @@ sub new { }, {{/allParams}} }; - __PACKAGE__->method_documentation->{ {{{nickname}}} } = { summary => '{{{summary}}}', + __PACKAGE__->method_documentation->{ {{nickname}} } = { summary => '{{summary}}', params => $params, returns => {{#returnType}}'{{{returnType}}}'{{/returnType}}{{^returnType}}undef{{/returnType}}, }; diff --git a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache new file mode 100644 index 00000000000..b39bd898647 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache @@ -0,0 +1,19 @@ +#!/usr/bin/perl +package MyAutodoc; +use FindBin; +use File::Spec; +use lib File::Spec->catdir($FindBin::Bin, '..', 'lib'); + +use Moose; + +with ('WWW::{{moduleName}}::Role', 'WWW::{{moduleName}}::Role::AutoDoc'); + +sub auth_setup_handler {} + +package main; + +my $api = MyAutodoc->new; + +print $api->autodoc; + +exit(0); diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md new file mode 100644 index 00000000000..54c8b861eda --- /dev/null +++ b/samples/client/petstore/perl/README.md @@ -0,0 +1,164 @@ +# NAME + +WWW::SwaggerClient::Role - a Moose role for the Perl Swagger Codegen project + +## A note on Moose + +This role is the only component of the library that uses Moose. See +WWW::SwaggerClient::ApiFactory for non-Moosey usage. + +# SYNOPSIS + +The Perl Swagger Codegen project builds a library of Perl modules to interact with +a web service defined by a Swagger specification. See below for how to built the +library. + +This module provides an interface to the generated library. All the classes, +objects, and methods (well, not quite \*all\*, see below) are flattened into this +role. + + package MyApp; + use Moose; + has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); + with 'WWW::SwaggerClient::Role'; + sub auth_setup_handler {...} + + package main; + + my $api = MyApp->new({username => $username, password => $password}); + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + + +Notice that you need to provide the code to accept the parameters passed in to `new()` +(by setting up attributes via the `has` keyword). They should be used by +`auth_setup_handler()` to configure authentication (see below). + +## Structure of the library + +The library consists of a set of API classes, one for each endpoint. These APIs +implement the method calls available on each endpoint. + +Additionally, there is a set of "object" classes, which represent the objects +returned by and sent to the methods on the endpoints. + +An API factory class is provided, which builds instances of each endpoint API. + +This Moose role flattens all the methods from the endpoint APIs onto the consuming +class. It also provides methods to retrieve the endpoint API objects, and the API +factory object, should you need it. + +For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. + +# METHODS + +## `auth_setup_handler()` + +This method is NOT provided - you must write it yourself. Its task is to configure +authentication for each request. + +The method is called on your `$api` object and passed the following parameters: + +- `header_params` + + A hashref that will become the request headers. You can insert auth + parameters. + +- `query_params` + + A hashref that will be encoded into the request URL. You can insert auth + parameters. + +- `auth_settings` + + TODO. + +- `api_client` + + A reference to the `WWW::SwaggerClient::ApiClient` object that is responsible + for communicating with the server. + +For example: + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + +## base\_url + +The generated code has the `base_url` already set as a default value. This method +returns (and optionally sets) the current value of `base_url`. + +## api\_factory + +Returns an API factory object. You probably won't need to call this directly. + + $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance + + $self->pet_api; # the same + +# MISSING METHODS + +Most of the methods on the API are delegated to individual sub-API objects (e.g. +Pet API, Store API, User API etc). Where different sub-APIs use the same method +name (e.g. `new()`), these methods can't be delegated. So you need to call +`$api->pet_api->new()`. + +In principle, every API is susceptible to the presence of a few, random, undelegatable +method names. In practice, because of the way method names are constructed, it's +unlikely in general that any methods will be undelegatable, except for: + + new() + class_documentation() + method_documentation() + +To call these methods, you need to get a handle on the relevant object, either +by calling `$api->foo_api` or by retrieving an object, e.g. +`$api->get_pet_by_id(pet_id => $pet_id)`. + +# BUILDING YOUR LIBRARY + +See the homepage `https://github.com/swagger-api/swagger-codegen` for full details. +But briefly, clone the git repository, build the codegen codebase, set up your build +config file, then run the API build script. You will need git, Java 7 and Apache +maven 3.0.3 or better already installed. + +The config file should specify the project name for the generated library: + + {"moduleName":"MyProjectName"} + +Your library files will be built under `WWW::MyProjectName`. + + $ git clone https://github.com/swagger-api/swagger-codegen.git + $ cd swagger-codegen + $ mvn package + $ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ + -i [URL or file path to JSON swagger API spec] \ + -l perl \ + -c /path/to/config/file.json \ + -o /path/to/output/folder + +Bang, all done. Run the `autodoc` script in the `bin` directory to see the API +you just built. + +# AUTOMATIC DOCUMENTATION + +You can print out a summary of the generated API by running the included +`autodoc` script in the `bin` directory of your generated library. + +# DOCUMENTATION FROM THE SWAGGER SPEC + +Additional documentation for each class and method may be provided by the Swagger +spec. If so, this is available via the `class_documentation()` and +`method_documentation()` methods on each generated API and class: + + my $cdoc = $api->pet_api->class_documentation; + my $cmdoc = $api->pet_api->method_documentation->{$method_name}; + + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; + + +Each of these calls returns a hashref with various useful pieces of information. diff --git a/samples/client/petstore/perl/bin/autodoc b/samples/client/petstore/perl/bin/autodoc new file mode 100644 index 00000000000..0e9f893e642 --- /dev/null +++ b/samples/client/petstore/perl/bin/autodoc @@ -0,0 +1,19 @@ +#!/usr/bin/perl +package MyAutodoc; +use FindBin; +use File::Spec; +use lib File::Spec->catdir($FindBin::Bin, '..', 'lib'); + +use Moose; + +with ('WWW::SwaggerClient::Role', 'WWW::SwaggerClient::Role::AutoDoc'); + +sub auth_setup_handler {} + +package main; + +my $api = MyAutodoc->new; + +print $api->autodoc; + +exit(0); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index c21c428b85f..2b8969b3e3f 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -69,6 +69,173 @@ sub _build_af { return WWW::SwaggerClient::ApiFactory->new(%args); } +=head1 NAME +WWW::SwaggerClient::Role - a Moose role for the Perl Swagger Codegen project + +=head2 A note on Moose + +This role is the only component of the library that uses Moose. See +WWW::SwaggerClient::ApiFactory for non-Moosey usage. + +=head1 SYNOPSIS + +The Perl Swagger Codegen project builds a library of Perl modules to interact with +a web service defined by a Swagger specification. See below for how to build the +library. + +This module provides an interface to the generated library. All the classes, +objects, and methods (well, not quite *all*, see below) are flattened into this +role. + + package MyApp; + use Moose; + has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); + with 'WWW::SwaggerClient::Role'; + sub auth_setup_handler {...} + + package main; + + my $api = MyApp->new({username => $username, password => $password}); + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + +Notice that you need to provide the code to accept the parameters passed in to C +(by setting up attributes via the C keyword). They should be used by +C to configure authentication (see below). + +=head2 Structure of the library + +The library consists of a set of API classes, one for each endpoint. These APIs +implement the method calls available on each endpoint. + +Additionally, there is a set of "object" classes, which represent the objects +returned by and sent to the methods on the endpoints. + +An API factory class is provided, which builds instances of each endpoint API. + +This Moose role flattens all the methods from the endpoint APIs onto the consuming +class. It also provides methods to retrieve the endpoint API objects, and the API +factory object, should you need it. + +For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. + +=head1 METHODS + +=head2 C + +This method is NOT provided - you must write it yourself. Its task is to configure +authentication for each request. + +The method is called on your C<$api> object and passed the following parameters: + +=over 4 + +=item C + +A hashref that will become the request headers. You can insert auth +parameters. + +=item C + +A hashref that will be encoded into the request URL. You can insert auth +parameters. + +=item C + +TODO. + +=item C + +A reference to the C object that is responsible +for communicating with the server. + +=back + +For example: + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + +=head2 base_url + +The generated code has the C already set as a default value. This method +returns (and optionally sets) the current value of C. + +=head2 api_factory + +Returns an API factory object. You probably won't need to call this directly. + + $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance + + $self->pet_api; # the same + +=head1 MISSING METHODS + +Most of the methods on the API are delegated to individual sub-API objects (e.g. +Pet API, Store API, User API etc). Where different sub-APIs use the same method +name (e.g. C), these methods can't be delegated. So you need to call +C<$api-Epet_api-Enew()>. + +In principle, every API is susceptible to the presence of a few, random, undelegatable +method names. In practice, because of the way method names are constructed, it's +unlikely in general that any methods will be undelegatable, except for: + + new() + class_documentation() + method_documentation() + +To call these methods, you need to get a handle on the relevant object, either +by calling C<$api-Efoo_api> or by retrieving an object, e.g. +C<$api-Eget_pet_by_id(pet_id =E $pet_id)>. + +=head1 BUILDING YOUR LIBRARY + +See the homepage C for full details. +But briefly, clone the git repository, build the codegen codebase, set up your build +config file, then run the API build script. You will need git, Java 7 and Apache +maven 3.0.3 or better already installed. + +The config file should specify the project name for the generated library: + + {"moduleName":"MyProjectName"} + +Your library files will be built under C. + + $ git clone https://github.com/swagger-api/swagger-codegen.git + $ cd swagger-codegen + $ mvn package + $ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ + -i [URL or file path to JSON swagger API spec] \ + -l perl \ + -c /path/to/config/file.json \ + -o /path/to/output/folder + +Bang, all done. Run the C script in the C directory to see the API +you just built. + +=head1 AUTOMATIC DOCUMENTATION + +You can print out a summary of the generated API by running the included +C script in the C directory of your generated library. + +=head1 DOCUMENTATION FROM THE SWAGGER SPEC + +Additional documentation for each class and method may be provided by the Swagger +spec. If so, this is available via the C and +C methods on each generated API and class: + + my $cdoc = $api->pet_api->class_documentation; + my $cmdoc = $api->pet_api->method_documentation->{$method_name}; + + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; + +Each of these calls returns a hashref with various useful pieces of information. + +=cut 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm new file mode 100644 index 00000000000..93b45427bbe --- /dev/null +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm @@ -0,0 +1,156 @@ +package WWW::SwaggerClient::Role::AutoDoc; +use List::MoreUtils qw(uniq); + +use Moose::Role; + +sub autodoc { + my $self = shift; + + $self->_printisa; + $self->_printmethods; + $self->_printattrs; + print "\n"; +} + +sub _printisa { + my $self = shift; + my $meta = $self->meta; + + my $myclass = ref $self; + + my $super = join ', ', $meta->superclasses; + my @roles = $meta->calculate_all_roles; + shift(@roles); # the first is a composite, the rest are the roles + + my $isa = join ', ', $meta->linearized_isa; + my $sub = join ', ', $meta->subclasses; + my $dsub = join ', ', $meta->direct_subclasses; + + my ($rolepkg, $role_reqs); + + $~ = 'INHERIT'; + write; + + foreach my $role (@roles) { + $rolepkg = $role->{package}; + $role_reqs = join ', ', keys %{$role->{required_methods}}; + $~ = 'ROLES'; + write; + } + +# ----- format specs ----- + format INHERIT = + +@* - +$myclass + ISA: @* + $isa + Direct subclasses: @* + $dsub + All subclasses: @* + $sub +. + format ROLES = + Composes: @* + $rolepkg + requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $role_reqs +. +# ----- / format specs ----- +} + +sub _printmethods { + my $self = shift; + $~ = 'METHODHEAD'; + write; + $self->_printmethod($_) for uniq sort $self->meta->get_method_list, $self->meta->get_all_method_names; +} + +sub _printmethod { + my ($self, $methodname) = @_; + return if $methodname =~ /^_/; + return if $self->meta->has_attribute($methodname); + my %internal = map {$_ => 1} qw(BUILD BUILDARGS meta can new DEMOLISHALL DESTROY + DOES isa BUILDALL does VERSION dump + ); + return if $internal{$methodname}; + my $method = $self->meta->get_method($methodname) or return; # symbols imported into namespaces i.e. not known by Moose + + return if $method->original_package_name eq __PACKAGE__; + + my $delegation = ''; + my $delegate_to = ''; + my $via = ''; + my $on = ''; + if ($method->can('associated_attribute')) { + $delegate_to = $method->delegate_to_method; + my $aa = $method->associated_attribute; + $on = $aa->{isa}; + $via = $aa->{name}; + } + + $~ = 'METHOD'; + write; + +# ----- format specs ----- + format METHODHEAD = + +METHODS +------- +Name delegate to on via +=================================================================================================================================== +. + format METHOD = +@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<... +$methodname, $delegate_to, $on, $via +. +# ----- / format specs ----- +} + +sub _printattrs { + my $self = shift; + $~ = 'ATTRHEAD'; + write; + $self->_printattr($_) for sort $self->meta->get_attribute_list; +} + +sub _printattr { + my ($self, $attrname) = @_; + return if $attrname =~ /^_/; + my $attr = $self->meta->get_attribute($attrname) or die "No attr for $attrname"; + + my $is; + $is = 'rw' if $attr->get_read_method && $attr->get_write_method; + $is = 'ro' if $attr->get_read_method && ! $attr->get_write_method; + $is = 'wo' if $attr->get_write_method && ! $attr->get_read_method; + $is = '--' if ! $attr->get_write_method && ! $attr->get_read_method; + $is or die "No \$is for $attrname"; + + my $tc = $attr->type_constraint || ''; + my $from = $attr->associated_class->name || ''; + my $reqd = $attr->is_required ? 'reqd' : 'opt'; + my $lazy = $attr->is_lazy ? 'lazy' : ''; + my $doc = $attr->has_documentation ? 'yes' : ''; + my $handles = join ', ', sort @{$attr->handles || []}; + + $~ = 'ATTR'; + write; + +# ----- format specs ----- + format ATTRHEAD = + +ATTRIBUTES +---------- +Name is isa reqd lazy doc handles +============================================================================================================== +. + format ATTR = +@<<<<<<<<<<<<<<<<< @< @<<<<<<<<<<<<<<<<<<<<<<<< @<<< @<<< @<< ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +$attrname, $is, $tc, $reqd, $lazy, $doc, $handles + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $handles +. +# ----- / format specs ----- +} + +1; \ No newline at end of file diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t index 6fd37afabda..9592ec3f822 100644 --- a/samples/client/petstore/perl/t/04_role.t +++ b/samples/client/petstore/perl/t/04_role.t @@ -7,10 +7,6 @@ use lib 'lib'; use strict; use warnings; -use MooseX::amine; -use Class::Inspector; -use Data::Dumper; - SKIP: { eval " package MyApp; From 3a7204d66cbf4d89c56e4446e5cce79d08da1fa0 Mon Sep 17 00:00:00 2001 From: Emiliano Bonassi Date: Tue, 10 Nov 2015 03:20:49 +0100 Subject: [PATCH 100/142] Add support to Retrofit2 --- README.md | 11 +- bin/all-petstore.sh | 1 + bin/java-petstore-retrofit2.json | 4 + bin/java-petstore-retrofit2.sh | 31 ++ .../codegen/languages/JavaClientCodegen.java | 9 +- .../libraries/retrofit2/ApiClient.mustache | 343 ++++++++++++++++++ .../retrofit2/CollectionFormats.mustache | 95 +++++ .../Java/libraries/retrofit2/api.mustache | 34 ++ .../retrofit2/auth/ApiKeyAuth.mustache | 68 ++++ .../retrofit2/auth/HttpBasicAuth.mustache | 49 +++ .../libraries/retrofit2/auth/OAuth.mustache | 161 ++++++++ .../retrofit2/auth/OAuthOkHttpClient.mustache | 69 ++++ .../libraries/retrofit2/bodyParams.mustache | 1 + .../libraries/retrofit2/build.gradle.mustache | 106 ++++++ .../libraries/retrofit2/formParams.mustache | 1 + .../libraries/retrofit2/headerParams.mustache | 1 + .../Java/libraries/retrofit2/model.mustache | 58 +++ .../libraries/retrofit2/pathParams.mustache | 1 + .../Java/libraries/retrofit2/pom.mustache | 158 ++++++++ .../libraries/retrofit2/queryParams.mustache | 1 + .../.settings/org.eclipse.jdt.core.prefs | 12 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../petstore/java/retrofit2/build.gradle | 106 ++++++ .../petstore/java/retrofit2/gradle.properties | 2 + .../client/petstore/java/retrofit2/pom.xml | 158 ++++++++ .../petstore/java/retrofit2/settings.gradle | 1 + .../java/io/swagger/client/ApiClient.java | 342 +++++++++++++++++ .../io/swagger/client/CollectionFormats.java | 95 +++++ .../java/io/swagger/client/StringUtil.java | 51 +++ .../java/io/swagger/client/api/PetApi.java | 127 +++++++ .../java/io/swagger/client/api/StoreApi.java | 66 ++++ .../java/io/swagger/client/api/UserApi.java | 120 ++++++ .../io/swagger/client/auth/ApiKeyAuth.java | 68 ++++ .../io/swagger/client/auth/HttpBasicAuth.java | 49 +++ .../java/io/swagger/client/auth/OAuth.java | 161 ++++++++ .../io/swagger/client/auth/OAuthFlow.java | 5 + .../client/auth/OAuthOkHttpClient.java | 69 ++++ .../io/swagger/client/model/Category.java | 57 +++ .../java/io/swagger/client/model/Order.java | 142 ++++++++ .../java/io/swagger/client/model/Pet.java | 144 ++++++++ .../java/io/swagger/client/model/Tag.java | 57 +++ .../java/io/swagger/client/model/User.java | 148 ++++++++ .../io/swagger/petstore/test/PetApiTest.java | 160 ++++++++ .../swagger/petstore/test/StoreApiTest.java | 64 ++++ .../io/swagger/petstore/test/UserApiTest.java | 84 +++++ 45 files changed, 3486 insertions(+), 8 deletions(-) create mode 100644 bin/java-petstore-retrofit2.json create mode 100755 bin/java-petstore-retrofit2.sh create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache create mode 100644 samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs create mode 100644 samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs create mode 100644 samples/client/petstore/java/retrofit2/build.gradle create mode 100644 samples/client/petstore/java/retrofit2/gradle.properties create mode 100644 samples/client/petstore/java/retrofit2/pom.xml create mode 100644 samples/client/petstore/java/retrofit2/settings.gradle create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java create mode 100644 samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java create mode 100644 samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java create mode 100644 samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java diff --git a/README.md b/README.md index 664b8e20ef1..28d068c8404 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## Overview This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server. -Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additional information about the Swagger project, including additional libraries with support for other languages and more. +Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additional information about the Swagger project, including additional libraries with support for other languages and more. # Table of contents @@ -63,7 +63,7 @@ You need the following installed and available in your $PATH: * [Java 7](http://java.oracle.com) * [Apache maven 3.0.3 or greater](http://maven.apache.org/) - + #### OS X Users Don't forget to install Java 7. You probably have 1.6 or 1.8. @@ -173,10 +173,10 @@ OPTIONS -v, --verbose verbose mode - + -s , --skip-overwrite - specifies if the existing files should be overwritten during - the generation + specifies if the existing files should be overwritten during + the generation ``` You can then compile and run the client, as well as unit tests against it: @@ -351,6 +351,7 @@ CONFIG OPTIONS jersey2 - HTTP client: Jersey client 2.6 okhttp-gson - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 retrofit - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0) + retrofit2 - HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2) ``` Your config file for java can look like diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh index 2f9d4c0c0ff..dc2b4116070 100755 --- a/bin/all-petstore.sh +++ b/bin/all-petstore.sh @@ -27,6 +27,7 @@ cd $APP_DIR ./bin/java-petstore-jersey2.sh ./bin/java-petstore-okhttp-gson.sh ./bin/java-petstore-retrofit.sh ++./bin/java-petstore-retrofit2.sh ./bin/jaxrs-petstore-server.sh ./bin/nodejs-petstore-server.sh ./bin/objc-petstore.sh diff --git a/bin/java-petstore-retrofit2.json b/bin/java-petstore-retrofit2.json new file mode 100644 index 00000000000..4829fd6dd4b --- /dev/null +++ b/bin/java-petstore-retrofit2.json @@ -0,0 +1,4 @@ +{ + "library": "retrofit2", + "artifactId": "swagger-petstore-retrofit2" +} diff --git a/bin/java-petstore-retrofit2.sh b/bin/java-petstore-retrofit2.sh new file mode 100755 index 00000000000..fbd1f9779e4 --- /dev/null +++ b/bin/java-petstore-retrofit2.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +SCRIPT="$0" + +while [ -h "$SCRIPT" ] ; do + ls=`ls -ld "$SCRIPT"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + SCRIPT="$link" + else + SCRIPT=`dirname "$SCRIPT"`/"$link" + fi +done + +if [ ! -d "${APP_DIR}" ]; then + APP_DIR=`dirname "$SCRIPT"`/.. + APP_DIR=`cd "${APP_DIR}"; pwd` +fi + +executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" + +if [ ! -f "$executable" ] +then + mvn clean package +fi + +# if you've executed sbt assembly previously it will use that instead. +export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" +ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2" + +java $JAVA_OPTS -jar $executable $ags diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index a54ec4e038a..7702feecbc6 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -98,6 +98,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6"); supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1"); supportedLibraries.put("retrofit", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)"); + supportedLibraries.put("retrofit2", "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2)"); CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); library.setDefault(DEFAULT_LIBRARY); library.setEnum(supportedLibraries); @@ -214,7 +215,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java")); supportingFiles.add(new SupportingFile("auth/OAuthFlow.mustache", authFolder, "OAuthFlow.java")); - if (!"retrofit".equals(getLibrary())) { + if (!("retrofit".equals(getLibrary()) || "retrofit2".equals(getLibrary()))) { supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java")); supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java")); supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java")); @@ -228,7 +229,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("ApiCallback.mustache", invokerFolder, "ApiCallback.java")); // "build.sbt" is for development with SBT supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt")); - } else if ("retrofit".equals(getLibrary())) { + } else if ("retrofit".equals(getLibrary()) || "retrofit2".equals(getLibrary())) { supportingFiles.add(new SupportingFile("auth/OAuthOkHttpClient.mustache", authFolder, "OAuthOkHttpClient.java")); supportingFiles.add(new SupportingFile("CollectionFormats.mustache", invokerFolder, "CollectionFormats.java")); } else { @@ -512,7 +513,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { } public Map postProcessOperations(Map objs) { - if("retrofit".equals(getLibrary())) { + if("retrofit".equals(getLibrary()) || "retrofit2".equals(getLibrary())) { Map operations = (Map) objs.get("operations"); if (operations != null) { List ops = (List) operations.get("operation"); @@ -528,6 +529,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { if (operation.returnType == null) { operation.returnType = "Void"; } + if ("retrofit2".equals(getLibrary()) && StringUtils.isNotEmpty(operation.path) && operation.path.startsWith("/")) + operation.path = operation.path.substring(1); } } } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache new file mode 100644 index 00000000000..f9f7d77f470 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache @@ -0,0 +1,343 @@ +package {{invokerPackage}}; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder; + +import retrofit.Converter; +import retrofit.Retrofit; +import retrofit.GsonConverterFactory; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.RequestBody; +import com.squareup.okhttp.ResponseBody; + +import {{invokerPackage}}.auth.HttpBasicAuth; +import {{invokerPackage}}.auth.ApiKeyAuth; +import {{invokerPackage}}.auth.OAuth; +import {{invokerPackage}}.auth.OAuth.AccessTokenListener; +import {{invokerPackage}}.auth.OAuthFlow; + + +public class ApiClient { + + private Map apiAuthorizations; + private OkHttpClient okClient; + private Retrofit.Builder adapterBuilder; + + public ApiClient() { + apiAuthorizations = new LinkedHashMap(); + createDefaultAdapter(); + } + + public ApiClient(String[] authNames) { + this(); + for(String authName : authNames) { {{#hasAuthMethods}} + Interceptor auth; + {{#authMethods}}if (authName == "{{name}}") { {{#isBasic}} + auth = new HttpBasicAuth();{{/isBasic}}{{#isApiKey}} + auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}}{{#isOAuth}} + auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}");{{/isOAuth}} + } else {{/authMethods}}{ + throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); + } + addAuthorization(authName, auth);{{/hasAuthMethods}}{{^hasAuthMethods}} + throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");{{/hasAuthMethods}} + } + } + + /** + * Basic constructor for single auth name + * @param authName + */ + public ApiClient(String authName) { + this(new String[]{authName}); + } + + /** + * Helper constructor for single api key + * @param authName + * @param apiKey + */ + public ApiClient(String authName, String apiKey) { + this(authName); + this.setApiKey(apiKey); + } + + /** + * Helper constructor for single basic auth or password oauth2 + * @param authName + * @param username + * @param password + */ + public ApiClient(String authName, String username, String password) { + this(authName); + this.setCredentials(username, password); + } + + /** + * Helper constructor for single password oauth2 + * @param authName + * @param clientId + * @param secret + * @param username + * @param password + */ + public ApiClient(String authName, String clientId, String secret, String username, String password) { + this(authName); + this.getTokenEndPoint() + .setClientId(clientId) + .setClientSecret(secret) + .setUsername(username) + .setPassword(password); + } + + public void createDefaultAdapter() { + Gson gson = new GsonBuilder() + .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") + .create(); + + okClient = new OkHttpClient(); + + String baseUrl = "{{basePath}}"; + if(!baseUrl.endsWith("/")) + baseUrl = baseUrl + "/"; + + adapterBuilder = new Retrofit + .Builder() + .baseUrl(baseUrl) + .client(okClient) + .addConverterFactory(GsonCustomConverterFactory.create(gson)); + } + + public S createService(Class serviceClass) { + return adapterBuilder.build().create(serviceClass); + + } + + /** + * Helper method to configure the first api key found + * @param apiKey + */ + private void setApiKey(String apiKey) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof ApiKeyAuth) { + ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization; + keyAuth.setApiKey(apiKey); + return; + } + } + } + + /** + * Helper method to configure the username/password for basic auth or password oauth + * @param username + * @param password + */ + private void setCredentials(String username, String password) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof HttpBasicAuth) { + HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization; + basicAuth.setCredentials(username, password); + return; + } + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.getTokenRequestBuilder().setUsername(username).setPassword(password); + return; + } + } + } + + /** + * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one) + * @return + */ + public TokenRequestBuilder getTokenEndPoint() { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + return oauth.getTokenRequestBuilder(); + } + } + return null; + } + + /** + * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one) + * @return + */ + public AuthenticationRequestBuilder getAuthorizationEndPoint() { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + return oauth.getAuthenticationRequestBuilder(); + } + } + return null; + } + + /** + * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one) + * @param accessToken + */ + public void setAccessToken(String accessToken) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.setAccessToken(accessToken); + return; + } + } + } + + /** + * Helper method to configure the oauth accessCode/implicit flow parameters + * @param clientId + * @param clientSecret + * @param redirectURI + */ + public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.getTokenRequestBuilder() + .setClientId(clientId) + .setClientSecret(clientSecret) + .setRedirectURI(redirectURI); + oauth.getAuthenticationRequestBuilder() + .setClientId(clientId) + .setRedirectURI(redirectURI); + return; + } + } + } + + /** + * Configures a listener which is notified when a new access token is received. + * @param accessTokenListener + */ + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.registerAccessTokenListener(accessTokenListener); + return; + } + } + } + + /** + * Adds an authorization to be used by the client + * @param authName + * @param authorization + */ + public void addAuthorization(String authName, Interceptor authorization) { + if (apiAuthorizations.containsKey(authName)) { + throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations"); + } + apiAuthorizations.put(authName, authorization); + okClient.interceptors().add(authorization); + } + + public Map getApiAuthorizations() { + return apiAuthorizations; + } + + public void setApiAuthorizations(Map apiAuthorizations) { + this.apiAuthorizations = apiAuthorizations; + } + + public Retrofit.Builder getAdapterBuilder() { + return adapterBuilder; + } + + public void setAdapterBuilder(Retrofit.Builder adapterBuilder) { + this.adapterBuilder = adapterBuilder; + } + + public OkHttpClient getOkClient() { + return okClient; + } + + public void addAuthsToOkClient(OkHttpClient okClient) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + okClient.interceptors().add(apiAuthorization); + } + } + + /** + * Clones the okClient given in parameter, adds the auth interceptors and uses it to configure the Retrofit + * @param okClient + */ + public void configureFromOkclient(OkHttpClient okClient) { + OkHttpClient clone = okClient.clone(); + addAuthsToOkClient(clone); + adapterBuilder.client(clone); + } +} + +/** + * This wrapper is to take care of this case: + * when the deserialization fails due to JsonParseException and the + * expected type is String, then just return the body string. + */ +class GsonResponseBodyConverterToString implements Converter { + private final Gson gson; + private final Type type; + + GsonResponseBodyConverterToString(Gson gson, Type type) { + this.gson = gson; + this.type = type; + } + + @Override public T convert(ResponseBody value) throws IOException { + String returned = value.string(); + try { + return gson.fromJson(returned, type); + } + catch (JsonParseException e) { + return (T) returned; + } + } +} + +class GsonCustomConverterFactory extends Converter.Factory +{ + public static GsonCustomConverterFactory create(Gson gson) { + return new GsonCustomConverterFactory(gson); + } + + private final Gson gson; + private final GsonConverterFactory gsonConverterFactory; + + private GsonCustomConverterFactory(Gson gson) { + if (gson == null) throw new NullPointerException("gson == null"); + this.gson = gson; + this.gsonConverterFactory = GsonConverterFactory.create(gson); + } + + @Override + public Converter fromResponseBody(Type type, Annotation[] annotations) { + if(type.equals(String.class)) + return new GsonResponseBodyConverterToString<>(gson, type); + else + return gsonConverterFactory.fromResponseBody(type, annotations); + } + + @Override + public Converter toRequestBody(Type type, Annotation[] annotations) { + return gsonConverterFactory.toRequestBody(type, annotations); + } +} + diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache new file mode 100644 index 00000000000..a549ea59d1c --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache @@ -0,0 +1,95 @@ +package {{invokerPackage}}; + +import java.util.Arrays; +import java.util.List; + +public class CollectionFormats { + + public static class CSVParams { + + protected List params; + + public CSVParams() { + } + + public CSVParams(List params) { + this.params = params; + } + + public CSVParams(String... params) { + this.params = Arrays.asList(params); + } + + public List getParams() { + return params; + } + + public void setParams(List params) { + this.params = params; + } + + @Override + public String toString() { + return StringUtil.join(params.toArray(new String[0]), ","); + } + + } + + public static class SSVParams extends CSVParams { + + public SSVParams() { + } + + public SSVParams(List params) { + super(params); + } + + public SSVParams(String... params) { + super(params); + } + + @Override + public String toString() { + return StringUtil.join(params.toArray(new String[0]), " "); + } + } + + public static class TSVParams extends CSVParams { + + public TSVParams() { + } + + public TSVParams(List params) { + super(params); + } + + public TSVParams(String... params) { + super(params); + } + + @Override + public String toString() { + return StringUtil.join( params.toArray(new String[0]), "\t"); + } + } + + public static class PIPESParams extends CSVParams { + + public PIPESParams() { + } + + public PIPESParams(List params) { + super(params); + } + + public PIPESParams(String... params) { + super(params); + } + + @Override + public String toString() { + return StringUtil.join(params.toArray(new String[0]), "|"); + } + } + +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache new file mode 100644 index 00000000000..d0205c3d0b1 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache @@ -0,0 +1,34 @@ +package {{package}}; + +import {{invokerPackage}}.CollectionFormats.*; + +import retrofit.Call; +import retrofit.http.*; +import com.squareup.okhttp.RequestBody; + +{{#imports}}import {{import}}; +{{/imports}} + +{{^fullJavaUtil}} +import java.util.*; +{{/fullJavaUtil}} + +{{#operations}} +public interface {{classname}} { + {{#operation}} + /** + * {{summary}} + * {{notes}} +{{#allParams}} * @param {{paramName}} {{description}} +{{/allParams}} * @return Call<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> + */ + {{#formParams}}{{#-first}} + {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} + @{{httpMethod}}("{{path}}") + Call<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{nickname}}({{^allParams}});{{/allParams}} + {{#allParams}}{{>libraries/retrofit2/queryParams}}{{>libraries/retrofit2/pathParams}}{{>libraries/retrofit2/headerParams}}{{>libraries/retrofit2/bodyParams}}{{>libraries/retrofit2/formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}} + );{{/hasMore}}{{/allParams}} + + {{/operation}} +} +{{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache new file mode 100644 index 00000000000..fec45262e93 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache @@ -0,0 +1,68 @@ +package {{invokerPackage}}.auth; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Response; + +public class ApiKeyAuth implements Interceptor { + private final String location; + private final String paramName; + + private String apiKey; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + @Override + public Response intercept(Chain chain) throws IOException { + String paramValue; + Request request = chain.request(); + + if (location == "query") { + String newQuery = request.uri().getQuery(); + paramValue = paramName + "=" + apiKey; + if (newQuery == null) { + newQuery = paramValue; + } else { + newQuery += "&" + paramValue; + } + + URI newUri; + try { + newUri = new URI(request.uri().getScheme(), request.uri().getAuthority(), + request.uri().getPath(), newQuery, request.uri().getFragment()); + } catch (URISyntaxException e) { + throw new IOException(e); + } + + request = request.newBuilder().url(newUri.toURL()).build(); + } else if (location == "header") { + request = request.newBuilder() + .addHeader(paramName, apiKey) + .build(); + } + return chain.proceed(request); + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache new file mode 100644 index 00000000000..394592f64d9 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache @@ -0,0 +1,49 @@ +package {{invokerPackage}}.auth; + +import java.io.IOException; + +import com.squareup.okhttp.Credentials; +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Response; + +public class HttpBasicAuth implements Interceptor { + + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public void setCredentials(String username, String password) { + this.username = username; + this.password = password; + } + + @Override + public Response intercept(Chain chain) throws IOException { + Request request = chain.request(); + + // If the request already have an authorization (eg. Basic auth), do nothing + if (request.header("Authorization") == null) { + String credentials = Credentials.basic(username, password); + request = request.newBuilder() + .addHeader("Authorization", credentials) + .build(); + } + return chain.proceed(request); + } +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache new file mode 100644 index 00000000000..68ee918601e --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache @@ -0,0 +1,161 @@ +package {{invokerPackage}}.auth; + +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; + +import java.io.IOException; +import java.util.Map; + +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.token.BasicOAuthToken; + +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Request.Builder; +import com.squareup.okhttp.Response; + +public class OAuth implements Interceptor { + + public interface AccessTokenListener { + public void notify(BasicOAuthToken token); + } + + private volatile String accessToken; + private OAuthClient oauthClient; + + private TokenRequestBuilder tokenRequestBuilder; + private AuthenticationRequestBuilder authenticationRequestBuilder; + + private AccessTokenListener accessTokenListener; + + public OAuth( OkHttpClient client, TokenRequestBuilder requestBuilder ) { + this.oauthClient = new OAuthClient(new OAuthOkHttpClient(client)); + this.tokenRequestBuilder = requestBuilder; + } + + public OAuth(TokenRequestBuilder requestBuilder ) { + this(new OkHttpClient(), requestBuilder); + } + + public OAuth(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) { + this(OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)); + setFlow(flow); + authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl); + } + + public void setFlow(OAuthFlow flow) { + switch(flow) { + case accessCode: + case implicit: + tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE); + break; + case password: + tokenRequestBuilder.setGrantType(GrantType.PASSWORD); + break; + case application: + tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS); + break; + default: + break; + } + } + + @Override + public Response intercept(Chain chain) + throws IOException { + + Request request = chain.request(); + + // If the request already have an authorization (eg. Basic auth), do nothing + if (request.header("Authorization") != null) { + return chain.proceed(request); + } + + // If first time, get the token + OAuthClientRequest oAuthRequest; + if (getAccessToken() == null) { + updateAccessToken(null); + } + + // Build the request + Builder rb = request.newBuilder(); + + String requestAccessToken = new String(getAccessToken()); + try { + oAuthRequest = new OAuthBearerClientRequest(request.urlString()) + .setAccessToken(requestAccessToken) + .buildHeaderMessage(); + } catch (OAuthSystemException e) { + throw new IOException(e); + } + + for ( Map.Entry header : oAuthRequest.getHeaders().entrySet() ) { + rb.addHeader(header.getKey(), header.getValue()); + } + rb.url( oAuthRequest.getLocationUri()); + + //Execute the request + Response response = chain.proceed(rb.build()); + + // 401 most likely indicates that access token has expired. + // Time to refresh and resend the request + if ( response.code() == HTTP_UNAUTHORIZED ) { + updateAccessToken(requestAccessToken); + return intercept( chain ); + } + return response; + } + + public synchronized void updateAccessToken(String requestAccessToken) throws IOException { + if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) { + try { + OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); + setAccessToken(accessTokenResponse.getAccessToken()); + if (accessTokenListener != null) { + accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken()); + } + } catch (OAuthSystemException e) { + throw new IOException(e); + } catch (OAuthProblemException e) { + throw new IOException(e); + } + } + } + + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + this.accessTokenListener = accessTokenListener; + } + + public synchronized String getAccessToken() { + return accessToken; + } + + public synchronized void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + + public TokenRequestBuilder getTokenRequestBuilder() { + return tokenRequestBuilder; + } + + public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) { + this.tokenRequestBuilder = tokenRequestBuilder; + } + + public AuthenticationRequestBuilder getAuthenticationRequestBuilder() { + return authenticationRequestBuilder; + } + + public void setAuthenticationRequestBuilder(AuthenticationRequestBuilder authenticationRequestBuilder) { + this.authenticationRequestBuilder = authenticationRequestBuilder; + } + +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache new file mode 100644 index 00000000000..ea195f7df04 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache @@ -0,0 +1,69 @@ +package {{invokerPackage}}.auth; + +import java.io.IOException; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.oltu.oauth2.client.HttpClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; + +import com.squareup.okhttp.MediaType; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.RequestBody; +import com.squareup.okhttp.Response; + + +public class OAuthOkHttpClient implements HttpClient { + + private OkHttpClient client; + + public OAuthOkHttpClient() { + this.client = new OkHttpClient(); + } + + public OAuthOkHttpClient(OkHttpClient client) { + this.client = client; + } + + public T execute(OAuthClientRequest request, Map headers, + String requestMethod, Class responseClass) + throws OAuthSystemException, OAuthProblemException { + + MediaType mediaType = MediaType.parse("application/json"); + Request.Builder requestBuilder = new Request.Builder().url(request.getLocationUri()); + + if(headers != null) { + for (Entry entry : headers.entrySet()) { + if (entry.getKey().equalsIgnoreCase("Content-Type")) { + mediaType = MediaType.parse(entry.getValue()); + } else { + requestBuilder.addHeader(entry.getKey(), entry.getValue()); + } + } + } + + RequestBody body = request.getBody() != null ? RequestBody.create(mediaType, request.getBody()) : null; + requestBuilder.method(requestMethod, body); + + try { + Response response = client.newCall(requestBuilder.build()).execute(); + return OAuthClientResponseFactory.createCustomResponse( + response.body().string(), + response.body().contentType().toString(), + response.code(), + responseClass); + } catch (IOException e) { + throw new OAuthSystemException(e); + } + } + + public void shutdown() { + // Nothing to do here + } + +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache new file mode 100644 index 00000000000..f8788583db5 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache @@ -0,0 +1 @@ +{{#isBodyParam}}@Body {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache new file mode 100644 index 00000000000..b1efe3911a8 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -0,0 +1,106 @@ +group = '{{groupId}}' +version = '{{artifactVersion}}' + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.2' + classpath 'com.github.dcendents:android-maven-plugin:1.2' + } +} + +repositories { + jcenter() +} + + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = '{{artifactId}}' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } +} + +ext { + okhttp_version = "2.5.0" + oltu_version = "1.0.0" + retrofit_version = "2.0.0-beta2" + gson_version = "2.4" + swagger_annotations_version = "1.5.0" + junit_version = "4.12" +} + +dependencies { + compile "com.squareup.okhttp:okhttp:$okhttp_version" + compile "com.squareup.retrofit:retrofit:$retrofit_version" + compile 'com.google.code.gson:gson:$gson_version' + compile 'com.squareup.retrofit:converter-gson:$retrofit_version' + compile "io.swagger:swagger-annotations:$swagger_annotations_version" + compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" + testCompile "junit:junit:$junit_version" +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache new file mode 100644 index 00000000000..8d9208978b5 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache @@ -0,0 +1 @@ +{{#isFormParam}}{{#notFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}\"") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache new file mode 100644 index 00000000000..29206e1546b --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache @@ -0,0 +1 @@ +{{#isHeaderParam}}@Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache new file mode 100644 index 00000000000..0987aa68f34 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache @@ -0,0 +1,58 @@ +package {{package}}; + +import {{invokerPackage}}.StringUtil; +{{#imports}}import {{import}}; +{{/imports}} + +import com.google.gson.annotations.SerializedName; + +{{#serializableModel}} +import java.io.Serializable;{{/serializableModel}} + +import io.swagger.annotations.*; + +{{#models}} + +{{#model}}{{#description}} +/** + * {{description}} + **/{{/description}} +@ApiModel(description = "{{{description}}}") +public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} { + {{#vars}}{{#isEnum}} + +{{>libraries/okhttp-gson/enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}} + +{{>libraries/okhttp-gson/enumClass}}{{/items}}{{/items.isEnum}} + @SerializedName("{{baseName}}") + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}}; + {{/vars}} + + {{#vars}} + /**{{#description}} + * {{{description}}}{{/description}}{{#minimum}} + * minimum: {{minimum}}{{/minimum}}{{#maximum}} + * maximum: {{maximum}}{{/maximum}} + **/ + @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + } + public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { + this.{{name}} = {{name}}; + } + + {{/vars}} + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class {{classname}} {\n"); + {{#parent}}sb.append(" ").append(StringUtil.toIndentedString(super.toString())).append("\n");{{/parent}} + {{#vars}}sb.append(" {{name}}: ").append(StringUtil.toIndentedString({{name}})).append("\n"); + {{/vars}}sb.append("}"); + return sb.toString(); + } +} +{{/model}} +{{/models}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache new file mode 100644 index 00000000000..8a8bdc74c88 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache @@ -0,0 +1 @@ +{{#isPathParam}}@Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache new file mode 100644 index 00000000000..a155d04ef88 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -0,0 +1,158 @@ + + 4.0.0 + {{groupId}} + {{artifactId}} + jar + {{artifactId}} + {{artifactVersion}} + + scm:git:git@github.com:swagger-api/swagger-mustache.git + scm:git:git@github.com:swagger-api/swagger-codegen.git + https://github.com/swagger-api/swagger-codegen + + + 2.2.0 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + pertest + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + jar + test-jar + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add_sources + generate-sources + + add-source + + + + src/main/java + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + + + io.swagger + swagger-annotations + ${swagger-annotations-version} + + + com.squareup.retrofit + retrofit + ${retrofit-version} + + + com.squareup.retrofit + converter-gson + ${retrofit-version} + + + com.google.code.gson + gson + ${gson-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + com.squareup.okhttp + okhttp + ${okhttp-version} + + + + + junit + junit + ${junit-version} + test + + + + 1.5.0 + 2.0.0-beta2 + 2.5.0 + 2.4 + 1.0.0 + 1.0.0 + 4.12 + + diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache new file mode 100644 index 00000000000..3c5b1bb7e69 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache @@ -0,0 +1 @@ +{{#isQueryParam}}@Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..62492222ad2 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000000..f897a7f1cb2 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle new file mode 100644 index 00000000000..0deeeea2e37 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/build.gradle @@ -0,0 +1,106 @@ +group = 'io.swagger' +version = '1.0.0' + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.2' + classpath 'com.github.dcendents:android-maven-plugin:1.2' + } +} + +repositories { + jcenter() +} + + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 22 + buildToolsVersion '22.0.0' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDir + task.destinationDir = project.file("${project.buildDir}/outputs/jar") + task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven' + + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + + install { + repositories.mavenInstaller { + pom.artifactId = 'swagger-petstore-retrofit2' + } + } + + task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } +} + +ext { + okhttp_version = "2.5.0" + oltu_version = "1.0.0" + retrofit_version = "2.0.0-beta2" + gson_version = "2.4" + swagger_annotations_version = "1.5.0" + junit_version = "4.12" +} + +dependencies { + compile "com.squareup.okhttp:okhttp:$okhttp_version" + compile "com.squareup.retrofit:retrofit:$retrofit_version" + compile 'com.google.code.gson:gson:$gson_version' + compile 'com.squareup.retrofit:converter-gson:$retrofit_version' + compile "io.swagger:swagger-annotations:$swagger_annotations_version" + compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" + testCompile "junit:junit:$junit_version" +} diff --git a/samples/client/petstore/java/retrofit2/gradle.properties b/samples/client/petstore/java/retrofit2/gradle.properties new file mode 100644 index 00000000000..05644f0754a --- /dev/null +++ b/samples/client/petstore/java/retrofit2/gradle.properties @@ -0,0 +1,2 @@ +# Uncomment to build for Android +#target = android \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml new file mode 100644 index 00000000000..109cbc0d95c --- /dev/null +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -0,0 +1,158 @@ + + 4.0.0 + io.swagger + swagger-petstore-retrofit2 + jar + swagger-petstore-retrofit2 + 1.0.0 + + scm:git:git@github.com:swagger-api/swagger-mustache.git + scm:git:git@github.com:swagger-api/swagger-codegen.git + https://github.com/swagger-api/swagger-codegen + + + 2.2.0 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + pertest + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + jar + test-jar + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add_sources + generate-sources + + add-source + + + + src/main/java + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + + + io.swagger + swagger-annotations + ${swagger-annotations-version} + + + com.squareup.retrofit + retrofit + ${retrofit-version} + + + com.squareup.retrofit + converter-gson + ${retrofit-version} + + + com.google.code.gson + gson + ${gson-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + com.squareup.okhttp + okhttp + ${okhttp-version} + + + + + junit + junit + ${junit-version} + test + + + + 1.5.0 + 2.0.0-beta2 + 2.5.0 + 2.4 + 1.0.0 + 1.0.0 + 4.12 + + diff --git a/samples/client/petstore/java/retrofit2/settings.gradle b/samples/client/petstore/java/retrofit2/settings.gradle new file mode 100644 index 00000000000..c42bfff90c4 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "swagger-petstore-retrofit2" \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java new file mode 100644 index 00000000000..a58542bf3a9 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java @@ -0,0 +1,342 @@ +package io.swagger.client; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder; + +import retrofit.Converter; +import retrofit.Retrofit; +import retrofit.GsonConverterFactory; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.RequestBody; +import com.squareup.okhttp.ResponseBody; + +import io.swagger.client.auth.HttpBasicAuth; +import io.swagger.client.auth.ApiKeyAuth; +import io.swagger.client.auth.OAuth; +import io.swagger.client.auth.OAuth.AccessTokenListener; +import io.swagger.client.auth.OAuthFlow; + + +public class ApiClient { + + private Map apiAuthorizations; + private OkHttpClient okClient; + private Retrofit.Builder adapterBuilder; + + public ApiClient() { + apiAuthorizations = new LinkedHashMap(); + createDefaultAdapter(); + } + + public ApiClient(String[] authNames) { + this(); + for(String authName : authNames) { + Interceptor auth; + if (authName == "petstore_auth") { + auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); + } else if (authName == "api_key") { + auth = new ApiKeyAuth("header", "api_key"); + } else { + throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); + } + addAuthorization(authName, auth); + } + } + + /** + * Basic constructor for single auth name + * @param authName + */ + public ApiClient(String authName) { + this(new String[]{authName}); + } + + /** + * Helper constructor for single api key + * @param authName + * @param apiKey + */ + public ApiClient(String authName, String apiKey) { + this(authName); + this.setApiKey(apiKey); + } + + /** + * Helper constructor for single basic auth or password oauth2 + * @param authName + * @param username + * @param password + */ + public ApiClient(String authName, String username, String password) { + this(authName); + this.setCredentials(username, password); + } + + /** + * Helper constructor for single password oauth2 + * @param authName + * @param clientId + * @param secret + * @param username + * @param password + */ + public ApiClient(String authName, String clientId, String secret, String username, String password) { + this(authName); + this.getTokenEndPoint() + .setClientId(clientId) + .setClientSecret(secret) + .setUsername(username) + .setPassword(password); + } + + public void createDefaultAdapter() { + Gson gson = new GsonBuilder() + .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") + .create(); + + okClient = new OkHttpClient(); + + String baseUrl = "http://petstore.swagger.io/v2"; + if(!baseUrl.endsWith("/")) + baseUrl = baseUrl + "/"; + + adapterBuilder = new Retrofit + .Builder() + .baseUrl(baseUrl) + .client(okClient) + .addConverterFactory(GsonCustomConverterFactory.create(gson)); + } + + public S createService(Class serviceClass) { + return adapterBuilder.build().create(serviceClass); + + } + + /** + * Helper method to configure the first api key found + * @param apiKey + */ + private void setApiKey(String apiKey) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof ApiKeyAuth) { + ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization; + keyAuth.setApiKey(apiKey); + return; + } + } + } + + /** + * Helper method to configure the username/password for basic auth or password oauth + * @param username + * @param password + */ + private void setCredentials(String username, String password) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof HttpBasicAuth) { + HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization; + basicAuth.setCredentials(username, password); + return; + } + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.getTokenRequestBuilder().setUsername(username).setPassword(password); + return; + } + } + } + + /** + * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one) + * @return + */ + public TokenRequestBuilder getTokenEndPoint() { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + return oauth.getTokenRequestBuilder(); + } + } + return null; + } + + /** + * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one) + * @return + */ + public AuthenticationRequestBuilder getAuthorizationEndPoint() { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + return oauth.getAuthenticationRequestBuilder(); + } + } + return null; + } + + /** + * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one) + * @param accessToken + */ + public void setAccessToken(String accessToken) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.setAccessToken(accessToken); + return; + } + } + } + + /** + * Helper method to configure the oauth accessCode/implicit flow parameters + * @param clientId + * @param clientSecret + * @param redirectURI + */ + public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.getTokenRequestBuilder() + .setClientId(clientId) + .setClientSecret(clientSecret) + .setRedirectURI(redirectURI); + oauth.getAuthenticationRequestBuilder() + .setClientId(clientId) + .setRedirectURI(redirectURI); + return; + } + } + } + + /** + * Configures a listener which is notified when a new access token is received. + * @param accessTokenListener + */ + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + if (apiAuthorization instanceof OAuth) { + OAuth oauth = (OAuth) apiAuthorization; + oauth.registerAccessTokenListener(accessTokenListener); + return; + } + } + } + + /** + * Adds an authorization to be used by the client + * @param authName + * @param authorization + */ + public void addAuthorization(String authName, Interceptor authorization) { + if (apiAuthorizations.containsKey(authName)) { + throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations"); + } + apiAuthorizations.put(authName, authorization); + okClient.interceptors().add(authorization); + } + + public Map getApiAuthorizations() { + return apiAuthorizations; + } + + public void setApiAuthorizations(Map apiAuthorizations) { + this.apiAuthorizations = apiAuthorizations; + } + + public Retrofit.Builder getAdapterBuilder() { + return adapterBuilder; + } + + public void setAdapterBuilder(Retrofit.Builder adapterBuilder) { + this.adapterBuilder = adapterBuilder; + } + + public OkHttpClient getOkClient() { + return okClient; + } + + public void addAuthsToOkClient(OkHttpClient okClient) { + for(Interceptor apiAuthorization : apiAuthorizations.values()) { + okClient.interceptors().add(apiAuthorization); + } + } + + /** + * Clones the okClient given in parameter, adds the auth interceptors and uses it to configure the Retrofit + * @param okClient + */ + public void configureFromOkclient(OkHttpClient okClient) { + OkHttpClient clone = okClient.clone(); + addAuthsToOkClient(clone); + adapterBuilder.client(clone); + } +} + +/** + * This wrapper is to take care of this case: + * when the deserialization fails due to JsonParseException and the + * expected type is String, then just return the body string. + */ +class GsonResponseBodyConverterToString implements Converter { + private final Gson gson; + private final Type type; + + GsonResponseBodyConverterToString(Gson gson, Type type) { + this.gson = gson; + this.type = type; + } + + @Override public T convert(ResponseBody value) throws IOException { + String returned = value.string(); + try { + return gson.fromJson(returned, type); + } + catch (JsonParseException e) { + return (T) returned; + } + } +} + +class GsonCustomConverterFactory extends Converter.Factory +{ + public static GsonCustomConverterFactory create(Gson gson) { + return new GsonCustomConverterFactory(gson); + } + + private final Gson gson; + private final GsonConverterFactory gsonConverterFactory; + + private GsonCustomConverterFactory(Gson gson) { + if (gson == null) throw new NullPointerException("gson == null"); + this.gson = gson; + this.gsonConverterFactory = GsonConverterFactory.create(gson); + } + + @Override + public Converter fromResponseBody(Type type, Annotation[] annotations) { + if(type.equals(String.class)) + return new GsonResponseBodyConverterToString<>(gson, type); + else + return gsonConverterFactory.fromResponseBody(type, annotations); + } + + @Override + public Converter toRequestBody(Type type, Annotation[] annotations) { + return gsonConverterFactory.toRequestBody(type, annotations); + } +} + diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java new file mode 100644 index 00000000000..c3cf5257514 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java @@ -0,0 +1,95 @@ +package io.swagger.client; + +import java.util.Arrays; +import java.util.List; + +public class CollectionFormats { + + public static class CSVParams { + + protected List params; + + public CSVParams() { + } + + public CSVParams(List params) { + this.params = params; + } + + public CSVParams(String... params) { + this.params = Arrays.asList(params); + } + + public List getParams() { + return params; + } + + public void setParams(List params) { + this.params = params; + } + + @Override + public String toString() { + return StringUtil.join(params.toArray(new String[0]), ","); + } + + } + + public static class SSVParams extends CSVParams { + + public SSVParams() { + } + + public SSVParams(List params) { + super(params); + } + + public SSVParams(String... params) { + super(params); + } + + @Override + public String toString() { + return StringUtil.join(params.toArray(new String[0]), " "); + } + } + + public static class TSVParams extends CSVParams { + + public TSVParams() { + } + + public TSVParams(List params) { + super(params); + } + + public TSVParams(String... params) { + super(params); + } + + @Override + public String toString() { + return StringUtil.join( params.toArray(new String[0]), "\t"); + } + } + + public static class PIPESParams extends CSVParams { + + public PIPESParams() { + } + + public PIPESParams(List params) { + super(params); + } + + public PIPESParams(String... params) { + super(params); + } + + @Override + public String toString() { + return StringUtil.join(params.toArray(new String[0]), "|"); + } + } + +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java new file mode 100644 index 00000000000..33dc56510e3 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java @@ -0,0 +1,51 @@ +package io.swagger.client; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-10T03:03:11.515+01:00") +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) return true; + if (value != null && value.equalsIgnoreCase(str)) return true; + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

+ * Note: This might be replaced by utility method from commons-lang or guava someday + * if one of those libraries is added as dependency. + *

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) return ""; + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + public static String toIndentedString(Object o) { + if (o == null) return "null"; + return o.toString().replace("\n", "\n "); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java new file mode 100644 index 00000000000..a55cf74da76 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java @@ -0,0 +1,127 @@ +package io.swagger.client.api; + +import io.swagger.client.CollectionFormats.*; + +import retrofit.Call; +import retrofit.http.*; +import com.squareup.okhttp.RequestBody; + +import io.swagger.client.model.Pet; +import java.io.File; + +import java.util.*; + +public interface PetApi { + + /** + * Update an existing pet + * + * @param body Pet object that needs to be added to the store + * @return Call + */ + + @PUT("pet") + Call updatePet( + @Body Pet body + ); + + + /** + * Add a new pet to the store + * + * @param body Pet object that needs to be added to the store + * @return Call + */ + + @POST("pet") + Call addPet( + @Body Pet body + ); + + + /** + * Finds Pets by status + * Multiple status values can be provided with comma seperated strings + * @param status Status values that need to be considered for filter + * @return Call> + */ + + @GET("pet/findByStatus") + Call> findPetsByStatus( + @Query("status") List status + ); + + + /** + * Finds Pets by tags + * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + * @param tags Tags to filter by + * @return Call> + */ + + @GET("pet/findByTags") + Call> findPetsByTags( + @Query("tags") List tags + ); + + + /** + * Find pet by ID + * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + * @param petId ID of pet that needs to be fetched + * @return Call + */ + + @GET("pet/{petId}") + Call getPetById( + @Path("petId") Long petId + ); + + + /** + * Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated + * @param name Updated name of the pet + * @param status Updated status of the pet + * @return Call + */ + + @FormUrlEncoded + @POST("pet/{petId}") + Call updatePetWithForm( + @Path("petId") String petId, @Field("name") String name, @Field("status") String status + ); + + + /** + * Deletes a pet + * + * @param petId Pet id to delete + * @param apiKey + * @return Call + */ + + @DELETE("pet/{petId}") + Call deletePet( + @Path("petId") Long petId, @Header("api_key") String apiKey + ); + + + /** + * uploads an image + * + * @param petId ID of pet to update + * @param additionalMetadata Additional data to pass to server + * @param file file to upload + * @return Call + */ + + @Multipart + @POST("pet/{petId}/uploadImage") + Call uploadFile( + @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file\"") RequestBody file + ); + + +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java new file mode 100644 index 00000000000..2fca1e02e39 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java @@ -0,0 +1,66 @@ +package io.swagger.client.api; + +import io.swagger.client.CollectionFormats.*; + +import retrofit.Call; +import retrofit.http.*; +import com.squareup.okhttp.RequestBody; + +import java.util.Map; +import io.swagger.client.model.Order; + +import java.util.*; + +public interface StoreApi { + + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + * @return Call> + */ + + @GET("store/inventory") + Call> getInventory(); + + + + /** + * Place an order for a pet + * + * @param body order placed for purchasing the pet + * @return Call + */ + + @POST("store/order") + Call placeOrder( + @Body Order body + ); + + + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * @param orderId ID of pet that needs to be fetched + * @return Call + */ + + @GET("store/order/{orderId}") + Call getOrderById( + @Path("orderId") String orderId + ); + + + /** + * Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * @param orderId ID of the order that needs to be deleted + * @return Call + */ + + @DELETE("store/order/{orderId}") + Call deleteOrder( + @Path("orderId") String orderId + ); + + +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java new file mode 100644 index 00000000000..928bd623020 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java @@ -0,0 +1,120 @@ +package io.swagger.client.api; + +import io.swagger.client.CollectionFormats.*; + +import retrofit.Call; +import retrofit.http.*; +import com.squareup.okhttp.RequestBody; + +import io.swagger.client.model.User; +import java.util.*; + +import java.util.*; + +public interface UserApi { + + /** + * Create user + * This can only be done by the logged in user. + * @param body Created user object + * @return Call + */ + + @POST("user") + Call createUser( + @Body User body + ); + + + /** + * Creates list of users with given input array + * + * @param body List of user object + * @return Call + */ + + @POST("user/createWithArray") + Call createUsersWithArrayInput( + @Body List body + ); + + + /** + * Creates list of users with given input array + * + * @param body List of user object + * @return Call + */ + + @POST("user/createWithList") + Call createUsersWithListInput( + @Body List body + ); + + + /** + * Logs user into the system + * + * @param username The user name for login + * @param password The password for login in clear text + * @return Call + */ + + @GET("user/login") + Call loginUser( + @Query("username") String username, @Query("password") String password + ); + + + /** + * Logs out current logged in user session + * + * @return Call + */ + + @GET("user/logout") + Call logoutUser(); + + + + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. + * @return Call + */ + + @GET("user/{username}") + Call getUserByName( + @Path("username") String username + ); + + + /** + * Updated user + * This can only be done by the logged in user. + * @param username name that need to be deleted + * @param body Updated user object + * @return Call + */ + + @PUT("user/{username}") + Call updateUser( + @Path("username") String username, @Body User body + ); + + + /** + * Delete user + * This can only be done by the logged in user. + * @param username The name that needs to be deleted + * @return Call + */ + + @DELETE("user/{username}") + Call deleteUser( + @Path("username") String username + ); + + +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java new file mode 100644 index 00000000000..59d01238796 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -0,0 +1,68 @@ +package io.swagger.client.auth; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Response; + +public class ApiKeyAuth implements Interceptor { + private final String location; + private final String paramName; + + private String apiKey; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + @Override + public Response intercept(Chain chain) throws IOException { + String paramValue; + Request request = chain.request(); + + if (location == "query") { + String newQuery = request.uri().getQuery(); + paramValue = paramName + "=" + apiKey; + if (newQuery == null) { + newQuery = paramValue; + } else { + newQuery += "&" + paramValue; + } + + URI newUri; + try { + newUri = new URI(request.uri().getScheme(), request.uri().getAuthority(), + request.uri().getPath(), newQuery, request.uri().getFragment()); + } catch (URISyntaxException e) { + throw new IOException(e); + } + + request = request.newBuilder().url(newUri.toURL()).build(); + } else if (location == "header") { + request = request.newBuilder() + .addHeader(paramName, apiKey) + .build(); + } + return chain.proceed(request); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java new file mode 100644 index 00000000000..cb7c617767b --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java @@ -0,0 +1,49 @@ +package io.swagger.client.auth; + +import java.io.IOException; + +import com.squareup.okhttp.Credentials; +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Response; + +public class HttpBasicAuth implements Interceptor { + + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public void setCredentials(String username, String password) { + this.username = username; + this.password = password; + } + + @Override + public Response intercept(Chain chain) throws IOException { + Request request = chain.request(); + + // If the request already have an authorization (eg. Basic auth), do nothing + if (request.header("Authorization") == null) { + String credentials = Credentials.basic(username, password); + request = request.newBuilder() + .addHeader("Authorization", credentials) + .build(); + } + return chain.proceed(request); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java new file mode 100644 index 00000000000..80614f0f56a --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java @@ -0,0 +1,161 @@ +package io.swagger.client.auth; + +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; + +import java.io.IOException; +import java.util.Map; + +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.token.BasicOAuthToken; + +import com.squareup.okhttp.Interceptor; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Request.Builder; +import com.squareup.okhttp.Response; + +public class OAuth implements Interceptor { + + public interface AccessTokenListener { + public void notify(BasicOAuthToken token); + } + + private volatile String accessToken; + private OAuthClient oauthClient; + + private TokenRequestBuilder tokenRequestBuilder; + private AuthenticationRequestBuilder authenticationRequestBuilder; + + private AccessTokenListener accessTokenListener; + + public OAuth( OkHttpClient client, TokenRequestBuilder requestBuilder ) { + this.oauthClient = new OAuthClient(new OAuthOkHttpClient(client)); + this.tokenRequestBuilder = requestBuilder; + } + + public OAuth(TokenRequestBuilder requestBuilder ) { + this(new OkHttpClient(), requestBuilder); + } + + public OAuth(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) { + this(OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)); + setFlow(flow); + authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl); + } + + public void setFlow(OAuthFlow flow) { + switch(flow) { + case accessCode: + case implicit: + tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE); + break; + case password: + tokenRequestBuilder.setGrantType(GrantType.PASSWORD); + break; + case application: + tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS); + break; + default: + break; + } + } + + @Override + public Response intercept(Chain chain) + throws IOException { + + Request request = chain.request(); + + // If the request already have an authorization (eg. Basic auth), do nothing + if (request.header("Authorization") != null) { + return chain.proceed(request); + } + + // If first time, get the token + OAuthClientRequest oAuthRequest; + if (getAccessToken() == null) { + updateAccessToken(null); + } + + // Build the request + Builder rb = request.newBuilder(); + + String requestAccessToken = new String(getAccessToken()); + try { + oAuthRequest = new OAuthBearerClientRequest(request.urlString()) + .setAccessToken(requestAccessToken) + .buildHeaderMessage(); + } catch (OAuthSystemException e) { + throw new IOException(e); + } + + for ( Map.Entry header : oAuthRequest.getHeaders().entrySet() ) { + rb.addHeader(header.getKey(), header.getValue()); + } + rb.url( oAuthRequest.getLocationUri()); + + //Execute the request + Response response = chain.proceed(rb.build()); + + // 401 most likely indicates that access token has expired. + // Time to refresh and resend the request + if ( response.code() == HTTP_UNAUTHORIZED ) { + updateAccessToken(requestAccessToken); + return intercept( chain ); + } + return response; + } + + public synchronized void updateAccessToken(String requestAccessToken) throws IOException { + if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) { + try { + OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage()); + setAccessToken(accessTokenResponse.getAccessToken()); + if (accessTokenListener != null) { + accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken()); + } + } catch (OAuthSystemException e) { + throw new IOException(e); + } catch (OAuthProblemException e) { + throw new IOException(e); + } + } + } + + public void registerAccessTokenListener(AccessTokenListener accessTokenListener) { + this.accessTokenListener = accessTokenListener; + } + + public synchronized String getAccessToken() { + return accessToken; + } + + public synchronized void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + + public TokenRequestBuilder getTokenRequestBuilder() { + return tokenRequestBuilder; + } + + public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) { + this.tokenRequestBuilder = tokenRequestBuilder; + } + + public AuthenticationRequestBuilder getAuthenticationRequestBuilder() { + return authenticationRequestBuilder; + } + + public void setAuthenticationRequestBuilder(AuthenticationRequestBuilder authenticationRequestBuilder) { + this.authenticationRequestBuilder = authenticationRequestBuilder; + } + +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java new file mode 100644 index 00000000000..597ec99b48b --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java @@ -0,0 +1,5 @@ +package io.swagger.client.auth; + +public enum OAuthFlow { + accessCode, implicit, password, application +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java new file mode 100644 index 00000000000..c872901ba24 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java @@ -0,0 +1,69 @@ +package io.swagger.client.auth; + +import java.io.IOException; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.oltu.oauth2.client.HttpClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; + +import com.squareup.okhttp.MediaType; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.RequestBody; +import com.squareup.okhttp.Response; + + +public class OAuthOkHttpClient implements HttpClient { + + private OkHttpClient client; + + public OAuthOkHttpClient() { + this.client = new OkHttpClient(); + } + + public OAuthOkHttpClient(OkHttpClient client) { + this.client = client; + } + + public T execute(OAuthClientRequest request, Map headers, + String requestMethod, Class responseClass) + throws OAuthSystemException, OAuthProblemException { + + MediaType mediaType = MediaType.parse("application/json"); + Request.Builder requestBuilder = new Request.Builder().url(request.getLocationUri()); + + if(headers != null) { + for (Entry entry : headers.entrySet()) { + if (entry.getKey().equalsIgnoreCase("Content-Type")) { + mediaType = MediaType.parse(entry.getValue()); + } else { + requestBuilder.addHeader(entry.getKey(), entry.getValue()); + } + } + } + + RequestBody body = request.getBody() != null ? RequestBody.create(mediaType, request.getBody()) : null; + requestBuilder.method(requestMethod, body); + + try { + Response response = client.newCall(requestBuilder.build()).execute(); + return OAuthClientResponseFactory.createCustomResponse( + response.body().string(), + response.body().contentType().toString(), + response.code(), + responseClass); + } catch (IOException e) { + throw new OAuthSystemException(e); + } + } + + public void shutdown() { + // Nothing to do here + } + +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java new file mode 100644 index 00000000000..0a7023ac7a5 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java @@ -0,0 +1,57 @@ +package io.swagger.client.model; + +import io.swagger.client.StringUtil; + +import com.google.gson.annotations.SerializedName; + + + +import io.swagger.annotations.*; + + + +@ApiModel(description = "") +public class Category { + + @SerializedName("id") + private Long id = null; + + @SerializedName("name") + private String name = null; + + + + /** + **/ + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Category {\n"); + + sb.append(" id: ").append(StringUtil.toIndentedString(id)).append("\n"); + sb.append(" name: ").append(StringUtil.toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java new file mode 100644 index 00000000000..df8e77b6fb3 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java @@ -0,0 +1,142 @@ +package io.swagger.client.model; + +import io.swagger.client.StringUtil; +import java.util.Date; + +import com.google.gson.annotations.SerializedName; + + + +import io.swagger.annotations.*; + + + +@ApiModel(description = "") +public class Order { + + @SerializedName("id") + private Long id = null; + + @SerializedName("petId") + private Long petId = null; + + @SerializedName("quantity") + private Integer quantity = null; + + @SerializedName("shipDate") + private Date shipDate = null; + + +public enum StatusEnum { + @SerializedName("placed") + PLACED("placed"), + + @SerializedName("approved") + APPROVED("approved"), + + @SerializedName("delivered") + DELIVERED("delivered"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } +} + + @SerializedName("status") + private StatusEnum status = null; + + @SerializedName("complete") + private Boolean complete = null; + + + + /** + **/ + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Long getPetId() { + return petId; + } + public void setPetId(Long petId) { + this.petId = petId; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Integer getQuantity() { + return quantity; + } + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Date getShipDate() { + return shipDate; + } + public void setShipDate(Date shipDate) { + this.shipDate = shipDate; + } + + + /** + * Order Status + **/ + @ApiModelProperty(value = "Order Status") + public StatusEnum getStatus() { + return status; + } + public void setStatus(StatusEnum status) { + this.status = status; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Boolean getComplete() { + return complete; + } + public void setComplete(Boolean complete) { + this.complete = complete; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Order {\n"); + + sb.append(" id: ").append(StringUtil.toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(StringUtil.toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(StringUtil.toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(StringUtil.toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(StringUtil.toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(StringUtil.toIndentedString(complete)).append("\n"); + sb.append("}"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java new file mode 100644 index 00000000000..9ab5457e26a --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java @@ -0,0 +1,144 @@ +package io.swagger.client.model; + +import io.swagger.client.StringUtil; +import io.swagger.client.model.Category; +import java.util.*; +import io.swagger.client.model.Tag; + +import com.google.gson.annotations.SerializedName; + + + +import io.swagger.annotations.*; + + + +@ApiModel(description = "") +public class Pet { + + @SerializedName("id") + private Long id = null; + + @SerializedName("category") + private Category category = null; + + @SerializedName("name") + private String name = null; + + @SerializedName("photoUrls") + private List photoUrls = new ArrayList(); + + @SerializedName("tags") + private List tags = new ArrayList(); + + +public enum StatusEnum { + @SerializedName("available") + AVAILABLE("available"), + + @SerializedName("pending") + PENDING("pending"), + + @SerializedName("sold") + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } +} + + @SerializedName("status") + private StatusEnum status = null; + + + + /** + **/ + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Category getCategory() { + return category; + } + public void setCategory(Category category) { + this.category = category; + } + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public List getPhotoUrls() { + return photoUrls; + } + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + + /** + **/ + @ApiModelProperty(value = "") + public List getTags() { + return tags; + } + public void setTags(List tags) { + this.tags = tags; + } + + + /** + * pet status in the store + **/ + @ApiModelProperty(value = "pet status in the store") + public StatusEnum getStatus() { + return status; + } + public void setStatus(StatusEnum status) { + this.status = status; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + + sb.append(" id: ").append(StringUtil.toIndentedString(id)).append("\n"); + sb.append(" category: ").append(StringUtil.toIndentedString(category)).append("\n"); + sb.append(" name: ").append(StringUtil.toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(StringUtil.toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(StringUtil.toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(StringUtil.toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java new file mode 100644 index 00000000000..9935b744f2d --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java @@ -0,0 +1,57 @@ +package io.swagger.client.model; + +import io.swagger.client.StringUtil; + +import com.google.gson.annotations.SerializedName; + + + +import io.swagger.annotations.*; + + + +@ApiModel(description = "") +public class Tag { + + @SerializedName("id") + private Long id = null; + + @SerializedName("name") + private String name = null; + + + + /** + **/ + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Tag {\n"); + + sb.append(" id: ").append(StringUtil.toIndentedString(id)).append("\n"); + sb.append(" name: ").append(StringUtil.toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java new file mode 100644 index 00000000000..cba6abef8dd --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java @@ -0,0 +1,148 @@ +package io.swagger.client.model; + +import io.swagger.client.StringUtil; + +import com.google.gson.annotations.SerializedName; + + + +import io.swagger.annotations.*; + + + +@ApiModel(description = "") +public class User { + + @SerializedName("id") + private Long id = null; + + @SerializedName("username") + private String username = null; + + @SerializedName("firstName") + private String firstName = null; + + @SerializedName("lastName") + private String lastName = null; + + @SerializedName("email") + private String email = null; + + @SerializedName("password") + private String password = null; + + @SerializedName("phone") + private String phone = null; + + @SerializedName("userStatus") + private Integer userStatus = null; + + + + /** + **/ + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getFirstName() { + return firstName; + } + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getLastName() { + return lastName; + } + public void setLastName(String lastName) { + this.lastName = lastName; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + + + /** + * User Status + **/ + @ApiModelProperty(value = "User Status") + public Integer getUserStatus() { + return userStatus; + } + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + + sb.append(" id: ").append(StringUtil.toIndentedString(id)).append("\n"); + sb.append(" username: ").append(StringUtil.toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(StringUtil.toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(StringUtil.toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(StringUtil.toIndentedString(email)).append("\n"); + sb.append(" password: ").append(StringUtil.toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(StringUtil.toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(StringUtil.toIndentedString(userStatus)).append("\n"); + sb.append("}"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java new file mode 100644 index 00000000000..8522c4f30ad --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java @@ -0,0 +1,160 @@ +package io.swagger.petstore.test; + +import io.swagger.client.ApiClient; +import io.swagger.client.api.*; +import io.swagger.client.model.*; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.*; + +import retrofit.Response; + +import com.squareup.okhttp.MediaType; +import com.squareup.okhttp.RequestBody; + +import static org.junit.Assert.*; + +public class PetApiTest { + PetApi api = null; + + @Before + public void setup() { + api = new ApiClient().createService(PetApi.class); + } + + @Test + public void testCreateAndGetPet() throws Exception { + Pet pet = createRandomPet(); + Response rp2 = api.addPet(pet).execute(); + + Response rp = api.getPetById(pet.getId()).execute(); + Pet fetched = rp.body(); + assertNotNull(fetched); + assertEquals(pet.getId(), fetched.getId()); + assertNotNull(fetched.getCategory()); + assertEquals(fetched.getCategory().getName(), pet.getCategory().getName()); + } + + @Test + public void testUpdatePet() throws Exception { + Pet pet = createRandomPet(); + pet.setName("programmer"); + + api.updatePet(pet).execute(); + + Pet fetched = api.getPetById(pet.getId()).execute().body(); + assertNotNull(fetched); + assertEquals(pet.getId(), fetched.getId()); + assertNotNull(fetched.getCategory()); + assertEquals(fetched.getCategory().getName(), pet.getCategory().getName()); + } + + @Test + public void testFindPetsByStatus() throws Exception { + Pet pet = createRandomPet(); + pet.setName("programmer"); + pet.setStatus(Pet.StatusEnum.AVAILABLE); + + api.updatePet(pet).execute(); + + List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})).execute().body(); + assertNotNull(pets); + + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } + + assertTrue(found); + } + + @Test + public void testFindPetsByTags() throws Exception { + Pet pet = createRandomPet(); + pet.setName("monster"); + pet.setStatus(Pet.StatusEnum.AVAILABLE); + + List tags = new ArrayList(); + Tag tag1 = new Tag(); + tag1.setName("friendly"); + tags.add(tag1); + pet.setTags(tags); + + api.updatePet(pet).execute(); + + List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})).execute().body(); + assertNotNull(pets); + + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } + assertTrue(found); + } + + @Test + public void testUpdatePetWithForm() throws Exception { + Pet pet = createRandomPet(); + pet.setName("frank"); + api.addPet(pet).execute(); + + Pet fetched = api.getPetById(pet.getId()).execute().body(); + + api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null).execute(); + Pet updated = api.getPetById(fetched.getId()).execute().body(); + + assertEquals(updated.getName(), "furt"); + } + + @Test + public void testDeletePet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet).execute(); + + Pet fetched = api.getPetById(pet.getId()).execute().body(); + api.deletePet(fetched.getId(), null).execute(); + + assertFalse(api.getPetById(fetched.getId()).execute().isSuccess()); + } + + @Test + public void testUploadFile() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet).execute(); + + File file = new File("hello.txt"); + BufferedWriter writer = new BufferedWriter(new FileWriter(file)); + writer.write("Hello world!"); + writer.close(); + + api.uploadFile(pet.getId(), "a test file", RequestBody.create(MediaType.parse("text/plain"), file)).execute(); + } + + private Pet createRandomPet() { + Pet pet = new Pet(); + pet.setId(System.currentTimeMillis()); + pet.setName("gorilla"); + + Category category = new Category(); + category.setName("really-happy"); + + pet.setCategory(category); + pet.setStatus(Pet.StatusEnum.AVAILABLE); + List photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}); + pet.setPhotoUrls(photos); + + return pet; + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java new file mode 100644 index 00000000000..786b0708702 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -0,0 +1,64 @@ +package io.swagger.petstore.test; + +import io.swagger.client.ApiClient; +import io.swagger.client.api.*; +import io.swagger.client.model.*; + +import java.util.Map; + +import org.junit.*; + +import retrofit.Response; +import static org.junit.Assert.*; + +public class StoreApiTest { + StoreApi api = null; + + @Before + public void setup() { + api = new ApiClient().createService(StoreApi.class); + } + + @Test + public void testGetInventory() throws Exception { + Map inventory = api.getInventory().execute().body(); + assertTrue(inventory.keySet().size() > 0); + } + + @Test + public void testPlaceOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order).execute(); + + Order fetched = api.getOrderById(String.valueOf(order.getId())).execute().body(); + assertEquals(order.getId(), fetched.getId()); + assertEquals(order.getPetId(), fetched.getPetId()); + assertEquals(order.getQuantity(), fetched.getQuantity()); + } + + @Test + public void testDeleteOrder() throws Exception { + Order order = createOrder(); + Response aa = api.placeOrder(order).execute(); + + Order fetched = api.getOrderById(String.valueOf(order.getId())).execute().body(); + assertEquals(fetched.getId(), order.getId()); + + api.deleteOrder(String.valueOf(order.getId())).execute(); + + api.getOrderById(String.valueOf(order.getId())).execute(); + //also in retrofit 1 should return an error but don't, check server api impl. + } + + private Order createOrder() { + Order order = new Order(); + order.setId(new Long(System.currentTimeMillis())); + order.setPetId(new Long(200)); + order.setQuantity(new Integer(13)); + order.setShipDate(new java.util.Date()); + order.setStatus(Order.StatusEnum.PLACED); + order.setComplete(true); + + return order; + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java new file mode 100644 index 00000000000..d496144c9f2 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -0,0 +1,84 @@ +package io.swagger.petstore.test; + +import io.swagger.client.ApiClient; +import io.swagger.client.api.*; +import io.swagger.client.model.*; + + +import java.util.Arrays; + +import org.junit.*; +import static org.junit.Assert.*; + +public class UserApiTest { + UserApi api = null; + + @Before + public void setup() { + api = new ApiClient().createService(UserApi.class); + } + + @Test + public void testCreateUser() throws Exception { + User user = createUser(); + + api.createUser(user).execute(); + + User fetched = api.getUserByName(user.getUsername()).execute().body(); + assertEquals(user.getId(), fetched.getId()); + } + + @Test + public void testCreateUsersWithArray() throws Exception { + User user1 = createUser(); + user1.setUsername("abc123"); + User user2 = createUser(); + user2.setUsername("123abc"); + + api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2})).execute(); + + User fetched = api.getUserByName(user1.getUsername()).execute().body(); + assertEquals(user1.getId(), fetched.getId()); + } + + @Test + public void testCreateUsersWithList() throws Exception { + User user1 = createUser(); + user1.setUsername("abc123"); + User user2 = createUser(); + user2.setUsername("123abc"); + + api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2})).execute(); + + User fetched = api.getUserByName(user1.getUsername()).execute().body(); + assertEquals(user1.getId(), fetched.getId()); + } + + @Test + public void testLoginUser() throws Exception { + User user = createUser(); + api.createUser(user).execute(); + + String token = api.loginUser(user.getUsername(), user.getPassword()).execute().body(); + assertTrue(token.startsWith("logged in user session:")); + } + + @Test + public void logoutUser() throws Exception { + api.logoutUser().execute(); + } + + private User createUser() { + User user = new User(); + user.setId(System.currentTimeMillis()); + user.setUsername("fred"); + user.setFirstName("Fred"); + user.setLastName("Meyer"); + user.setEmail("fred@fredmeyer.com"); + user.setPassword("xxXXxx"); + user.setPhone("408-867-5309"); + user.setUserStatus(123); + + return user; + } +} \ No newline at end of file From aaafd0632cc90d4ff348b34a271c4f9a788dbb3b Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 10 Nov 2015 12:04:29 +0800 Subject: [PATCH 101/142] Fix error with array of enum in Java client ref: https://github.com/swagger-api/swagger-codegen/pull/1457#issuecomment-155185530 --- .../io/swagger/codegen/languages/JavaClientCodegen.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 4e6f1b9910a..31b963cf142 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -496,7 +496,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { } allowableValues.put("enumVars", enumVars); // handle default value for enum, e.g. available => StatusEnum.AVAILABLE - if (var.defaultValue != null && !"null".equals(var.defaultValue)) { + if (var.defaultValue != null) { String enumName = null; for (Map enumVar : enumVars) { if (var.defaultValue.equals(enumVar.get("value"))) { @@ -504,10 +504,9 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { break; } } - if (enumName == null) { - throw new RuntimeException("default value of property \"" + var.baseName + "\" is not in allowed values: " + var.defaultValue); + if (enumName != null) { + var.defaultValue = var.datatypeWithEnum + "." + enumName; } - var.defaultValue = var.datatypeWithEnum + "." + enumName; } } } From c07e30b8cf487282680f33693fc77cda917272ab Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 10 Nov 2015 13:22:06 +0800 Subject: [PATCH 102/142] Update testCreateUser to avoid occasional failures --- .../src/test/java/io/swagger/petstore/test/UserApiTest.java | 2 +- .../src/test/java/io/swagger/petstore/test/UserApiTest.java | 2 +- .../src/test/java/io/swagger/petstore/test/UserApiTest.java | 2 +- .../src/test/java/io/swagger/petstore/test/UserApiTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java index 26e46bfa602..a3f257f568b 100644 --- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -73,7 +73,7 @@ public class UserApiTest { private User createUser() { User user = new User(); user.setId(System.currentTimeMillis()); - user.setUsername("fred"); + user.setUsername("fred" + user.getId()); user.setFirstName("Fred"); user.setLastName("Meyer"); user.setEmail("fred@fredmeyer.com"); diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java index 26e46bfa602..a3f257f568b 100644 --- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -73,7 +73,7 @@ public class UserApiTest { private User createUser() { User user = new User(); user.setId(System.currentTimeMillis()); - user.setUsername("fred"); + user.setUsername("fred" + user.getId()); user.setFirstName("Fred"); user.setLastName("Meyer"); user.setEmail("fred@fredmeyer.com"); diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java index 26e46bfa602..a3f257f568b 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -73,7 +73,7 @@ public class UserApiTest { private User createUser() { User user = new User(); user.setId(System.currentTimeMillis()); - user.setUsername("fred"); + user.setUsername("fred" + user.getId()); user.setFirstName("Fred"); user.setLastName("Meyer"); user.setEmail("fred@fredmeyer.com"); diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java index 373218465f0..f99d7f513cc 100644 --- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -71,7 +71,7 @@ public class UserApiTest { private User createUser() { User user = new User(); user.setId(System.currentTimeMillis()); - user.setUsername("fred"); + user.setUsername("fred" + user.getId()); user.setFirstName("Fred"); user.setLastName("Meyer"); user.setEmail("fred@fredmeyer.com"); From 521b73b3ef33b74b2db9efca89ec9f159f66910b Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Tue, 10 Nov 2015 09:47:58 +0100 Subject: [PATCH 103/142] Apply the singleton pattern to ApiClient - make the api_client a singleton - remove it from the configuration namespace --- .../src/main/resources/perl/ApiClient.mustache | 4 +++- .../src/main/resources/perl/ApiFactory.mustache | 2 +- .../src/main/resources/perl/Configuration.mustache | 1 - .../src/main/resources/perl/api.mustache | 3 +-- samples/client/petstore/perl/README.md | 2 +- .../petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm | 4 +++- .../petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm | 2 +- .../perl/lib/WWW/SwaggerClient/Configuration.pm | 1 - .../petstore/perl/lib/WWW/SwaggerClient/PetApi.pm | 3 +-- .../petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm | 3 +-- .../petstore/perl/lib/WWW/SwaggerClient/UserApi.pm | 3 +-- samples/client/petstore/perl/t/01_pet_api.t | 10 ++++++++-- samples/client/petstore/perl/t/02_store_api.t | 2 +- samples/client/petstore/perl/t/03_api_factory.t | 3 +++ 14 files changed, 25 insertions(+), 18 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index 89e5650759a..ae8dce3d351 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -20,7 +20,9 @@ use Module::Runtime qw(use_module); use WWW::{{moduleName}}::Configuration; -sub new +use base 'Class::Singleton'; + +sub _new_instance { my $class = shift; my (%args) = ( diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache index 724ad63b048..cb619091ca3 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache @@ -65,7 +65,7 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } sub new { my ($class, %p) = (shift, @_); - $p{api_client} = WWW::{{moduleName}}::ApiClient->new(%p); + $p{api_client} = WWW::{{moduleName}}::ApiClient->instance(%p); return bless \%p, $class; } diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache index d0b8b2c0e68..d0cc157647f 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache @@ -10,7 +10,6 @@ use Carp; use constant VERSION => '{{moduleVersion}}'; # class/static variables -our $api_client; our $http_timeout = 180; our $http_user_agent = 'Perl-Swagger'; diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index a93cbc2b4a4..e31f2f32d6c 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO sub new { my $class = shift; - my $default_api_client = $WWW::{{moduleName}}::Configuration::api_client ? $WWW::{{moduleName}}::Configuration::api_client : WWW::{{moduleName}}::ApiClient->new; my (%self) = ( - 'api_client' => $default_api_client, + 'api_client' => WWW::{{moduleName}}::ApiClient->instance, @_ ); diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index 54c8b861eda..a04d5a0aad6 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -10,7 +10,7 @@ WWW::SwaggerClient::ApiFactory for non-Moosey usage. # SYNOPSIS The Perl Swagger Codegen project builds a library of Perl modules to interact with -a web service defined by a Swagger specification. See below for how to built the +a web service defined by a Swagger specification. See below for how to build the library. This module provides an interface to the generated library. All the classes, diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index 8b51bd3c97b..d3568c812e4 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -20,7 +20,9 @@ use Module::Runtime qw(use_module); use WWW::SwaggerClient::Configuration; -sub new +use base 'Class::Singleton'; + +sub _new_instance { my $class = shift; my (%args) = ( diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm index bf3617d86f1..77c23fdb2b3 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm @@ -65,7 +65,7 @@ my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ } sub new { my ($class, %p) = (shift, @_); - $p{api_client} = WWW::SwaggerClient::ApiClient->new(%p); + $p{api_client} = WWW::SwaggerClient::ApiClient->instance(%p); return bless \%p, $class; } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm index 6a4afe254e0..91670003518 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm @@ -10,7 +10,6 @@ use Carp; use constant VERSION => '1.0.0'; # class/static variables -our $api_client; our $http_timeout = 180; our $http_user_agent = 'Perl-Swagger'; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 0404c9c74be..813e73468a2 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO sub new { my $class = shift; - my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new; my (%self) = ( - 'api_client' => $default_api_client, + 'api_client' => WWW::SwaggerClient::ApiClient->instance, @_ ); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index d8cd0cbff7d..533c2e77a26 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO sub new { my $class = shift; - my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new; my (%self) = ( - 'api_client' => $default_api_client, + 'api_client' => WWW::SwaggerClient::ApiClient->instance, @_ ); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index 18d69ed5883..5d1f7f33f1b 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO sub new { my $class = shift; - my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new; my (%self) = ( - 'api_client' => $default_api_client, + 'api_client' => WWW::SwaggerClient::ApiClient->instance, @_ ); diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t index 5460c3282b2..c7bcdf98a0a 100644 --- a/samples/client/petstore/perl/t/01_pet_api.t +++ b/samples/client/petstore/perl/t/01_pet_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 37; +use Test::More tests => 38; use Test::Exception; use lib 'lib'; @@ -11,12 +11,18 @@ use_ok('WWW::SwaggerClient::Object::Pet'); use_ok('WWW::SwaggerClient::Object::Tag'); use_ok('WWW::SwaggerClient::Object::Category'); -my $api_client = WWW::SwaggerClient::ApiClient->new('base_url' => 'http://testing'); +my $api_client = WWW::SwaggerClient::ApiClient->instance('base_url' => 'http://testing'); my $pet_api = WWW::SwaggerClient::PetApi->new('api_client' => $api_client); is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base URL from api client'; my $api = WWW::SwaggerClient::PetApi->new(); +is $api->{api_client}->{base_url}, 'http://testing', 'we still get the original base URL from api client, because it\'s a singleton'; + +# reset the base_url - no direct access because an application shouldn't be changing +# its base URL halfway through +$api->{api_client}->{base_url} = 'http://petstore.swagger.io/v2'; + is $api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client'; # test select_header_content_type diff --git a/samples/client/petstore/perl/t/02_store_api.t b/samples/client/petstore/perl/t/02_store_api.t index dfee5c46839..39b18381b0e 100644 --- a/samples/client/petstore/perl/t/02_store_api.t +++ b/samples/client/petstore/perl/t/02_store_api.t @@ -15,7 +15,7 @@ use_ok('WWW::SwaggerClient::Object::Category'); use_ok('WWW::SwaggerClient::Object::User'); -my $api_client = WWW::SwaggerClient::ApiClient->new(); +my $api_client = WWW::SwaggerClient::ApiClient->instance(); my $store_api = WWW::SwaggerClient::StoreApi->new('api_client' => $api_client); is $store_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client'; diff --git a/samples/client/petstore/perl/t/03_api_factory.t b/samples/client/petstore/perl/t/03_api_factory.t index 2e6ee6317f9..a06805e2bcf 100644 --- a/samples/client/petstore/perl/t/03_api_factory.t +++ b/samples/client/petstore/perl/t/03_api_factory.t @@ -15,6 +15,9 @@ is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base UR $api_factory = WWW::SwaggerClient::ApiFactory->new; $pet_api = $api_factory->get_api('Pet'); +# reset the base_url - no direct access because an application shouldn't be changing +# its base URL halfway through +$pet_api->{api_client}->{base_url} = 'http://petstore.swagger.io/v2'; is $pet_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client'; # test accessor methods From 47f4396fb7bd24ed36cab8ac16ca9d59736b0e49 Mon Sep 17 00:00:00 2001 From: Emiliano Bonassi Date: Tue, 10 Nov 2015 12:30:13 +0100 Subject: [PATCH 104/142] - fix source/target java version to 1.6 - add test profile for CI --- .../Java/libraries/retrofit2/ApiClient.mustache | 2 +- pom.xml | 12 ++++++++++++ .../retrofit2/.settings/org.eclipse.jdt.core.prefs | 12 ------------ .../src/main/java/io/swagger/client/ApiClient.java | 2 +- .../src/main/java/io/swagger/client/StringUtil.java | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache index f9f7d77f470..56e83f7d915 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache @@ -330,7 +330,7 @@ class GsonCustomConverterFactory extends Converter.Factory @Override public Converter fromResponseBody(Type type, Annotation[] annotations) { if(type.equals(String.class)) - return new GsonResponseBodyConverterToString<>(gson, type); + return new GsonResponseBodyConverterToString(gson, type); else return gsonConverterFactory.fromResponseBody(type, annotations); } diff --git a/pom.xml b/pom.xml index 94d4741f185..31a34489f15 100644 --- a/pom.xml +++ b/pom.xml @@ -353,6 +353,18 @@ samples/client/petstore/java/retrofit + + java-client-retrofit2 + + + env + java + + + + samples/client/petstore/java/retrofit2 + + scala-client diff --git a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 62492222ad2..00000000000 --- a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java index a58542bf3a9..2138c3a172b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java @@ -329,7 +329,7 @@ class GsonCustomConverterFactory extends Converter.Factory @Override public Converter fromResponseBody(Type type, Annotation[] annotations) { if(type.equals(String.class)) - return new GsonResponseBodyConverterToString<>(gson, type); + return new GsonResponseBodyConverterToString(gson, type); else return gsonConverterFactory.fromResponseBody(type, annotations); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java index 33dc56510e3..5125ae3e55b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-10T03:03:11.515+01:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-10T12:25:26.227+01:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). From e104803781270b91c964a2cc17dbaeb1e11e35ea Mon Sep 17 00:00:00 2001 From: Emiliano Bonassi Date: Tue, 10 Nov 2015 12:39:30 +0100 Subject: [PATCH 105/142] fix pom.xml added retrofit2 as a module --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 31a34489f15..e6d319c42d7 100644 --- a/pom.xml +++ b/pom.xml @@ -439,6 +439,7 @@ samples/client/petstore/java/jersey2 samples/client/petstore/java/okhttp-gson samples/client/petstore/java/retrofit + samples/client/petstore/java/retrofit2 samples/client/petstore/scala samples/server/petstore/spring-mvc From 77b9f51927c86cc6f97d17ea5ec266e6901cf584 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Tue, 10 Nov 2015 14:22:32 +0100 Subject: [PATCH 106/142] More documentation, and clean up a couple of ragged edges - added documentation for configuring authentication - made auth_setup_handler() optional - get_api_key_with_prefix() is more self-documenting --- .../main/resources/perl/ApiClient.mustache | 18 ++-- .../main/resources/perl/ApiFactory.mustache | 3 + .../src/main/resources/perl/README.md | 89 +++++++++++++---- .../src/main/resources/perl/Role.mustache | 99 ++++++++++++++----- samples/client/petstore/perl/README.md | 89 +++++++++++++---- .../perl/lib/WWW/SwaggerClient/ApiClient.pm | 18 ++-- .../perl/lib/WWW/SwaggerClient/ApiFactory.pm | 3 + .../perl/lib/WWW/SwaggerClient/Role.pm | 99 ++++++++++++++----- 8 files changed, 312 insertions(+), 106 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index ae8dce3d351..6e88d7967c2 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -290,13 +290,15 @@ sub select_header_content_type # @return string API key with the prefix sub get_api_key_with_prefix { - my ($self, $api_key) = @_; - if ($WWW::{{moduleName}}::Configuration::api_key_prefix->{$api_key}) { - return $WWW::{{moduleName}}::Configuration::api_key_prefix->{$api_key}." ".$WWW::{{moduleName}}::Configuration::api_key->{$api_key}; - } else { - return $WWW::{{moduleName}}::Configuration::api_key->{$api_key}; - } -} + my ($self, $key_name) = @_; + + my $api_key = $WWW::{{moduleName}}::Configuration::api_key->{$key_name}; + + return unless $api_key; + + my $prefix = $WWW::{{moduleName}}::Configuration::api_key_prefix->{$key_name}; + return $prefix ? "$prefix $api_key" : $api_key; +} # update header and query param based on authentication setting # @@ -306,7 +308,7 @@ sub get_api_key_with_prefix sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; - # we can defer to the application + # we can defer to the application if the spec doesn't describe authentication if ($self->{auth_setup_handler_object}) { $self->{auth_setup_handler_object}->auth_setup_handler( api_client => $self, diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache index cb619091ca3..c38028fb37a 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache @@ -61,6 +61,9 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } The method should implement the required auth policy, for example, by setting secret keys in the header, or username and password in the URL, etc. + This is only necessary when the API specification itself does not describe + authentication. + =cut sub new { diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index 3cc2fda6528..16df3de6217 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -19,21 +19,15 @@ role. package MyApp; use Moose; - has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); with 'WWW::{{moduleName}}::Role'; - sub auth_setup_handler {...} package main; - my $api = MyApp->new({username => $username, password => $password}); + my $api = MyApp->new; my $pet = $api->get_pet_by_id(pet_id => $pet_id); -Notice that you need to provide the code to accept the parameters passed in to `new()` -(by setting up attributes via the `has` keyword). They should be used by -`auth_setup_handler()` to configure authentication (see below). - ## Structure of the library The library consists of a set of API classes, one for each endpoint. These APIs @@ -50,14 +44,74 @@ factory object, should you need it. For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. +## Configuring authentication + +If your Swagger spec does not describe authentication, you can write an +`auth_setup_handler()` method in your base class to handle it (see below). + +In the normal case, the Swagger spec will describe what parameters are required +and where to put them. You just need to supply the authorization tokens. + +These should go in the `WWW::{{moduleName}}::Configuration` namespace as follows. +Note these are all optional, and depend on the API you are accessing. + +- `$WWW::{{moduleName}}::Configuration::username` + + String. The username for basic auth. + +- `$WWW::{{moduleName}}::Configuration::password` + + String. The password for basic auth. + +- `$WWW::{{moduleName}}::Configuration::api_key` + + Hashref. Keyed on the name of each key (there can be multiple tokens). + + $WWW::{{moduleName}}::Configuration::api_key = { + secretKey => 'aaaabbbbccccdddd', + anotherKey => '1111222233334444', + }; + +- `$WWW::{{moduleName}}::Configuration::api_key_prefix` + + Hashref. Keyed on the name of each key (there can be multiple tokens). Note not + all api keys require a prefix. + + $WWW::{{moduleName}}::Configuration::api_key_prefix = { + secretKey => 'string', + anotherKey => 'same or some other string', + }; + +- `$WWW::{{moduleName}}::Configuration::access_token` + + String. The OAuth access token. + # METHODS ## `auth_setup_handler()` -This method is NOT provided - you must write it yourself. Its task is to configure -authentication for each request. +This method does not exist! But if you add it to the class that consumes this +role, it will be called to set up authentication. -The method is called on your `$api` object and passed the following parameters: + package MyApp; + use Moose; + + with 'WWW::{{moduleName}}::Role'; + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + + # somewhere else... + + my $api = MyApp->new; + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + +So, `auth_setup_handler()` will be called on your `$api` object and passed the +following parameters: - `header_params` @@ -71,25 +125,18 @@ The method is called on your `$api` object and passed the following parameters: - `auth_settings` - TODO. + TODO. Probably not necessary? - `api_client` A reference to the `WWW::{{moduleName}}::ApiClient` object that is responsible - for communicating with the server. - -For example: - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } + for communicating with the server. Just in case that's useful. ## base\_url The generated code has the `base_url` already set as a default value. This method -returns (and optionally sets) the current value of `base_url`. +returns (and optionally sets, but only if the API client has not been +created yet) the current value of `base_url`. ## api\_factory diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 951f05bab74..4ece1bd092e 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -7,8 +7,6 @@ use Class::Inspector; use Log::Any qw($log); use WWW::{{moduleName}}::ApiFactory; -requires 'auth_setup_handler'; - has base_url => ( is => 'ro', required => 0, isa => 'Str', @@ -64,7 +62,8 @@ sub BUILD { sub _build_af { my $self = shift; - my %args = ( auth_setup_handler_object => $self ); + my %args; + $args{auth_setup_handler_object} = $self if $self->can('auth_setup_handler'); $args{base_url} = $self->base_url if $self->base_url; return WWW::{{moduleName}}::ApiFactory->new(%args); } @@ -90,20 +89,14 @@ role. package MyApp; use Moose; - has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); with 'WWW::{{moduleName}}::Role'; - sub auth_setup_handler {...} package main; - my $api = MyApp->new({username => $username, password => $password}); + my $api = MyApp->new; my $pet = $api->get_pet_by_id(pet_id => $pet_id); -Notice that you need to provide the code to accept the parameters passed in to C -(by setting up attributes via the C keyword). They should be used by -C to configure authentication (see below). - =head2 Structure of the library The library consists of a set of API classes, one for each endpoint. These APIs @@ -120,14 +113,79 @@ factory object, should you need it. For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. +=head2 Configuring authentication + +If your Swagger spec does not describe authentication, you can write an +C method in your base class to handle it (see below). + +In the normal case, the Swagger spec will describe what parameters are required +and where to put them. You just need to supply the authorization tokens. + +These should go in the C namespace as follows. +Note these are all optional, and depend on the API you are accessing. + +=over 4 + +=item C<$WWW::{{moduleName}}::Configuration::username> + +String. The username for basic auth. + +=item C<$WWW::{{moduleName}}::Configuration::password> + +String. The password for basic auth. + +=item C<$WWW::{{moduleName}}::Configuration::api_key> + +Hashref. Keyed on the name of each key (there can be multiple tokens). + + $WWW::{{moduleName}}::Configuration::api_key = { + secretKey => 'aaaabbbbccccdddd', + anotherKey => '1111222233334444', + }; + +=item C<$WWW::{{moduleName}}::Configuration::api_key_prefix> + +Hashref. Keyed on the name of each key (there can be multiple tokens). Note not +all api keys require a prefix. + + $WWW::{{moduleName}}::Configuration::api_key_prefix = { + secretKey => 'string', + anotherKey => 'same or some other string', + }; + +=item C<$WWW::{{moduleName}}::Configuration::access_token> + +String. The OAuth access token. + +=back + =head1 METHODS =head2 C -This method is NOT provided - you must write it yourself. Its task is to configure -authentication for each request. +This method does not exist! But if you add it to the class that consumes this +role, it will be called to set up authentication. -The method is called on your C<$api> object and passed the following parameters: + package MyApp; + use Moose; + + with 'WWW::{{moduleName}}::Role'; + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + + # somewhere else... + + my $api = MyApp->new; + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + + +So, C will be called on your C<$api> object and passed the +following parameters: =over 4 @@ -143,27 +201,20 @@ parameters. =item C -TODO. +TODO. Probably not necessary? =item C A reference to the C object that is responsible -for communicating with the server. +for communicating with the server. Just in case that's useful. =back -For example: - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } - =head2 base_url The generated code has the C already set as a default value. This method -returns (and optionally sets) the current value of C. +returns (and optionally sets, but only if the API client has not been +created yet) the current value of C. =head2 api_factory diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index a04d5a0aad6..1e0091fcc6b 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -19,21 +19,15 @@ role. package MyApp; use Moose; - has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); with 'WWW::SwaggerClient::Role'; - sub auth_setup_handler {...} package main; - my $api = MyApp->new({username => $username, password => $password}); + my $api = MyApp->new; my $pet = $api->get_pet_by_id(pet_id => $pet_id); -Notice that you need to provide the code to accept the parameters passed in to `new()` -(by setting up attributes via the `has` keyword). They should be used by -`auth_setup_handler()` to configure authentication (see below). - ## Structure of the library The library consists of a set of API classes, one for each endpoint. These APIs @@ -50,14 +44,74 @@ factory object, should you need it. For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. +## Configuring authentication + +If your Swagger spec does not describe authentication, you can write an +`auth_setup_handler()` method in your base class to handle it (see below). + +In the normal case, the Swagger spec will describe what parameters are required +and where to put them. You just need to supply the authorization tokens. + +These should go in the `WWW::SwaggerClient::Configuration` namespace as follows. +Note these are all optional, and depend on the API you are accessing. + +- `$WWW::SwaggerClient::Configuration::username` + + String. The username for basic auth. + +- `$WWW::SwaggerClient::Configuration::password` + + String. The password for basic auth. + +- `$WWW::SwaggerClient::Configuration::api_key` + + Hashref. Keyed on the name of each key (there can be multiple tokens). + + $WWW::SwaggerClient::Configuration::api_key = { + secretKey => 'aaaabbbbccccdddd', + anotherKey => '1111222233334444', + }; + +- `$WWW::SwaggerClient::Configuration::api_key_prefix` + + Hashref. Keyed on the name of each key (there can be multiple tokens). Note not + all api keys require a prefix. + + $WWW::SwaggerClient::Configuration::api_key_prefix = { + secretKey => 'string', + anotherKey => 'same or some other string', + }; + +- `$WWW::SwaggerClient::Configuration::access_token` + + String. The OAuth access token. + # METHODS ## `auth_setup_handler()` -This method is NOT provided - you must write it yourself. Its task is to configure -authentication for each request. +This method does not exist! But if you add it to the class that consumes this +role, it will be called to set up authentication. -The method is called on your `$api` object and passed the following parameters: + package MyApp; + use Moose; + + with 'WWW::SwaggerClient::Role'; + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + + # somewhere else... + + my $api = MyApp->new; + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + +So, `auth_setup_handler()` will be called on your `$api` object and passed the +following parameters: - `header_params` @@ -71,25 +125,18 @@ The method is called on your `$api` object and passed the following parameters: - `auth_settings` - TODO. + TODO. Probably not necessary? - `api_client` A reference to the `WWW::SwaggerClient::ApiClient` object that is responsible - for communicating with the server. - -For example: - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } + for communicating with the server. Just in case that's useful. ## base\_url The generated code has the `base_url` already set as a default value. This method -returns (and optionally sets) the current value of `base_url`. +returns (and optionally sets, but only if the API client has not been +created yet) the current value of `base_url`. ## api\_factory diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index d3568c812e4..e34fffe7848 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -290,13 +290,15 @@ sub select_header_content_type # @return string API key with the prefix sub get_api_key_with_prefix { - my ($self, $api_key) = @_; - if ($WWW::SwaggerClient::Configuration::api_key_prefix->{$api_key}) { - return $WWW::SwaggerClient::Configuration::api_key_prefix->{$api_key}." ".$WWW::SwaggerClient::Configuration::api_key->{$api_key}; - } else { - return $WWW::SwaggerClient::Configuration::api_key->{$api_key}; - } -} + my ($self, $key_name) = @_; + + my $api_key = $WWW::SwaggerClient::Configuration::api_key->{$key_name}; + + return unless $api_key; + + my $prefix = $WWW::SwaggerClient::Configuration::api_key_prefix->{$key_name}; + return $prefix ? "$prefix $api_key" : $api_key; +} # update header and query param based on authentication setting # @@ -306,7 +308,7 @@ sub get_api_key_with_prefix sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; - # we can defer to the application + # we can defer to the application if the spec doesn't describe authentication if ($self->{auth_setup_handler_object}) { $self->{auth_setup_handler_object}->auth_setup_handler( api_client => $self, diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm index 77c23fdb2b3..b428e503b9e 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm @@ -61,6 +61,9 @@ my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ } The method should implement the required auth policy, for example, by setting secret keys in the header, or username and password in the URL, etc. + This is only necessary when the API specification itself does not describe + authentication. + =cut sub new { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index 2b8969b3e3f..b66a6bd2e27 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -7,8 +7,6 @@ use Class::Inspector; use Log::Any qw($log); use WWW::SwaggerClient::ApiFactory; -requires 'auth_setup_handler'; - has base_url => ( is => 'ro', required => 0, isa => 'Str', @@ -64,7 +62,8 @@ sub BUILD { sub _build_af { my $self = shift; - my %args = ( auth_setup_handler_object => $self ); + my %args; + $args{auth_setup_handler_object} = $self if $self->can('auth_setup_handler'); $args{base_url} = $self->base_url if $self->base_url; return WWW::SwaggerClient::ApiFactory->new(%args); } @@ -90,20 +89,14 @@ role. package MyApp; use Moose; - has [qw(username password)] => ( is => 'ro', required => 1, isa => 'Str' ); with 'WWW::SwaggerClient::Role'; - sub auth_setup_handler {...} package main; - my $api = MyApp->new({username => $username, password => $password}); + my $api = MyApp->new; my $pet = $api->get_pet_by_id(pet_id => $pet_id); -Notice that you need to provide the code to accept the parameters passed in to C -(by setting up attributes via the C keyword). They should be used by -C to configure authentication (see below). - =head2 Structure of the library The library consists of a set of API classes, one for each endpoint. These APIs @@ -120,14 +113,79 @@ factory object, should you need it. For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. +=head2 Configuring authentication + +If your Swagger spec does not describe authentication, you can write an +C method in your base class to handle it (see below). + +In the normal case, the Swagger spec will describe what parameters are required +and where to put them. You just need to supply the authorization tokens. + +These should go in the C namespace as follows. +Note these are all optional, and depend on the API you are accessing. + +=over 4 + +=item C<$WWW::SwaggerClient::Configuration::username> + +String. The username for basic auth. + +=item C<$WWW::SwaggerClient::Configuration::password> + +String. The password for basic auth. + +=item C<$WWW::SwaggerClient::Configuration::api_key> + +Hashref. Keyed on the name of each key (there can be multiple tokens). + + $WWW::SwaggerClient::Configuration::api_key = { + secretKey => 'aaaabbbbccccdddd', + anotherKey => '1111222233334444', + }; + +=item C<$WWW::SwaggerClient::Configuration::api_key_prefix> + +Hashref. Keyed on the name of each key (there can be multiple tokens). Note not +all api keys require a prefix. + + $WWW::SwaggerClient::Configuration::api_key_prefix = { + secretKey => 'string', + anotherKey => 'same or some other string', + }; + +=item C<$WWW::SwaggerClient::Configuration::access_token> + +String. The OAuth access token. + +=back + =head1 METHODS =head2 C -This method is NOT provided - you must write it yourself. Its task is to configure -authentication for each request. +This method does not exist! But if you add it to the class that consumes this +role, it will be called to set up authentication. -The method is called on your C<$api> object and passed the following parameters: + package MyApp; + use Moose; + + with 'WWW::SwaggerClient::Role'; + + sub auth_setup_handler { + my ($self, %p) = @_; + $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; + $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; + } + + # somewhere else... + + my $api = MyApp->new; + + my $pet = $api->get_pet_by_id(pet_id => $pet_id); + + +So, C will be called on your C<$api> object and passed the +following parameters: =over 4 @@ -143,27 +201,20 @@ parameters. =item C -TODO. +TODO. Probably not necessary? =item C A reference to the C object that is responsible -for communicating with the server. +for communicating with the server. Just in case that's useful. =back -For example: - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } - =head2 base_url The generated code has the C already set as a default value. This method -returns (and optionally sets) the current value of C. +returns (and optionally sets, but only if the API client has not been +created yet) the current value of C. =head2 api_factory From 06db67210cd527612d4b80c2ccde92e05e9ac09d Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Tue, 10 Nov 2015 14:50:22 +0100 Subject: [PATCH 107/142] Tiny doc tweak --- .../src/main/resources/perl/README.md | 15 ++++++++------- .../src/main/resources/perl/Role.mustache | 15 ++++++++------- samples/client/petstore/perl/README.md | 15 ++++++++------- .../petstore/perl/lib/WWW/SwaggerClient/Role.pm | 15 ++++++++------- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index 16df3de6217..7603c39f07a 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -148,10 +148,10 @@ Returns an API factory object. You probably won't need to call this directly. # MISSING METHODS -Most of the methods on the API are delegated to individual sub-API objects (e.g. -Pet API, Store API, User API etc). Where different sub-APIs use the same method -name (e.g. `new()`), these methods can't be delegated. So you need to call -`$api->pet_api->new()`. +Most of the methods on the API are delegated to individual endpoint API objects +(e.g. Pet API, Store API, User API etc). Where different endpoint APIs use the +same method name (e.g. `new()`), these methods can't be delegated. So you need +to call `$api->pet_api->new()`. In principle, every API is susceptible to the presence of a few, random, undelegatable method names. In practice, because of the way method names are constructed, it's @@ -161,9 +161,10 @@ unlikely in general that any methods will be undelegatable, except for: class_documentation() method_documentation() -To call these methods, you need to get a handle on the relevant object, either -by calling `$api->foo_api` or by retrieving an object, e.g. -`$api->get_pet_by_id(pet_id => $pet_id)`. +To call these methods, you need to get a handle on the relevant object, either +by calling `$api->foo_api` or by retrieving an object, e.g. +`$api->get_pet_by_id(pet_id => $pet_id)`. They are class methods, so +you could also call them on class names. # BUILDING YOUR LIBRARY diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 4ece1bd092e..41a6de7ff36 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -226,10 +226,10 @@ Returns an API factory object. You probably won't need to call this directly. =head1 MISSING METHODS -Most of the methods on the API are delegated to individual sub-API objects (e.g. -Pet API, Store API, User API etc). Where different sub-APIs use the same method -name (e.g. C), these methods can't be delegated. So you need to call -C<$api-Epet_api-Enew()>. +Most of the methods on the API are delegated to individual endpoint API objects +(e.g. Pet API, Store API, User API etc). Where different endpoint APIs use the +same method name (e.g. C), these methods can't be delegated. So you need +to call C<$api-Epet_api-Enew()>. In principle, every API is susceptible to the presence of a few, random, undelegatable method names. In practice, because of the way method names are constructed, it's @@ -239,9 +239,10 @@ unlikely in general that any methods will be undelegatable, except for: class_documentation() method_documentation() -To call these methods, you need to get a handle on the relevant object, either -by calling C<$api-Efoo_api> or by retrieving an object, e.g. -C<$api-Eget_pet_by_id(pet_id =E $pet_id)>. +To call these methods, you need to get a handle on the relevant object, either +by calling C<$api-Efoo_api> or by retrieving an object, e.g. +C<$api-Eget_pet_by_id(pet_id =E $pet_id)>. They are class methods, so +you could also call them on class names. =head1 BUILDING YOUR LIBRARY diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index 1e0091fcc6b..d436e81c292 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -148,10 +148,10 @@ Returns an API factory object. You probably won't need to call this directly. # MISSING METHODS -Most of the methods on the API are delegated to individual sub-API objects (e.g. -Pet API, Store API, User API etc). Where different sub-APIs use the same method -name (e.g. `new()`), these methods can't be delegated. So you need to call -`$api->pet_api->new()`. +Most of the methods on the API are delegated to individual endpoint API objects +(e.g. Pet API, Store API, User API etc). Where different endpoint APIs use the +same method name (e.g. `new()`), these methods can't be delegated. So you need +to call `$api->pet_api->new()`. In principle, every API is susceptible to the presence of a few, random, undelegatable method names. In practice, because of the way method names are constructed, it's @@ -161,9 +161,10 @@ unlikely in general that any methods will be undelegatable, except for: class_documentation() method_documentation() -To call these methods, you need to get a handle on the relevant object, either -by calling `$api->foo_api` or by retrieving an object, e.g. -`$api->get_pet_by_id(pet_id => $pet_id)`. +To call these methods, you need to get a handle on the relevant object, either +by calling `$api->foo_api` or by retrieving an object, e.g. +`$api->get_pet_by_id(pet_id => $pet_id)`. They are class methods, so +you could also call them on class names. # BUILDING YOUR LIBRARY diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index b66a6bd2e27..51d477f9954 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -226,10 +226,10 @@ Returns an API factory object. You probably won't need to call this directly. =head1 MISSING METHODS -Most of the methods on the API are delegated to individual sub-API objects (e.g. -Pet API, Store API, User API etc). Where different sub-APIs use the same method -name (e.g. C), these methods can't be delegated. So you need to call -C<$api-Epet_api-Enew()>. +Most of the methods on the API are delegated to individual endpoint API objects +(e.g. Pet API, Store API, User API etc). Where different endpoint APIs use the +same method name (e.g. C), these methods can't be delegated. So you need +to call C<$api-Epet_api-Enew()>. In principle, every API is susceptible to the presence of a few, random, undelegatable method names. In practice, because of the way method names are constructed, it's @@ -239,9 +239,10 @@ unlikely in general that any methods will be undelegatable, except for: class_documentation() method_documentation() -To call these methods, you need to get a handle on the relevant object, either -by calling C<$api-Efoo_api> or by retrieving an object, e.g. -C<$api-Eget_pet_by_id(pet_id =E $pet_id)>. +To call these methods, you need to get a handle on the relevant object, either +by calling C<$api-Efoo_api> or by retrieving an object, e.g. +C<$api-Eget_pet_by_id(pet_id =E $pet_id)>. They are class methods, so +you could also call them on class names. =head1 BUILDING YOUR LIBRARY From cf8d8deacd0366a8bd63deed61cacbe049d6bf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20One=C8=9B?= Date: Fri, 9 Oct 2015 11:38:21 +0300 Subject: [PATCH 108/142] For each object and a decoder that can handle an array of objects. Otherwise REST endpoints that return a list of resources can't be used. --- .../swagger-codegen/src/main/resources/swift/Models.mustache | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache index f6df790ea94..af8f5c875a7 100644 --- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache @@ -118,6 +118,10 @@ class Decoders { fatalError("formatter failed to parse \(sourceString)") } {{#models}}{{#model}} + // Decoder for [{{{classname}}}] + Decoders.addDecoder(clazz: [{{{classname}}}].self) { (source: AnyObject) -> [{{{classname}}}] in + return Decoders.decode(clazz: [{{{classname}}}].self, source: source) + } // Decoder for {{{classname}}} Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in let sourceDictionary = source as! [NSObject:AnyObject] From cbd1b98bf53928e6c9979a4536ddcaa6260ef522 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 11 Nov 2015 16:35:17 +0800 Subject: [PATCH 109/142] better scala test (UserApi) --- .../scala/src/test/scala/UserApiTest.scala | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala index ea0fda03d9a..f965510344f 100644 --- a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala @@ -11,21 +11,41 @@ import scala.collection.JavaConverters._ import scala.beans.BeanProperty @RunWith(classOf[JUnitRunner]) -class UserApiTest extends FlatSpec with Matchers { +class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { behavior of "UserApi" val api = new UserApi api.apiInvoker.defaultHeaders += "api_key" -> "special-key" + // preparation before running a test + override def beforeAll() { + val user = User( + 11222, + "scala-test-username", + "scala-test-first", + "scala-test-last", + "scala_test@fail.com", + "SCALATEST", + "408-867-5309", + 1) + + api.createUser(user) + } + + // cleanup after running a test + override def afterAll() { + api.deleteUser("scala-test-username") + } + it should "fetch a user" in { - api.getUserByName("user1") match { + api.getUserByName("scala-test") match { case Some(user) => { - user.id should be(1) - user.username should be("user1") - user.password should be("XXXXXXXXXXX") - user.email should be("email1@test.com") - user.firstName should be("first name 1") - user.lastName should be("last name 1") - user.phone should be("123-456-7890") + user.id should be(11222) + user.username should be("scala-test-username") + user.password should be("SCALATEST") + user.email should be("scala_test@fail.com") + user.firstName should be("scala-test-first") + user.lastName should be("scala-test-last") + user.phone should be("408-867-5309") user.userStatus should be(1) } case None => @@ -33,7 +53,7 @@ class UserApiTest extends FlatSpec with Matchers { } it should "authenticate a user" in { - api.loginUser("user1", "XXXXXXXXXXX") match { + api.loginUser("scala-test-username", "SCALATEST") match { case Some(status) => status.startsWith("logged in user session") match { case true => // success! case _ => fail("didn't get expected message " + status) @@ -46,28 +66,6 @@ class UserApiTest extends FlatSpec with Matchers { api.logoutUser } - it should "create a user" in { - val user = User( - 1002, - "johnny", - "Johnny", - "Rocket", - "johnny@fail.com", - "XXXXXXXXXXX", - "408-867-5309", - 1) - - api.createUser(user) - - api.getUserByName("johnny") match { - case Some(user) => { - user.id should be(1002) - user.username should be("johnny") - } - case None => - } - } - it should "create 2 users" in { val userArray = (for (i <- (1 to 2)) yield { User( @@ -149,4 +147,4 @@ class UserApiTest extends FlatSpec with Matchers { case None => } } -} \ No newline at end of file +} From 05efd193c0e8c966bae90bd1a07317f578ee2232 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 11 Nov 2015 16:42:00 +0800 Subject: [PATCH 110/142] update test username for scala --- samples/client/petstore/scala/src/test/scala/UserApiTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala index f965510344f..77614a5dbbb 100644 --- a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala @@ -37,7 +37,7 @@ class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { } it should "fetch a user" in { - api.getUserByName("scala-test") match { + api.getUserByName("scala-test-username") match { case Some(user) => { user.id should be(11222) user.username should be("scala-test-username") From 2886ca0312a0b71600ab3bc3f019955e630a1e61 Mon Sep 17 00:00:00 2001 From: aersamkull Date: Wed, 11 Nov 2015 11:54:42 +0100 Subject: [PATCH 111/142] Adds comments to TypeScript Generator --- .../src/main/resources/TypeScript-Angular/api.mustache | 7 ++++++- .../src/main/resources/TypeScript-node/api.mustache | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index 000ed2707b3..fc787b6437f 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -33,7 +33,12 @@ namespace {{package}} { } {{#operation}} - + /** + * {{summary}} + * {{notes}} + {{#allParams}}* @param {{paramName}} {{description}} + {{/allParams}} + */ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> { const path = this.basePath + '{{path}}'{{#pathParams}} .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index e2a440bb846..266dbaa412f 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -167,7 +167,12 @@ export class {{classname}} { return objA; } {{#operation}} - + /** + * {{summary}} + * {{notes}} + {{#allParams}}* @param {{paramName}} {{description}} + {{/allParams}} + */ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> { const path = this.url + this.basePath + '{{path}}'{{#pathParams}} .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; From d125b9c490011f743631771de15cd0d33441b345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20One=C8=9B?= Date: Wed, 11 Nov 2015 12:07:10 +0200 Subject: [PATCH 112/142] Update swift petstore client. --- samples/client/petstore/swift/Cartfile | 2 +- .../petstore/swift/PetstoreClient.podspec | 2 +- .../Classes/Swaggers/APIs.swift | 13 +- .../Classes/Swaggers/APIs/PetAPI.swift | 147 +++++++++--------- .../Classes/Swaggers/APIs/StoreAPI.swift | 72 ++++----- .../Classes/Swaggers/APIs/UserAPI.swift | 8 +- .../Swaggers/AlamofireImplementations.swift | 18 +-- .../Classes/Swaggers/Models.swift | 20 +++ .../Classes/Swaggers/Models/Category.swift | 2 + .../Classes/Swaggers/Models/Order.swift | 2 + .../Classes/Swaggers/Models/Pet.swift | 2 + .../Classes/Swaggers/Models/Tag.swift | 2 + .../Classes/Swaggers/Models/User.swift | 2 + 13 files changed, 162 insertions(+), 130 deletions(-) diff --git a/samples/client/petstore/swift/Cartfile b/samples/client/petstore/swift/Cartfile index fbd9346e468..745e00376a8 100644 --- a/samples/client/petstore/swift/Cartfile +++ b/samples/client/petstore/swift/Cartfile @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" >= 2.0.0 +github "Alamofire/Alamofire" >= 3.0.0 github "mxcl/PromiseKit" >=1.5.3 diff --git a/samples/client/petstore/swift/PetstoreClient.podspec b/samples/client/petstore/swift/PetstoreClient.podspec index 473b130c40c..3caf12083de 100644 --- a/samples/client/petstore/swift/PetstoreClient.podspec +++ b/samples/client/petstore/swift/PetstoreClient.podspec @@ -7,5 +7,5 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift' s.dependency 'PromiseKit', '~> 2.1' - s.dependency 'Alamofire', '~> 2.0.0' + s.dependency 'Alamofire', '~> 3.0.0' end diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift index 73c923e6486..06155db0201 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift @@ -7,8 +7,9 @@ import Foundation public class PetstoreClientAPI { - static let basePath = "http://petstore.swagger.io/v2" - static var credential: NSURLCredential? + public static var basePath = "http://petstore.swagger.io/v2" + public static var credential: NSURLCredential? + public static var customHeaders: [String:String] = [:] static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory() } @@ -41,6 +42,14 @@ public class RequestBuilder { self.URLString = URLString self.parameters = parameters self.isBody = isBody + + addHeaders(PetstoreClientAPI.customHeaders) + } + + public func addHeaders(aHeaders:[String:String]) { + for (header, value) in aHeaders { + headers[header] = value + } } public func execute(completion: (response: Response?, erorr: ErrorType?) -> Void) { } diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift index 614e70b717e..ea6c50e2549 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift @@ -71,20 +71,20 @@ extension PetstoreClientAPI { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example=[ { - "tags" : [ { - "id" : 123456789, - "name" : "aeiou" - } ], + - examples: [{contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 123456789, "category" : { - "id" : 123456789, - "name" : "aeiou" + "name" : "aeiou", + "id" : 123456789 }, - "status" : "aeiou", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}, {example= + "tags" : [ { + "name" : "aeiou", + "id" : 123456789 + } ], + "status" : "aeiou" +} ]}, {contentType=application/xml, example= 123456 doggie @@ -93,21 +93,21 @@ extension PetstoreClientAPI { string -, contentType=application/xml}] - - examples: [{example=[ { - "tags" : [ { - "id" : 123456789, - "name" : "aeiou" - } ], +}] + - examples: [{contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 123456789, "category" : { - "id" : 123456789, - "name" : "aeiou" + "name" : "aeiou", + "id" : 123456789 }, - "status" : "aeiou", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}, {example= + "tags" : [ { + "name" : "aeiou", + "id" : 123456789 + } ], + "status" : "aeiou" +} ]}, {contentType=application/xml, example= 123456 doggie @@ -116,7 +116,7 @@ extension PetstoreClientAPI { string -, contentType=application/xml}] +}] - parameter status: (query) Status values that need to be considered for filter @@ -145,20 +145,20 @@ extension PetstoreClientAPI { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example=[ { - "tags" : [ { - "id" : 123456789, - "name" : "aeiou" - } ], + - examples: [{contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 123456789, "category" : { - "id" : 123456789, - "name" : "aeiou" + "name" : "aeiou", + "id" : 123456789 }, - "status" : "aeiou", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}, {example= + "tags" : [ { + "name" : "aeiou", + "id" : 123456789 + } ], + "status" : "aeiou" +} ]}, {contentType=application/xml, example= 123456 doggie @@ -167,21 +167,21 @@ extension PetstoreClientAPI { string -, contentType=application/xml}] - - examples: [{example=[ { - "tags" : [ { - "id" : 123456789, - "name" : "aeiou" - } ], +}] + - examples: [{contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 123456789, "category" : { - "id" : 123456789, - "name" : "aeiou" + "name" : "aeiou", + "id" : 123456789 }, - "status" : "aeiou", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}, {example= + "tags" : [ { + "name" : "aeiou", + "id" : 123456789 + } ], + "status" : "aeiou" +} ]}, {contentType=application/xml, example= 123456 doggie @@ -190,7 +190,7 @@ extension PetstoreClientAPI { string -, contentType=application/xml}] +}] - parameter tags: (query) Tags to filter by @@ -219,23 +219,20 @@ extension PetstoreClientAPI { - API Key: - type: apiKey api_key - name: api_key - - OAuth: - - type: oauth2 - - name: petstore_auth - - examples: [{example={ - "tags" : [ { - "id" : 123456789, - "name" : "aeiou" - } ], + - examples: [{contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 123456789, "category" : { - "id" : 123456789, - "name" : "aeiou" + "name" : "aeiou", + "id" : 123456789 }, - "status" : "aeiou", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}, {example= + "tags" : [ { + "name" : "aeiou", + "id" : 123456789 + } ], + "status" : "aeiou" +}}, {contentType=application/xml, example= 123456 doggie @@ -244,21 +241,21 @@ extension PetstoreClientAPI { string -, contentType=application/xml}] - - examples: [{example={ - "tags" : [ { - "id" : 123456789, - "name" : "aeiou" - } ], +}] + - examples: [{contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 123456789, "category" : { - "id" : 123456789, - "name" : "aeiou" + "name" : "aeiou", + "id" : 123456789 }, - "status" : "aeiou", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}, {example= + "tags" : [ { + "name" : "aeiou", + "id" : 123456789 + } ], + "status" : "aeiou" +}}, {contentType=application/xml, example= 123456 doggie @@ -267,7 +264,7 @@ extension PetstoreClientAPI { string -, contentType=application/xml}] +}] - parameter petId: (path) ID of pet that needs to be fetched diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift index 92cedda725e..949cad20310 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift @@ -21,12 +21,12 @@ extension PetstoreClientAPI { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example={ + - examples: [{contentType=application/json, example={ "key" : 123 -}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}] - - examples: [{example={ +}}, {contentType=application/xml, example=not implemented io.swagger.models.properties.MapProperty@d1e580af}] + - examples: [{contentType=application/json, example={ "key" : 123 -}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}] +}}, {contentType=application/xml, example=not implemented io.swagger.models.properties.MapProperty@d1e580af}] - returns: RequestBuilder<[String:Int]> */ @@ -48,36 +48,36 @@ extension PetstoreClientAPI { - POST /store/order - - - examples: [{example={ - "id" : 123456789, + - examples: [{contentType=application/json, example={ "petId" : 123456789, - "complete" : true, - "status" : "aeiou", "quantity" : 123, - "shipDate" : "2015-10-20T06:12:32.347+0000" -}, contentType=application/json}, {example= + "id" : 123456789, + "shipDate" : "2015-11-11T10:03:22.835+0000", + "complete" : true, + "status" : "aeiou" +}}, {contentType=application/xml, example= 123456 123456 0 - 2015-10-19T23:12:32.350Z + 2015-11-11T12:03:22.838Z string true -, contentType=application/xml}] - - examples: [{example={ - "id" : 123456789, +}] + - examples: [{contentType=application/json, example={ "petId" : 123456789, - "complete" : true, - "status" : "aeiou", "quantity" : 123, - "shipDate" : "2015-10-20T06:12:32.347+0000" -}, contentType=application/json}, {example= + "id" : 123456789, + "shipDate" : "2015-11-11T10:03:22.835+0000", + "complete" : true, + "status" : "aeiou" +}}, {contentType=application/xml, example= 123456 123456 0 - 2015-10-19T23:12:32.350Z + 2015-11-11T12:03:22.838Z string true -, contentType=application/xml}] +}] - parameter body: (body) order placed for purchasing the pet @@ -100,36 +100,36 @@ extension PetstoreClientAPI { - GET /store/order/{orderId} - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - - examples: [{example={ - "id" : 123456789, + - examples: [{contentType=application/json, example={ "petId" : 123456789, - "complete" : true, - "status" : "aeiou", "quantity" : 123, - "shipDate" : "2015-10-20T06:12:32.351+0000" -}, contentType=application/json}, {example= + "id" : 123456789, + "shipDate" : "2015-11-11T10:03:22.839+0000", + "complete" : true, + "status" : "aeiou" +}}, {contentType=application/xml, example= 123456 123456 0 - 2015-10-19T23:12:32.351Z + 2015-11-11T12:03:22.839Z string true -, contentType=application/xml}] - - examples: [{example={ - "id" : 123456789, +}] + - examples: [{contentType=application/json, example={ "petId" : 123456789, - "complete" : true, - "status" : "aeiou", "quantity" : 123, - "shipDate" : "2015-10-20T06:12:32.351+0000" -}, contentType=application/json}, {example= + "id" : 123456789, + "shipDate" : "2015-11-11T10:03:22.839+0000", + "complete" : true, + "status" : "aeiou" +}}, {contentType=application/xml, example= 123456 123456 0 - 2015-10-19T23:12:32.351Z + 2015-11-11T12:03:22.839Z string true -, contentType=application/xml}] +}] - parameter orderId: (path) ID of pet that needs to be fetched diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift index 19cf534cea8..231e7f59228 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift @@ -84,8 +84,8 @@ extension PetstoreClientAPI { - GET /user/login - - - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}] - - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}] + - examples: [{contentType=application/json, example="aeiou"}, {contentType=application/xml, example=string}] + - examples: [{contentType=application/json, example="aeiou"}, {contentType=application/xml, example=string}] - parameter username: (query) The user name for login - parameter password: (query) The password for login in clear text @@ -134,7 +134,7 @@ extension PetstoreClientAPI { - GET /user/{username} - - - examples: [{example={ + - examples: [{contentType=application/json, example={ "id" : 1, "username" : "johnp", "firstName" : "John", @@ -143,7 +143,7 @@ extension PetstoreClientAPI { "password" : "-secret-", "phone" : "0123456789", "userStatus" : 0 -}, contentType=application/json}] +}}] - parameter username: (path) The name that needs to be fetched. Use user1 for testing. diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift index 21791168ab2..dbc25584886 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift @@ -75,29 +75,26 @@ class AlamofireRequestBuilder: RequestBuilder { request.authenticate(usingCredential: credential) } - request.responseJSON(options: .AllowFragments) { (req, res, result) in + request.responseJSON(options: .AllowFragments) { response in managerStore.removeValueForKey(managerId) - if result.isFailure { - completion(response: nil, erorr: result.error) + if response.result.isFailure { + completion(response: nil, erorr: response.result.error) return } if () is T { - let response = Response(response: res!, body: () as! T) - completion(response: response, erorr: nil) + completion(response: Response(response: response.response!, body: () as! T), erorr: nil) return } - if let json: AnyObject = result.value { + if let json: AnyObject = response.result.value { let body = Decoders.decode(clazz: T.self, source: json) - let response = Response(response: res!, body: body) - completion(response: response, erorr: nil) + completion(response: Response(response: response.response!, body: body), erorr: nil) return } else if "" is T { // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release // https://github.com/swagger-api/swagger-parser/pull/34 - let response = Response(response: res!, body: "" as! T) - completion(response: response, erorr: nil) + completion(response: Response(response: response.response!, body: "" as! T), erorr: nil) return } @@ -113,4 +110,3 @@ class AlamofireRequestBuilder: RequestBuilder { return httpHeaders } } - diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift index 7ac67ca1b4a..8266d08a1b2 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift @@ -118,6 +118,10 @@ class Decoders { fatalError("formatter failed to parse \(sourceString)") } + // Decoder for [User] + Decoders.addDecoder(clazz: [User].self) { (source: AnyObject) -> [User] in + return Decoders.decode(clazz: [User].self, source: source) + } // Decoder for User Decoders.addDecoder(clazz: User.self) { (source: AnyObject) -> User in let sourceDictionary = source as! [NSObject:AnyObject] @@ -134,6 +138,10 @@ class Decoders { } + // Decoder for [Category] + Decoders.addDecoder(clazz: [Category].self) { (source: AnyObject) -> [Category] in + return Decoders.decode(clazz: [Category].self, source: source) + } // Decoder for Category Decoders.addDecoder(clazz: Category.self) { (source: AnyObject) -> Category in let sourceDictionary = source as! [NSObject:AnyObject] @@ -144,6 +152,10 @@ class Decoders { } + // Decoder for [Pet] + Decoders.addDecoder(clazz: [Pet].self) { (source: AnyObject) -> [Pet] in + return Decoders.decode(clazz: [Pet].self, source: source) + } // Decoder for Pet Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject) -> Pet in let sourceDictionary = source as! [NSObject:AnyObject] @@ -158,6 +170,10 @@ class Decoders { } + // Decoder for [Tag] + Decoders.addDecoder(clazz: [Tag].self) { (source: AnyObject) -> [Tag] in + return Decoders.decode(clazz: [Tag].self, source: source) + } // Decoder for Tag Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject) -> Tag in let sourceDictionary = source as! [NSObject:AnyObject] @@ -168,6 +184,10 @@ class Decoders { } + // Decoder for [Order] + Decoders.addDecoder(clazz: [Order].self) { (source: AnyObject) -> [Order] in + return Decoders.decode(clazz: [Order].self, source: source) + } // Decoder for Order Decoders.addDecoder(clazz: Order.self) { (source: AnyObject) -> Order in let sourceDictionary = source as! [NSObject:AnyObject] diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift index 1356bd1db98..f542ea676f8 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift @@ -14,6 +14,8 @@ public class Category: JSONEncodable { public var name: String? + public init() {} + // MARK: JSONEncodable func encodeToJSON() -> AnyObject { var nillableDictionary = [String:AnyObject?]() diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift index 25f7745f306..f309744da99 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift @@ -25,6 +25,8 @@ public class Order: JSONEncodable { public var complete: Bool? + public init() {} + // MARK: JSONEncodable func encodeToJSON() -> AnyObject { var nillableDictionary = [String:AnyObject?]() diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift index b94e5a7a6de..b1491df2516 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift @@ -25,6 +25,8 @@ public class Pet: JSONEncodable { public var status: Status? + public init() {} + // MARK: JSONEncodable func encodeToJSON() -> AnyObject { var nillableDictionary = [String:AnyObject?]() diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift index b7ab8a3a0cf..edcd73a7a0c 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift @@ -14,6 +14,8 @@ public class Tag: JSONEncodable { public var name: String? + public init() {} + // MARK: JSONEncodable func encodeToJSON() -> AnyObject { var nillableDictionary = [String:AnyObject?]() diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift index a7592185021..fa0ad3f5019 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift @@ -21,6 +21,8 @@ public class User: JSONEncodable { public var userStatus: Int? + public init() {} + // MARK: JSONEncodable func encodeToJSON() -> AnyObject { var nillableDictionary = [String:AnyObject?]() From 2144cf5d3119b1f0a94903b4f0c6808ab7de1f0e Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Wed, 11 Nov 2015 13:43:40 +0100 Subject: [PATCH 113/142] Handle missing security spec more elegantly - remove the optional auth_setup_handler() callback mechanism - add _global_auth_setup() method on ApiClient to analyse config when security spec not provided - add methods on the Configuration class to abstract getting and setting tokens --- .../main/resources/perl/ApiClient.mustache | 55 ++++++-- .../resources/perl/Configuration.mustache | 53 ++++++++ .../src/main/resources/perl/README.md | 96 ++++++-------- .../src/main/resources/perl/Role.mustache | 120 ++++++++---------- .../src/main/resources/perl/api.mustache | 2 +- samples/client/petstore/perl/README.md | 96 ++++++-------- .../perl/lib/WWW/SwaggerClient/ApiClient.pm | 55 ++++++-- .../lib/WWW/SwaggerClient/Configuration.pm | 53 ++++++++ .../perl/lib/WWW/SwaggerClient/PetApi.pm | 16 +-- .../perl/lib/WWW/SwaggerClient/Role.pm | 120 ++++++++---------- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 8 +- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 16 +-- samples/client/petstore/perl/t/04_role.t | 64 +++++++++- 13 files changed, 461 insertions(+), 293 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index 6e88d7967c2..bf1220912d2 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -34,6 +34,8 @@ sub _new_instance return bless \%args, $class; } +sub _cfg {'WWW::{{moduleName}}::Configuration'} + # Set the user agent of the API client # # @param string $user_agent The user agent of the API client @@ -308,18 +310,8 @@ sub get_api_key_with_prefix sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; - # we can defer to the application if the spec doesn't describe authentication - if ($self->{auth_setup_handler_object}) { - $self->{auth_setup_handler_object}->auth_setup_handler( - api_client => $self, - header_params => $header_params, - query_params => $query_params, - auth_settings => $auth_settings, # presumably this won't be defined if we're doing it this way - ); - return; - } - - return if (!defined($auth_settings) || scalar(@$auth_settings) == 0); + return $self->_global_auth_setup($header_params, $query_params) + unless $auth_settings && @$auth_settings; # one endpoint can have more than 1 auth settings foreach my $auth (@$auth_settings) { @@ -332,10 +324,47 @@ sub update_params_for_auth { } {{/authMethods}} else { - # TODO show warning about security definition not found + # TODO show warning about security definition not found } } } +# The endpoint API class has not found any settings for auth. This may be deliberate, +# in which case update_params_for_auth() will be a no-op. But it may also be that the +# swagger spec does not describe the intended authorization. So we check in the config for any +# auth tokens and if we find any, we use them for all endpoints; +sub _global_auth_setup { + my ($self, $header_params, $query_params) = @_; + + my $tokens = $self->_cfg->get_tokens; + return unless keys %$tokens; + + # basic + if (my $uname = delete $tokens->{username}) { + my $pword = delete $tokens->{password}; + $header_params->{'Authorization'} = 'Basic '.encode_base64($uname.":".$pword); + } + + # oauth + if (my $access_token = delete $tokens->{access_token}) { + $header_params->{'Authorization'} = 'Bearer ' . $access_token; + } + + # other keys + foreach my $token_name (keys %$tokens) { + my $in = $tokens->{$token_name}->{in}; + my $token = $self->get_api_key_with_prefix($token_name); + if ($in eq 'head') { + $header_params->{$token_name} = $token; + } + elsif ($in eq 'query') { + $query_params->{$token_name} = $token; + } + else { + die "Don't know where to put token '$token_name' ('$in' is not 'head' or 'query')"; + } + } +} + 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache index d0cc157647f..75a1ba7f61a 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache @@ -16,6 +16,7 @@ our $http_user_agent = 'Perl-Swagger'; # authenticaiton setting our $api_key = {}; our $api_key_prefix = {}; +our $api_key_in = {}; # username and password for HTTP basic authentication our $username = ''; @@ -24,4 +25,56 @@ our $password = ''; # access token for OAuth our $access_token = ''; +sub get_tokens { + my $class = shift; + + my $tokens = {}; + $tokens->{username} = $username if $username; + $tokens->{password} = $password if $password; + $tokens->{access_token} = $access_token if $access_token; + + foreach my $token_name (keys %{ $api_key }) { + $tokens->{$token_name}->{token} = $api_key->{$token_name}; + $tokens->{$token_name}->{prefix} = $api_key_prefix->{$token_name}; + $tokens->{$token_name}->{in} = $api_key_in->{$token_name}; + } + + return $tokens; +} + +sub clear_tokens { + my $class = shift; + my %tokens = %{$class->get_tokens}; # copy + + $username = undef; + $password = undef; + $access_token = undef; + + $api_key = {}; + $api_key_prefix = {}; + $api_key_in = {}; + + return \%tokens; +} + +sub accept_tokens { + my ($class, $tokens) = @_; + + foreach my $known_name (qw(username password access_token)) { + next unless $tokens->{$known_name}; + eval "\$$known_name = delete \$tokens->{\$known_name}"; + die $@ if $@; + } + + foreach my $token_name (keys %$tokens) { + $api_key->{$token_name} = $tokens->{$token_name}->{token}; + if ($tokens->{$token_name}->{prefix}) { + $api_key_prefix->{$token_name} = $tokens->{$token_name}->{prefix}; + } + my $in = $tokens->{$token_name}->{in} || 'head'; + croak "Tokens can only go in 'head' or 'query' (not in '$in')" unless $in =~ /^(?:head|query)$/; + $api_key_in->{$token_name} = $in; + } +} + 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index 7603c39f07a..491892b2f16 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -23,7 +23,7 @@ role. package main; - my $api = MyApp->new; + my $api = MyApp->new({ tokens => $tokens }); my $pet = $api->get_pet_by_id(pet_id => $pet_id); @@ -46,14 +46,40 @@ For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. ## Configuring authentication -If your Swagger spec does not describe authentication, you can write an -`auth_setup_handler()` method in your base class to handle it (see below). +In the normal case, the Swagger spec will describe what parameters are +required and where to put them. You just need to supply the tokens. -In the normal case, the Swagger spec will describe what parameters are required -and where to put them. You just need to supply the authorization tokens. + my $tokens = { + # basic + username => $username, + password => $password, + + # oauth + access_token => $oauth_token, + + # keys + $some_key => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + + $another => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + ..., + + }; + + my $api = MyApp->new({ tokens => $tokens }); -These should go in the `WWW::{{moduleName}}::Configuration` namespace as follows. -Note these are all optional, and depend on the API you are accessing. +Note these are all optional, as are `prefix` and `in`, and depend on the API +you are accessing. Usually `prefix` and `in` will be determined by the code generator from +the spec and you will not need to set them at run time. If not, `in` will +default to 'head' and `prefix` to the empty string. + +The tokens will be placed in the `WWW::{{moduleName}}::Configuration` namespace +as follows, but you don't need to know about this. - `$WWW::{{moduleName}}::Configuration::username` @@ -88,63 +114,19 @@ Note these are all optional, and depend on the API you are accessing. # METHODS -## `auth_setup_handler()` - -This method does not exist! But if you add it to the class that consumes this -role, it will be called to set up authentication. - - package MyApp; - use Moose; - - with 'WWW::{{moduleName}}::Role'; - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } - - # somewhere else... - - my $api = MyApp->new; - - my $pet = $api->get_pet_by_id(pet_id => $pet_id); - -So, `auth_setup_handler()` will be called on your `$api` object and passed the -following parameters: - -- `header_params` - - A hashref that will become the request headers. You can insert auth - parameters. - -- `query_params` - - A hashref that will be encoded into the request URL. You can insert auth - parameters. - -- `auth_settings` - - TODO. Probably not necessary? - -- `api_client` - - A reference to the `WWW::{{moduleName}}::ApiClient` object that is responsible - for communicating with the server. Just in case that's useful. - -## base\_url +## `base_url` The generated code has the `base_url` already set as a default value. This method returns (and optionally sets, but only if the API client has not been created yet) the current value of `base_url`. -## api\_factory +## `api_factory` Returns an API factory object. You probably won't need to call this directly. $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance - $self->pet_api; # the same + $self->pet_api; # the same # MISSING METHODS @@ -202,11 +184,11 @@ Additional documentation for each class and method may be provided by the Swagge spec. If so, this is available via the `class_documentation()` and `method_documentation()` methods on each generated API and class: - my $cdoc = $api->pet_api->class_documentation; + my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; - my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; -Each of these calls returns a hashref with various useful pieces of information. +Each of these calls returns a hashref with various useful pieces of information. diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 41a6de7ff36..c0891ead424 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -8,19 +8,32 @@ use Log::Any qw($log); use WWW::{{moduleName}}::ApiFactory; has base_url => ( is => 'ro', - required => 0, - isa => 'Str', - ); + required => 0, + isa => 'Str', + ); has api_factory => ( is => 'ro', isa => 'WWW::{{moduleName}}::ApiFactory', builder => '_build_af', lazy => 1, ); + +has tokens => ( is => 'ro', + isa => 'HashRef', + required => 0, + default => sub {{=<% %>=}}{{}}<%={{ }}=%>, # ! + ); + +has _cfg => ( is => 'ro', + isa => 'Str', + default => 'WWW::{{moduleName}}::Configuration', + ); sub BUILD { my $self = shift; + $self->_cfg->accept_tokens( $self->tokens ) if keys %{$self->tokens}; + # ignore these symbols imported into API namespaces my %outsiders = map {$_ => 1} qw( croak ); @@ -93,7 +106,7 @@ role. package main; - my $api = MyApp->new; + my $api = MyApp->new({ tokens => $tokens }); my $pet = $api->get_pet_by_id(pet_id => $pet_id); @@ -115,14 +128,40 @@ For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. =head2 Configuring authentication -If your Swagger spec does not describe authentication, you can write an -C method in your base class to handle it (see below). +In the normal case, the Swagger spec will describe what parameters are +required and where to put them. You just need to supply the tokens. -In the normal case, the Swagger spec will describe what parameters are required -and where to put them. You just need to supply the authorization tokens. + my $tokens = { + # basic + username => $username, + password => $password, + + # oauth + access_token => $oauth_token, + + # keys + $some_key => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + + $another => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + ..., + + }; + + my $api = MyApp->new({ tokens => $tokens }); -These should go in the C namespace as follows. -Note these are all optional, and depend on the API you are accessing. +Note these are all optional, as are C and C, and depend on the API +you are accessing. Usually C and C will be determined by the code generator from +the spec and you will not need to set them at run time. If not, C will +default to 'head' and C to the empty string. + +The tokens will be placed in the C namespace +as follows, but you don't need to know about this. =over 4 @@ -161,68 +200,19 @@ String. The OAuth access token. =head1 METHODS -=head2 C - -This method does not exist! But if you add it to the class that consumes this -role, it will be called to set up authentication. - - package MyApp; - use Moose; - - with 'WWW::{{moduleName}}::Role'; - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } - - # somewhere else... - - my $api = MyApp->new; - - my $pet = $api->get_pet_by_id(pet_id => $pet_id); - - -So, C will be called on your C<$api> object and passed the -following parameters: - -=over 4 - -=item C - -A hashref that will become the request headers. You can insert auth -parameters. - -=item C - -A hashref that will be encoded into the request URL. You can insert auth -parameters. - -=item C - -TODO. Probably not necessary? - -=item C - -A reference to the C object that is responsible -for communicating with the server. Just in case that's useful. - -=back - -=head2 base_url +=head2 C The generated code has the C already set as a default value. This method returns (and optionally sets, but only if the API client has not been created yet) the current value of C. -=head2 api_factory +=head2 C Returns an API factory object. You probably won't need to call this directly. $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance - $self->pet_api; # the same + $self->pet_api; # the same =head1 MISSING METHODS @@ -280,13 +270,13 @@ Additional documentation for each class and method may be provided by the Swagge spec. If so, this is available via the C and C methods on each generated API and class: - my $cdoc = $api->pet_api->class_documentation; + my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; - my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; -Each of these calls returns a hashref with various useful pieces of information. +Each of these calls returns a hashref with various useful pieces of information. =cut diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index e31f2f32d6c..4a48cf2211c 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -134,7 +134,7 @@ sub {{nickname}} { }{{/bodyParams}} # authentication setting, if any - my $auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]; + my $auth_settings = [qw({{#authMethods}}{{name}} {{/authMethods}})]; # make the API Call {{#returnType}}my $response = $self->{api_client}->call_api($_resource_path, $_method, diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index d436e81c292..36e3521958e 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -23,7 +23,7 @@ role. package main; - my $api = MyApp->new; + my $api = MyApp->new({ tokens => $tokens }); my $pet = $api->get_pet_by_id(pet_id => $pet_id); @@ -46,14 +46,40 @@ For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. ## Configuring authentication -If your Swagger spec does not describe authentication, you can write an -`auth_setup_handler()` method in your base class to handle it (see below). +In the normal case, the Swagger spec will describe what parameters are +required and where to put them. You just need to supply the tokens. -In the normal case, the Swagger spec will describe what parameters are required -and where to put them. You just need to supply the authorization tokens. + my $tokens = { + # basic + username => $username, + password => $password, + + # oauth + access_token => $oauth_token, + + # keys + $some_key => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + + $another => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + ..., + + }; + + my $api = MyApp->new({ tokens => $tokens }); -These should go in the `WWW::SwaggerClient::Configuration` namespace as follows. -Note these are all optional, and depend on the API you are accessing. +Note these are all optional, as are `prefix` and `in`, and depend on the API +you are accessing. Usually `prefix` and `in` will be determined by the code generator from +the spec and you will not need to set them at run time. If not, `in` will +default to 'head' and `prefix` to the empty string. + +The tokens will be placed in the `WWW::SwaggerClient::Configuration` namespace +as follows, but you don't need to know about this. - `$WWW::SwaggerClient::Configuration::username` @@ -88,63 +114,19 @@ Note these are all optional, and depend on the API you are accessing. # METHODS -## `auth_setup_handler()` - -This method does not exist! But if you add it to the class that consumes this -role, it will be called to set up authentication. - - package MyApp; - use Moose; - - with 'WWW::SwaggerClient::Role'; - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } - - # somewhere else... - - my $api = MyApp->new; - - my $pet = $api->get_pet_by_id(pet_id => $pet_id); - -So, `auth_setup_handler()` will be called on your `$api` object and passed the -following parameters: - -- `header_params` - - A hashref that will become the request headers. You can insert auth - parameters. - -- `query_params` - - A hashref that will be encoded into the request URL. You can insert auth - parameters. - -- `auth_settings` - - TODO. Probably not necessary? - -- `api_client` - - A reference to the `WWW::SwaggerClient::ApiClient` object that is responsible - for communicating with the server. Just in case that's useful. - -## base\_url +## `base_url` The generated code has the `base_url` already set as a default value. This method returns (and optionally sets, but only if the API client has not been created yet) the current value of `base_url`. -## api\_factory +## `api_factory` Returns an API factory object. You probably won't need to call this directly. $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance - $self->pet_api; # the same + $self->pet_api; # the same # MISSING METHODS @@ -202,11 +184,11 @@ Additional documentation for each class and method may be provided by the Swagge spec. If so, this is available via the `class_documentation()` and `method_documentation()` methods on each generated API and class: - my $cdoc = $api->pet_api->class_documentation; + my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; - my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; -Each of these calls returns a hashref with various useful pieces of information. +Each of these calls returns a hashref with various useful pieces of information. diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm index e34fffe7848..dbd822cc1d4 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm @@ -34,6 +34,8 @@ sub _new_instance return bless \%args, $class; } +sub _cfg {'WWW::SwaggerClient::Configuration'} + # Set the user agent of the API client # # @param string $user_agent The user agent of the API client @@ -308,18 +310,8 @@ sub get_api_key_with_prefix sub update_params_for_auth { my ($self, $header_params, $query_params, $auth_settings) = @_; - # we can defer to the application if the spec doesn't describe authentication - if ($self->{auth_setup_handler_object}) { - $self->{auth_setup_handler_object}->auth_setup_handler( - api_client => $self, - header_params => $header_params, - query_params => $query_params, - auth_settings => $auth_settings, # presumably this won't be defined if we're doing it this way - ); - return; - } - - return if (!defined($auth_settings) || scalar(@$auth_settings) == 0); + return $self->_global_auth_setup($header_params, $query_params) + unless $auth_settings && @$auth_settings; # one endpoint can have more than 1 auth settings foreach my $auth (@$auth_settings) { @@ -336,10 +328,47 @@ sub update_params_for_auth { } else { - # TODO show warning about security definition not found + # TODO show warning about security definition not found } } } +# The endpoint API class has not found any settings for auth. This may be deliberate, +# in which case update_params_for_auth() will be a no-op. But it may also be that the +# swagger spec does not describe the intended authorization. So we check in the config for any +# auth tokens and if we find any, we use them for all endpoints; +sub _global_auth_setup { + my ($self, $header_params, $query_params) = @_; + + my $tokens = $self->_cfg->get_tokens; + return unless keys %$tokens; + + # basic + if (my $uname = delete $tokens->{username}) { + my $pword = delete $tokens->{password}; + $header_params->{'Authorization'} = 'Basic '.encode_base64($uname.":".$pword); + } + + # oauth + if (my $access_token = delete $tokens->{access_token}) { + $header_params->{'Authorization'} = 'Bearer ' . $access_token; + } + + # other keys + foreach my $token_name (keys %$tokens) { + my $in = $tokens->{$token_name}->{in}; + my $token = $self->get_api_key_with_prefix($token_name); + if ($in eq 'head') { + $header_params->{$token_name} = $token; + } + elsif ($in eq 'query') { + $query_params->{$token_name} = $token; + } + else { + die "Don't know where to put token '$token_name' ('$in' is not 'head' or 'query')"; + } + } +} + 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm index 91670003518..150db4cfac2 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm @@ -16,6 +16,7 @@ our $http_user_agent = 'Perl-Swagger'; # authenticaiton setting our $api_key = {}; our $api_key_prefix = {}; +our $api_key_in = {}; # username and password for HTTP basic authentication our $username = ''; @@ -24,4 +25,56 @@ our $password = ''; # access token for OAuth our $access_token = ''; +sub get_tokens { + my $class = shift; + + my $tokens = {}; + $tokens->{username} = $username if $username; + $tokens->{password} = $password if $password; + $tokens->{access_token} = $access_token if $access_token; + + foreach my $token_name (keys %{ $api_key }) { + $tokens->{$token_name}->{token} = $api_key->{$token_name}; + $tokens->{$token_name}->{prefix} = $api_key_prefix->{$token_name}; + $tokens->{$token_name}->{in} = $api_key_in->{$token_name}; + } + + return $tokens; +} + +sub clear_tokens { + my $class = shift; + my %tokens = %{$class->get_tokens}; # copy + + $username = undef; + $password = undef; + $access_token = undef; + + $api_key = {}; + $api_key_prefix = {}; + $api_key_in = {}; + + return \%tokens; +} + +sub accept_tokens { + my ($class, $tokens) = @_; + + foreach my $known_name (qw(username password access_token)) { + next unless $tokens->{$known_name}; + eval "\$$known_name = delete \$tokens->{\$known_name}"; + die $@ if $@; + } + + foreach my $token_name (keys %$tokens) { + $api_key->{$token_name} = $tokens->{$token_name}->{token}; + if ($tokens->{$token_name}->{prefix}) { + $api_key_prefix->{$token_name} = $tokens->{$token_name}->{prefix}; + } + my $in = $tokens->{$token_name}->{in} || 'head'; + croak "Tokens can only go in 'head' or 'query' (not in '$in')" unless $in =~ /^(?:head|query)$/; + $api_key_in->{$token_name} = $in; + } +} + 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 813e73468a2..cbd65a7c003 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -106,7 +106,7 @@ sub update_pet { } # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call @@ -170,7 +170,7 @@ sub add_pet { } # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call @@ -234,7 +234,7 @@ sub find_pets_by_status { # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -301,7 +301,7 @@ sub find_pets_by_tags { # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -375,7 +375,7 @@ sub get_pet_by_id { # authentication setting, if any - my $auth_settings = ['api_key']; + my $auth_settings = [qw(api_key )]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -471,7 +471,7 @@ sub update_pet_with_form { # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call @@ -551,7 +551,7 @@ sub delete_pet { # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call @@ -645,7 +645,7 @@ sub upload_file { # authentication setting, if any - my $auth_settings = ['petstore_auth']; + my $auth_settings = [qw(petstore_auth )]; # make the API Call diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index 51d477f9954..0983f219fdf 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -8,19 +8,32 @@ use Log::Any qw($log); use WWW::SwaggerClient::ApiFactory; has base_url => ( is => 'ro', - required => 0, - isa => 'Str', - ); + required => 0, + isa => 'Str', + ); has api_factory => ( is => 'ro', isa => 'WWW::SwaggerClient::ApiFactory', builder => '_build_af', lazy => 1, ); + +has tokens => ( is => 'ro', + isa => 'HashRef', + required => 0, + default => sub {{}}, # ! + ); + +has _cfg => ( is => 'ro', + isa => 'Str', + default => 'WWW::SwaggerClient::Configuration', + ); sub BUILD { my $self = shift; + $self->_cfg->accept_tokens( $self->tokens ) if keys %{$self->tokens}; + # ignore these symbols imported into API namespaces my %outsiders = map {$_ => 1} qw( croak ); @@ -93,7 +106,7 @@ role. package main; - my $api = MyApp->new; + my $api = MyApp->new({ tokens => $tokens }); my $pet = $api->get_pet_by_id(pet_id => $pet_id); @@ -115,14 +128,40 @@ For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. =head2 Configuring authentication -If your Swagger spec does not describe authentication, you can write an -C method in your base class to handle it (see below). +In the normal case, the Swagger spec will describe what parameters are +required and where to put them. You just need to supply the tokens. -In the normal case, the Swagger spec will describe what parameters are required -and where to put them. You just need to supply the authorization tokens. + my $tokens = { + # basic + username => $username, + password => $password, + + # oauth + access_token => $oauth_token, + + # keys + $some_key => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + + $another => { token => $token, + prefix => $prefix, + in => $in, # 'head||query', + }, + ..., + + }; + + my $api = MyApp->new({ tokens => $tokens }); -These should go in the C namespace as follows. -Note these are all optional, and depend on the API you are accessing. +Note these are all optional, as are C and C, and depend on the API +you are accessing. Usually C and C will be determined by the code generator from +the spec and you will not need to set them at run time. If not, C will +default to 'head' and C to the empty string. + +The tokens will be placed in the C namespace +as follows, but you don't need to know about this. =over 4 @@ -161,68 +200,19 @@ String. The OAuth access token. =head1 METHODS -=head2 C - -This method does not exist! But if you add it to the class that consumes this -role, it will be called to set up authentication. - - package MyApp; - use Moose; - - with 'WWW::SwaggerClient::Role'; - - sub auth_setup_handler { - my ($self, %p) = @_; - $p{header_params}->{'X-TargetApp-apiKey'} = $api_key; - $p{header_params}->{'X-TargetApp-secretKey'} = $secret_key; - } - - # somewhere else... - - my $api = MyApp->new; - - my $pet = $api->get_pet_by_id(pet_id => $pet_id); - - -So, C will be called on your C<$api> object and passed the -following parameters: - -=over 4 - -=item C - -A hashref that will become the request headers. You can insert auth -parameters. - -=item C - -A hashref that will be encoded into the request URL. You can insert auth -parameters. - -=item C - -TODO. Probably not necessary? - -=item C - -A reference to the C object that is responsible -for communicating with the server. Just in case that's useful. - -=back - -=head2 base_url +=head2 C The generated code has the C already set as a default value. This method returns (and optionally sets, but only if the API client has not been created yet) the current value of C. -=head2 api_factory +=head2 C Returns an API factory object. You probably won't need to call this directly. $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance - $self->pet_api; # the same + $self->pet_api; # the same =head1 MISSING METHODS @@ -280,13 +270,13 @@ Additional documentation for each class and method may be provided by the Swagge spec. If so, this is available via the C and C methods on each generated API and class: - my $cdoc = $api->pet_api->class_documentation; + my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; - my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; + my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; -Each of these calls returns a hashref with various useful pieces of information. +Each of these calls returns a hashref with various useful pieces of information. =cut diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 533c2e77a26..8a1f41036bb 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -97,7 +97,7 @@ sub get_inventory { # authentication setting, if any - my $auth_settings = ['api_key']; + my $auth_settings = [qw(api_key )]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -164,7 +164,7 @@ sub place_order { } # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -238,7 +238,7 @@ sub get_order_by_id { # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -312,7 +312,7 @@ sub delete_order { # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index 5d1f7f33f1b..d8e2c9ae215 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -106,7 +106,7 @@ sub create_user { } # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call @@ -170,7 +170,7 @@ sub create_users_with_array_input { } # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call @@ -234,7 +234,7 @@ sub create_users_with_list_input { } # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call @@ -307,7 +307,7 @@ sub login_user { # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -365,7 +365,7 @@ sub logout_user { # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call @@ -436,7 +436,7 @@ sub get_user_by_name { # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call my $response = $self->{api_client}->call_api($_resource_path, $_method, @@ -519,7 +519,7 @@ sub update_user { } # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call @@ -590,7 +590,7 @@ sub delete_user { # authentication setting, if any - my $auth_settings = []; + my $auth_settings = [qw()]; # make the API Call diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t index 9592ec3f822..c7104674dbb 100644 --- a/samples/client/petstore/perl/t/04_role.t +++ b/samples/client/petstore/perl/t/04_role.t @@ -1,4 +1,4 @@ -use Test::More tests => 21; +use Test::More tests => 29; use Test::Exception; use Test::Warnings 'warnings'; use Test::Deep; @@ -15,7 +15,7 @@ SKIP: { sub auth_setup_handler {} "; - skip 'Moose not installed', 21 if $@; + skip 'Moose not installed', 29 if $@; my $api; @@ -76,5 +76,65 @@ my $pet_class_doco = { 'description' => '' }; is_deeply($get_pet->class_documentation, $pet_class_doco, 'Pet object class_documentation is available'); # / documentation tests +my $tokens = { + username => 'UserName', + password => 'PassWord', + access_token => 'OAuth_token', + + someKey => { token => 'some_key_token', + prefix => 'some_key_prefix', + in => 'query', + }, + + anotherKey => { token => 'another_key_token', + }, + }; + +$api->_cfg->accept_tokens({%$tokens}); # pass a copy +no warnings 'once'; +is $WWW::SwaggerClient::Configuration::username, 'UserName', 'accept_tokens() correctly set the username'; +is $WWW::SwaggerClient::Configuration::password, 'PassWord', 'accept_tokens() correctly set the password'; +is $WWW::SwaggerClient::Configuration::access_token, 'OAuth_token', 'accept_tokens() correctly set the oauth'; + +my $api_key_href = { + 'anotherKey' => 'another_key_token', + 'someKey' => 'some_key_token' + }; +cmp_deeply( $WWW::SwaggerClient::Configuration::api_key, $api_key_href, 'accept_tokens() correctly set api_key' ); + +my $api_key_prefix_href = { + 'someKey' => 'some_key_prefix' + }; +cmp_deeply( $WWW::SwaggerClient::Configuration::api_key_prefix, $api_key_prefix_href, 'accept_tokens() correctly set api_key_prefix' ); + +my $api_key_in = { + 'someKey' => 'query', + 'anotherKey' => 'head' + }; +cmp_deeply( $WWW::SwaggerClient::Configuration::api_key_in, $api_key_in, 'accept_tokens() correctly set api_key_in' ); + +use warnings 'once'; + +my $cleared_tokens_cmp = { + 'anotherKey' => { + 'in' => 'head', + 'token' => 'another_key_token', + 'prefix' => undef + }, + 'access_token' => 'OAuth_token', + 'someKey' => { + 'token' => 'some_key_token', + 'in' => 'query', + 'prefix' => 'some_key_prefix' + }, + 'username' => 'UserName', + 'password' => 'PassWord' + }; +cmp_deeply( $api->_cfg->clear_tokens, $cleared_tokens_cmp, 'clear_tokens() returns the correct data structure' ); + +my $bad_token = { bad_token_name => 'bad token value' }; # value should should be hashref +dies_ok { $api->_cfg->accept_tokens($bad_token) } "bad token causes exception"; + + } # / SKIP From 684062ccbfe613db778055b6b4e553957fbf46e0 Mon Sep 17 00:00:00 2001 From: aersamkull Date: Wed, 11 Nov 2015 13:47:09 +0100 Subject: [PATCH 114/142] Updates samples --- .../typescript-angular/API/Client/Category.ts | 11 + .../typescript-angular/API/Client/Order.ts | 35 + .../typescript-angular/API/Client/Pet.ts | 35 + .../typescript-angular/API/Client/PetApi.ts | 146 ++ .../typescript-angular/API/Client/StoreApi.ts | 59 + .../typescript-angular/API/Client/Tag.ts | 11 + .../typescript-angular/API/Client/User.ts | 24 + .../typescript-angular/API/Client/UserApi.ts | 124 ++ .../typescript-angular/API/Client/api.d.ts | 30 +- .../client/petstore/typescript-node/api.ts | 1403 +++++++++++------ 10 files changed, 1416 insertions(+), 462 deletions(-) diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts index a802fe4ebdf..5e0a12f2122 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Category.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts @@ -3,11 +3,22 @@ namespace API.Client { 'use strict'; + + + export interface Category { + + id?: number; + + name?: string; + } + + + } diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts index 1dd84e6d0ad..874efb18c7e 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Order.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts @@ -3,30 +3,65 @@ namespace API.Client { 'use strict'; + + + export interface Order { + + id?: number; + + petId?: number; + + quantity?: number; + + shipDate?: Date; + + /** * Order Status */ + status?: Order.StatusEnum; + + complete?: boolean; + } + export namespace Order { + + + + + + + + + + export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } + + + + } + + + } diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts index 60431f69c83..bf1560de85c 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts @@ -3,30 +3,65 @@ namespace API.Client { 'use strict'; + + + export interface Pet { + + id?: number; + + category?: Category; + + name: string; + + photoUrls: Array; + + tags?: Array; + + /** * pet status in the store */ + status?: Pet.StatusEnum; + } + export namespace Pet { + + + + + + + + + + + + export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } + + } + + + } diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts index 7c89b754914..2e936fdddd1 100644 --- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts @@ -2,9 +2,11 @@ /* tslint:disable:no-unused-variable member-ordering */ + namespace API.Client { 'use strict'; + export class PetApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -27,11 +29,25 @@ namespace API.Client { } + /** + * Update an existing pet + * + * @param body Pet object that needs to be added to the store + + */ public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + let httpRequestParams: any = { method: 'PUT', url: path, @@ -50,11 +66,25 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Add a new pet to the store + * + * @param body Pet object that needs to be added to the store + + */ public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + let httpRequestParams: any = { method: 'POST', url: path, @@ -73,15 +103,30 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Finds Pets by status + * Multiple status values can be provided with comma seperated strings + * @param status Status values that need to be considered for filter + + */ public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { const path = this.basePath + '/pet/findByStatus'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + if (status !== undefined) { queryParameters['status'] = status; } + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -99,15 +144,30 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Finds Pets by tags + * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + * @param tags Tags to filter by + + */ public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { const path = this.basePath + '/pet/findByTags'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + if (tags !== undefined) { queryParameters['tags'] = tags; } + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -125,16 +185,31 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Find pet by ID + * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + * @param petId ID of pet that needs to be fetched + + */ public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling getPetById'); } + + + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -152,24 +227,49 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated + * @param name Updated name of the pet + * @param status Updated status of the pet + + */ public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } + + + + + + + + + headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; + + formParams['name'] = name; + formParams['status'] = status; + let httpRequestParams: any = { method: 'POST', url: path, @@ -188,18 +288,37 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Deletes a pet + * + * @param petId Pet id to delete + * @param apiKey + + */ public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling deletePet'); } + + + + + + headerParams['api_key'] = apiKey; + + + let httpRequestParams: any = { method: 'DELETE', url: path, @@ -217,24 +336,49 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * uploads an image + * + * @param petId ID of pet to update + * @param additionalMetadata Additional data to pass to server + * @param file file to upload + + */ public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling uploadFile'); } + + + + + + + + + headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; + + formParams['additionalMetadata'] = additionalMetadata; + formParams['file'] = file; + let httpRequestParams: any = { method: 'POST', url: path, @@ -252,5 +396,7 @@ namespace API.Client { return this.$http(httpRequestParams); } + } } + diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts index 801a86a4a04..492ef6885fe 100644 --- a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts @@ -2,9 +2,11 @@ /* tslint:disable:no-unused-variable member-ordering */ + namespace API.Client { 'use strict'; + export class StoreApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -27,11 +29,22 @@ namespace API.Client { } + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + + */ public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> { const path = this.basePath + '/store/inventory'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -49,11 +62,25 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Place an order for a pet + * + * @param body order placed for purchasing the pet + + */ public placeOrder (body?: Order, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/store/order'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + let httpRequestParams: any = { method: 'POST', url: path, @@ -72,16 +99,31 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * @param orderId ID of pet that needs to be fetched + + */ public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling getOrderById'); } + + + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -99,16 +141,31 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * @param orderId ID of the order that needs to be deleted + + */ public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling deleteOrder'); } + + + + + + let httpRequestParams: any = { method: 'DELETE', url: path, @@ -125,5 +182,7 @@ namespace API.Client { return this.$http(httpRequestParams); } + } } + diff --git a/samples/client/petstore/typescript-angular/API/Client/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts index 1c0284cce48..66666719d89 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Tag.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts @@ -3,11 +3,22 @@ namespace API.Client { 'use strict'; + + + export interface Tag { + + id?: number; + + name?: string; + } + + + } diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts index 7c2b0b78b0c..69e94835d30 100644 --- a/samples/client/petstore/typescript-angular/API/Client/User.ts +++ b/samples/client/petstore/typescript-angular/API/Client/User.ts @@ -3,26 +3,50 @@ namespace API.Client { 'use strict'; + + + export interface User { + + id?: number; + + username?: string; + + firstName?: string; + + lastName?: string; + + email?: string; + + password?: string; + + phone?: string; + + /** * User Status */ + userStatus?: number; + } + + + } diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts index 4deb8bc6ebe..036508eb69d 100644 --- a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts @@ -2,9 +2,11 @@ /* tslint:disable:no-unused-variable member-ordering */ + namespace API.Client { 'use strict'; + export class UserApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -27,11 +29,25 @@ namespace API.Client { } + /** + * Create user + * This can only be done by the logged in user. + * @param body Created user object + + */ public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + let httpRequestParams: any = { method: 'POST', url: path, @@ -50,11 +66,25 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Creates list of users with given input array + * + * @param body List of user object + + */ public createUsersWithArrayInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/createWithArray'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + let httpRequestParams: any = { method: 'POST', url: path, @@ -73,11 +103,25 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Creates list of users with given input array + * + * @param body List of user object + + */ public createUsersWithListInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/createWithList'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + + let httpRequestParams: any = { method: 'POST', url: path, @@ -96,19 +140,38 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Logs user into the system + * + * @param username The user name for login + * @param password The password for login in clear text + + */ public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/user/login'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + + if (username !== undefined) { queryParameters['username'] = username; } + if (password !== undefined) { queryParameters['password'] = password; } + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -126,11 +189,22 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Logs out current logged in user session + * + + */ public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/logout'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -148,16 +222,31 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. + + */ public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling getUserByName'); } + + + + + + let httpRequestParams: any = { method: 'GET', url: path, @@ -175,16 +264,34 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Updated user + * This can only be done by the logged in user. + * @param username name that need to be deleted + * @param body Updated user object + + */ public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling updateUser'); } + + + + + + + + let httpRequestParams: any = { method: 'PUT', url: path, @@ -203,16 +310,31 @@ namespace API.Client { return this.$http(httpRequestParams); } + /** + * Delete user + * This can only be done by the logged in user. + * @param username The name that needs to be deleted + + */ public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); + + + // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling deleteUser'); } + + + + + + let httpRequestParams: any = { method: 'DELETE', url: path, @@ -229,5 +351,7 @@ namespace API.Client { return this.$http(httpRequestParams); } + } } + diff --git a/samples/client/petstore/typescript-angular/API/Client/api.d.ts b/samples/client/petstore/typescript-angular/API/Client/api.d.ts index 19c60623dc9..7a4f79f38b1 100644 --- a/samples/client/petstore/typescript-angular/API/Client/api.d.ts +++ b/samples/client/petstore/typescript-angular/API/Client/api.d.ts @@ -1,9 +1,37 @@ + + /// + + + /// + + + /// + + + /// + + + /// + + + + + /// -/// + + + /// + + + +/// + + + diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 47026929d81..4728b6f8c14 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -8,69 +8,181 @@ import http = require('http'); /* tslint:disable:no-unused-variable */ + + + export class User { + + id: number; + + username: string; + + firstName: string; + + lastName: string; + + email: string; + + password: string; + + phone: string; + + /** * User Status */ + userStatus: number; + } + + + + + export class Category { + + id: number; + + name: string; + } + + + + + export class Pet { + + id: number; + + category: Category; + + name: string; + + photoUrls: Array; + + tags: Array; + + /** * pet status in the store */ + status: Pet.StatusEnum; + } + export namespace Pet { + + + + + + + + + + + + export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } -} -export class Tag { - id: number; - name: string; + + } -export class Order { + + + + +export class Tag { + + id: number; + + + name: string; + +} + + + + + + +export class Order { + + + id: number; + + petId: number; + + quantity: number; + + shipDate: Date; + + /** * Order Status */ + status: Order.StatusEnum; + + complete: boolean; + } + export namespace Order { + + + + + + + + + + export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } + + + + } + + + interface Authentication { /** * Apply authentication settings to header and query params. @@ -117,6 +229,10 @@ class VoidAuth implements Authentication { } } + + + + export class UserApi { protected basePath = 'http://petstore.swagger.io/v2'; protected defaultHeaders : any = {}; @@ -125,13 +241,34 @@ export class UserApi { public authentications = { 'default': new VoidAuth(), - 'api_key': new ApiKeyAuth('header', 'api_key'), + + + + 'petstore_auth': new OAuth(), + + + + + 'api_key': new ApiKeyAuth('header', 'api_key'), + + + } constructor(url: string, basePath?: string); + + + + + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { + + + + + if (basePath) { this.basePath = basePath; } @@ -142,9 +279,20 @@ export class UserApi { } } + + + + + + + + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } + + + private extendObj(objA: T1, objB: T2) { for(let key in objB){ if(objB.hasOwnProperty(key)){ @@ -154,6 +302,12 @@ export class UserApi { return objA; } + /** + * Create user + * This can only be done by the logged in user. + * @param body Created user object + + */ public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user'; let queryParameters: any = {}; @@ -161,8 +315,11 @@ export class UserApi { let formParams: any = {}; + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -171,9 +328,12 @@ export class UserApi { headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -199,6 +359,12 @@ export class UserApi { return deferred.promise; } + /** + * Creates list of users with given input array + * + * @param body List of user object + + */ public createUsersWithArrayInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/createWithArray'; let queryParameters: any = {}; @@ -206,8 +372,11 @@ export class UserApi { let formParams: any = {}; + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -216,9 +385,12 @@ export class UserApi { headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -244,6 +416,12 @@ export class UserApi { return deferred.promise; } + /** + * Creates list of users with given input array + * + * @param body List of user object + + */ public createUsersWithListInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/createWithList'; let queryParameters: any = {}; @@ -251,8 +429,11 @@ export class UserApi { let formParams: any = {}; + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -261,9 +442,12 @@ export class UserApi { headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -289,6 +473,13 @@ export class UserApi { return deferred.promise; } + /** + * Logs user into the system + * + * @param username The user name for login + * @param password The password for login in clear text + + */ public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string; }> { const path = this.url + this.basePath + '/user/login'; let queryParameters: any = {}; @@ -296,16 +487,21 @@ export class UserApi { let formParams: any = {}; + if (username !== undefined) { queryParameters['username'] = username; } + if (password !== undefined) { queryParameters['password'] = password; } + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); let requestOptions: request.Options = { @@ -314,8 +510,10 @@ export class UserApi { headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -341,6 +539,11 @@ export class UserApi { return deferred.promise; } + /** + * Logs out current logged in user session + * + + */ public logoutUser () : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/logout'; let queryParameters: any = {}; @@ -348,8 +551,11 @@ export class UserApi { let formParams: any = {}; + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -358,8 +564,10 @@ export class UserApi { headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -385,6 +593,12 @@ export class UserApi { return deferred.promise; } + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. + + */ public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User; }> { const path = this.url + this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); @@ -398,8 +612,11 @@ export class UserApi { throw new Error('Missing required parameter username when calling getUserByName'); } + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); let requestOptions: request.Options = { @@ -408,8 +625,10 @@ export class UserApi { headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -435,6 +654,13 @@ export class UserApi { return deferred.promise; } + /** + * Updated user + * This can only be done by the logged in user. + * @param username name that need to be deleted + * @param body Updated user object + + */ public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); @@ -448,8 +674,11 @@ export class UserApi { throw new Error('Missing required parameter username when calling updateUser'); } + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -458,9 +687,12 @@ export class UserApi { headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -486,6 +718,12 @@ export class UserApi { return deferred.promise; } + /** + * Delete user + * This can only be done by the logged in user. + * @param username The name that needs to be deleted + + */ public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); @@ -499,8 +737,11 @@ export class UserApi { throw new Error('Missing required parameter username when calling deleteUser'); } + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -509,8 +750,10 @@ export class UserApi { headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -535,465 +778,12 @@ export class UserApi { return deferred.promise; } + } -export class PetApi { - protected basePath = 'http://petstore.swagger.io/v2'; - protected defaultHeaders : any = {}; - public authentications = { - 'default': new VoidAuth(), - 'api_key': new ApiKeyAuth('header', 'api_key'), - 'petstore_auth': new OAuth(), - } - constructor(url: string, basePath?: string); - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { - if (password) { - if (basePath) { - this.basePath = basePath; - } - } else { - if (basePathOrUsername) { - this.basePath = basePathOrUsername - } - } - } - - set apiKey(key: string) { - this.authentications.api_key.apiKey = key; - } - private extendObj(objA: T1, objB: T2) { - for(let key in objB){ - if(objB.hasOwnProperty(key)){ - objA[key] = objB[key]; - } - } - return objA; - } - - public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/pet'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - let useFormData = false; - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'PUT', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - body: body, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/pet'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - let useFormData = false; - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - body: body, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { - const path = this.url + this.basePath + '/pet/findByStatus'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - if (status !== undefined) { - queryParameters['status'] = status; - } - - let useFormData = false; - - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { - const path = this.url + this.basePath + '/pet/findByTags'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - if (tags !== undefined) { - queryParameters['tags'] = tags; - } - - let useFormData = false; - - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { - const path = this.url + this.basePath + '/pet/{petId}' - .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling getPetById'); - } - - let useFormData = false; - - let deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.api_key.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/pet/{petId}' - .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling updatePetWithForm'); - } - - let useFormData = false; - - if (name !== undefined) { - formParams['name'] = name; - } - - if (status !== undefined) { - formParams['status'] = status; - } - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/pet/{petId}' - .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling deletePet'); - } - - headerParams['api_key'] = apiKey; - - let useFormData = false; - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'DELETE', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/pet/{petId}/uploadImage' - .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling uploadFile'); - } - - let useFormData = false; - - if (additionalMetadata !== undefined) { - formParams['additionalMetadata'] = additionalMetadata; - } - - if (file !== undefined) { - formParams['file'] = file; - } - useFormData = true; - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - } - - this.authentications.petstore_auth.applyToRequest(requestOptions); - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } -} export class StoreApi { protected basePath = 'http://petstore.swagger.io/v2'; protected defaultHeaders : any = {}; @@ -1002,13 +792,34 @@ export class StoreApi { public authentications = { 'default': new VoidAuth(), - 'api_key': new ApiKeyAuth('header', 'api_key'), + + + + 'petstore_auth': new OAuth(), + + + + + 'api_key': new ApiKeyAuth('header', 'api_key'), + + + } constructor(url: string, basePath?: string); + + + + + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { + + + + + if (basePath) { this.basePath = basePath; } @@ -1019,9 +830,20 @@ export class StoreApi { } } + + + + + + + + set apiKey(key: string) { this.authentications.api_key.apiKey = key; } + + + private extendObj(objA: T1, objB: T2) { for(let key in objB){ if(objB.hasOwnProperty(key)){ @@ -1031,6 +853,11 @@ export class StoreApi { return objA; } + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + + */ public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { const path = this.url + this.basePath + '/store/inventory'; let queryParameters: any = {}; @@ -1038,8 +865,11 @@ export class StoreApi { let formParams: any = {}; + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); let requestOptions: request.Options = { @@ -1048,10 +878,13 @@ export class StoreApi { headers: headerParams, uri: path, json: true, + } + this.authentications.api_key.applyToRequest(requestOptions); + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1077,6 +910,12 @@ export class StoreApi { return deferred.promise; } + /** + * Place an order for a pet + * + * @param body order placed for purchasing the pet + + */ public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { const path = this.url + this.basePath + '/store/order'; let queryParameters: any = {}; @@ -1084,8 +923,11 @@ export class StoreApi { let formParams: any = {}; + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); let requestOptions: request.Options = { @@ -1094,9 +936,12 @@ export class StoreApi { headers: headerParams, uri: path, json: true, + body: body, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1122,6 +967,12 @@ export class StoreApi { return deferred.promise; } + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * @param orderId ID of pet that needs to be fetched + + */ public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { const path = this.url + this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); @@ -1135,8 +986,11 @@ export class StoreApi { throw new Error('Missing required parameter orderId when calling getOrderById'); } + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); let requestOptions: request.Options = { @@ -1145,8 +999,10 @@ export class StoreApi { headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1172,6 +1028,12 @@ export class StoreApi { return deferred.promise; } + /** + * Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * @param orderId ID of the order that needs to be deleted + + */ public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); @@ -1185,8 +1047,11 @@ export class StoreApi { throw new Error('Missing required parameter orderId when calling deleteOrder'); } + + let useFormData = false; + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1195,8 +1060,10 @@ export class StoreApi { headers: headerParams, uri: path, json: true, + } + this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1221,4 +1088,618 @@ export class StoreApi { return deferred.promise; } + } + + + + +export class PetApi { + protected basePath = 'http://petstore.swagger.io/v2'; + protected defaultHeaders : any = {}; + + + + public authentications = { + 'default': new VoidAuth(), + + + + + 'petstore_auth': new OAuth(), + + + + + 'api_key': new ApiKeyAuth('header', 'api_key'), + + + + } + + constructor(url: string, basePath?: string); + + + + + + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { + if (password) { + + + + + + if (basePath) { + this.basePath = basePath; + } + } else { + if (basePathOrUsername) { + this.basePath = basePathOrUsername + } + } + } + + + + + + + + + + set apiKey(key: string) { + this.authentications.api_key.apiKey = key; + } + + + + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } + + /** + * Update an existing pet + * + * @param body Pet object that needs to be added to the store + + */ + public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'PUT', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + body: body, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * Add a new pet to the store + * + * @param body Pet object that needs to be added to the store + + */ + public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + body: body, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * Finds Pets by status + * Multiple status values can be provided with comma seperated strings + * @param status Status values that need to be considered for filter + + */ + public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { + const path = this.url + this.basePath + '/pet/findByStatus'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + if (status !== undefined) { + queryParameters['status'] = status; + } + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * Finds Pets by tags + * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + * @param tags Tags to filter by + + */ + public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { + const path = this.url + this.basePath + '/pet/findByTags'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + + if (tags !== undefined) { + queryParameters['tags'] = tags; + } + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * Find pet by ID + * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + * @param petId ID of pet that needs to be fetched + + */ + public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { + const path = this.url + this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling getPetById'); + } + + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.api_key.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated + * @param name Updated name of the pet + * @param status Updated status of the pet + + */ + public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling updatePetWithForm'); + } + + + + let useFormData = false; + + + if (name !== undefined) { + formParams['name'] = name; + } + + + + if (status !== undefined) { + formParams['status'] = status; + } + + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * Deletes a pet + * + * @param petId Pet id to delete + * @param apiKey + + */ + public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet/{petId}' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling deletePet'); + } + + + + headerParams['api_key'] = apiKey; + + + let useFormData = false; + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'DELETE', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + + /** + * uploads an image + * + * @param petId ID of pet to update + * @param additionalMetadata Additional data to pass to server + * @param file file to upload + + */ + public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/pet/{petId}/uploadImage' + .replace('{' + 'petId' + '}', String(petId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling uploadFile'); + } + + + + let useFormData = false; + + + if (additionalMetadata !== undefined) { + formParams['additionalMetadata'] = additionalMetadata; + } + + + + if (file !== undefined) { + formParams['file'] = file; + } + + useFormData = true; + + + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + + } + + + this.authentications.petstore_auth.applyToRequest(requestOptions); + + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + +} + + + From 389ce144ef890b12a0138e073c4b63428982c815 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Thu, 12 Nov 2015 00:36:30 +0100 Subject: [PATCH 115/142] Improved documentation methods - API classes have rudimentary class doc info and useful method doc info - object classes have more detailed method and class info - added more tests for doc methods --- .../src/main/resources/perl/api.mustache | 5 +- .../src/main/resources/perl/object.mustache | 16 ++++- .../lib/WWW/SwaggerClient/Object/Category.pm | 23 ++++++- .../lib/WWW/SwaggerClient/Object/Order.pm | 51 ++++++++++++++- .../perl/lib/WWW/SwaggerClient/Object/Pet.pm | 51 ++++++++++++++- .../perl/lib/WWW/SwaggerClient/Object/Tag.pm | 23 ++++++- .../perl/lib/WWW/SwaggerClient/Object/User.pm | 65 ++++++++++++++++++- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 5 +- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 5 +- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 5 +- samples/client/petstore/perl/t/04_role.t | 37 ++++++++--- 11 files changed, 268 insertions(+), 18 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index 4a48cf2211c..f9312b994b3 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -33,8 +33,11 @@ use WWW::{{moduleName}}::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('class_documentation' => {}); +__PACKAGE__->class_documentation({description => '', # TODO + class => '{{classname}}', +} ); sub new { my $class = shift; diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache index c397569c396..00c572453c1 100644 --- a/modules/swagger-codegen/src/main/resources/perl/object.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache @@ -21,7 +21,21 @@ use base "WWW::{{moduleName}}::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->class_documentation({description => '{{description}}'}); +__PACKAGE__->class_documentation({description => '{{description}}', + class => '{{classname}}', + required => [], # TODO +} ); + +__PACKAGE__->method_documentation({ + {{#vars}}'{{name}}' => { + datatype => '{{datatype}}', + base_name => '{{baseName}}', + description => '{{description}}', + format => '{{format}}', + read_only => '{{readOnly}}', + }, + {{/vars}} +}); __PACKAGE__->swagger_types( { {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm index a08ae19ac43..43c12b040c7 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm @@ -19,7 +19,28 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->class_documentation({description => ''}); +__PACKAGE__->class_documentation({description => '', + class => 'Category', + required => [], # TODO +} ); + +__PACKAGE__->method_documentation({ + 'id' => { + datatype => 'int', + base_name => 'id', + description => '', + format => '', + read_only => '', + }, + 'name' => { + datatype => 'string', + base_name => 'name', + description => '', + format => '', + read_only => '', + }, + +}); __PACKAGE__->swagger_types( { 'id' => 'int', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm index fa411b8e254..ea5f6160ee5 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm @@ -19,7 +19,56 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->class_documentation({description => ''}); +__PACKAGE__->class_documentation({description => '', + class => 'Order', + required => [], # TODO +} ); + +__PACKAGE__->method_documentation({ + 'id' => { + datatype => 'int', + base_name => 'id', + description => '', + format => '', + read_only => '', + }, + 'pet_id' => { + datatype => 'int', + base_name => 'petId', + description => '', + format => '', + read_only => '', + }, + 'quantity' => { + datatype => 'int', + base_name => 'quantity', + description => '', + format => '', + read_only => '', + }, + 'ship_date' => { + datatype => 'DateTime', + base_name => 'shipDate', + description => '', + format => '', + read_only => '', + }, + 'status' => { + datatype => 'string', + base_name => 'status', + description => 'Order Status', + format => '', + read_only => '', + }, + 'complete' => { + datatype => 'boolean', + base_name => 'complete', + description => '', + format => '', + read_only => '', + }, + +}); __PACKAGE__->swagger_types( { 'id' => 'int', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm index 58fc85d3f17..a1aeb134178 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm @@ -19,7 +19,56 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->class_documentation({description => ''}); +__PACKAGE__->class_documentation({description => '', + class => 'Pet', + required => [], # TODO +} ); + +__PACKAGE__->method_documentation({ + 'id' => { + datatype => 'int', + base_name => 'id', + description => '', + format => '', + read_only => '', + }, + 'category' => { + datatype => 'Category', + base_name => 'category', + description => '', + format => '', + read_only => '', + }, + 'name' => { + datatype => 'string', + base_name => 'name', + description => '', + format => '', + read_only => '', + }, + 'photo_urls' => { + datatype => 'ARRAY[string]', + base_name => 'photoUrls', + description => '', + format => '', + read_only => '', + }, + 'tags' => { + datatype => 'ARRAY[Tag]', + base_name => 'tags', + description => '', + format => '', + read_only => '', + }, + 'status' => { + datatype => 'string', + base_name => 'status', + description => 'pet status in the store', + format => '', + read_only => '', + }, + +}); __PACKAGE__->swagger_types( { 'id' => 'int', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm index c3e6ca993ba..a50eded7cde 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm @@ -19,7 +19,28 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->class_documentation({description => ''}); +__PACKAGE__->class_documentation({description => '', + class => 'Tag', + required => [], # TODO +} ); + +__PACKAGE__->method_documentation({ + 'id' => { + datatype => 'int', + base_name => 'id', + description => '', + format => '', + read_only => '', + }, + 'name' => { + datatype => 'string', + base_name => 'name', + description => '', + format => '', + read_only => '', + }, + +}); __PACKAGE__->swagger_types( { 'id' => 'int', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm index 1da22e6431b..cb431b1e059 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm @@ -19,7 +19,70 @@ use base "WWW::SwaggerClient::Object::BaseObject"; #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. # -__PACKAGE__->class_documentation({description => ''}); +__PACKAGE__->class_documentation({description => '', + class => 'User', + required => [], # TODO +} ); + +__PACKAGE__->method_documentation({ + 'id' => { + datatype => 'int', + base_name => 'id', + description => '', + format => '', + read_only => '', + }, + 'username' => { + datatype => 'string', + base_name => 'username', + description => '', + format => '', + read_only => '', + }, + 'first_name' => { + datatype => 'string', + base_name => 'firstName', + description => '', + format => '', + read_only => '', + }, + 'last_name' => { + datatype => 'string', + base_name => 'lastName', + description => '', + format => '', + read_only => '', + }, + 'email' => { + datatype => 'string', + base_name => 'email', + description => '', + format => '', + read_only => '', + }, + 'password' => { + datatype => 'string', + base_name => 'password', + description => '', + format => '', + read_only => '', + }, + 'phone' => { + datatype => 'string', + base_name => 'phone', + description => '', + format => '', + read_only => '', + }, + 'user_status' => { + datatype => 'int', + base_name => 'userStatus', + description => 'User Status', + format => '', + read_only => '', + }, + +}); __PACKAGE__->swagger_types( { 'id' => 'int', diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index cbd65a7c003..7c632f44504 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -33,8 +33,11 @@ use WWW::SwaggerClient::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('class_documentation' => {}); +__PACKAGE__->class_documentation({description => '', # TODO + class => 'PetApi', +} ); sub new { my $class = shift; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 8a1f41036bb..70fd83317cb 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -33,8 +33,11 @@ use WWW::SwaggerClient::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('class_documentation' => {}); +__PACKAGE__->class_documentation({description => '', # TODO + class => 'StoreApi', +} ); sub new { my $class = shift; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index d8e2c9ae215..78a09f06138 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -33,8 +33,11 @@ use WWW::SwaggerClient::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('class_documentation' => {}); +__PACKAGE__->class_documentation({description => '', # TODO + class => 'UserApi', +} ); sub new { my $class = shift; diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t index c7104674dbb..f58e096032a 100644 --- a/samples/client/petstore/perl/t/04_role.t +++ b/samples/client/petstore/perl/t/04_role.t @@ -1,4 +1,4 @@ -use Test::More tests => 29; +use Test::More tests => 39; use Test::Exception; use Test::Warnings 'warnings'; use Test::Deep; @@ -15,7 +15,7 @@ SKIP: { sub auth_setup_handler {} "; - skip 'Moose not installed', 29 if $@; + skip 'Moose not installed', 39 if $@; my $api; @@ -62,18 +62,39 @@ is $get_pet->tags->[0]->name, 'just kidding', 'stored and retrieved: got the pro is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id'; # documentation tests -TODO: { - local $TODO = "Swagger spec doesn't populate all the description fields"; - is $api->pet_api->class_documentation->{description}, 'Pet API description', 'got corrrect Pet API description'; - is $get_pet->method_documentation->{name}, 'Description of the Pet object name() method', 'Pet object method_documentation is available'; -} +# API class docs +is $api->pet_api->class_documentation->{description}, '', 'got correct Pet API description'; # right now it's blank + +# API method docs is_deeply( [sort keys %{$api->pet_api->method_documentation}], [ 'add_pet', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'update_pet', 'update_pet_with_form', 'upload_file'], "Pet API method_documentation has the correct keys"); +is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{description}, + 'ID of pet that needs to be fetched', 'get_pet_by_id parameter pet_id description is correct'; +is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{required}, + 1, 'get_pet_by_id parameter pet_id is required'; +is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{data_type}, + 'int', 'get_pet_by_id parameter pet_id is an int'; +is $api->pet_api->method_documentation->{get_pet_by_id}->{returns}, + 'Pet', 'get_pet_by_id returns a Pet'; +is $api->pet_api->method_documentation->{get_pet_by_id}->{summary}, + 'Find pet by ID', 'get_pet_by_id summary is correct'; -my $pet_class_doco = { 'description' => '' }; +# object class docs +my $pet_class_doco = { 'description' => '', required => [], class => 'Pet' }; is_deeply($get_pet->class_documentation, $pet_class_doco, 'Pet object class_documentation is available'); +is $get_pet->class_documentation->{description}, '', 'Pet object class_documentation is correct'; # right now it's blank +is $get_pet->class_documentation->{class}, 'Pet', 'Pet object class_documentation returns correct class name'; + +# object method docs +is $get_pet->method_documentation->{status}->{description}, 'pet status in the store', 'Pet object method_documentation for status() - description is correct'; +is $get_pet->method_documentation->{status}->{format}, '', 'Pet object method_documentation for status() - format is correct'; +is $get_pet->method_documentation->{status}->{base_name}, 'status', 'Pet object method_documentation for status() - base_name is correct'; +is $get_pet->method_documentation->{status}->{datatype}, 'string', 'Pet object method_documentation for status() - datatype is correct'; + + + # / documentation tests my $tokens = { From cbc63d3285c14764c2fef027bea7b93834ea13f5 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 12 Nov 2015 16:13:10 +0800 Subject: [PATCH 116/142] remove line break in TS methods' comment --- .../resources/TypeScript-Angular/api.mustache | 3 +- .../resources/TypeScript-node/api.mustache | 3 +- .../typescript-angular/API/Client/Category.ts | 11 - .../typescript-angular/API/Client/Order.ts | 35 - .../typescript-angular/API/Client/Pet.ts | 35 - .../typescript-angular/API/Client/PetApi.ts | 109 --- .../typescript-angular/API/Client/StoreApi.ts | 44 - .../typescript-angular/API/Client/Tag.ts | 11 - .../typescript-angular/API/Client/User.ts | 24 - .../typescript-angular/API/Client/UserApi.ts | 91 -- .../typescript-angular/API/Client/api.d.ts | 30 +- .../client/petstore/typescript-node/api.ts | 880 +++++------------- 12 files changed, 245 insertions(+), 1031 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index fc787b6437f..9efea198f36 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -37,8 +37,7 @@ namespace {{package}} { * {{summary}} * {{notes}} {{#allParams}}* @param {{paramName}} {{description}} - {{/allParams}} - */ + {{/allParams}}*/ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> { const path = this.basePath + '{{path}}'{{#pathParams}} .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index 266dbaa412f..c1f311fec19 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -171,8 +171,7 @@ export class {{classname}} { * {{summary}} * {{notes}} {{#allParams}}* @param {{paramName}} {{description}} - {{/allParams}} - */ + {{/allParams}}*/ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> { const path = this.url + this.basePath + '{{path}}'{{#pathParams}} .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}}; diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts index 5e0a12f2122..a802fe4ebdf 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Category.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts @@ -3,22 +3,11 @@ namespace API.Client { 'use strict'; - - - export interface Category { - - id?: number; - - name?: string; - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts index 874efb18c7e..1dd84e6d0ad 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Order.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts @@ -3,65 +3,30 @@ namespace API.Client { 'use strict'; - - - export interface Order { - - id?: number; - - petId?: number; - - quantity?: number; - - shipDate?: Date; - - /** * Order Status */ - status?: Order.StatusEnum; - - complete?: boolean; - } - export namespace Order { - - - - - - - - - - export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } - - - - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts index bf1560de85c..60431f69c83 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts @@ -3,65 +3,30 @@ namespace API.Client { 'use strict'; - - - export interface Pet { - - id?: number; - - category?: Category; - - name: string; - - photoUrls: Array; - - tags?: Array; - - /** * pet status in the store */ - status?: Pet.StatusEnum; - } - export namespace Pet { - - - - - - - - - - - - export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } - - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts index 2e936fdddd1..11ef0aa3d5a 100644 --- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts @@ -2,11 +2,9 @@ /* tslint:disable:no-unused-variable member-ordering */ - namespace API.Client { 'use strict'; - export class PetApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -28,26 +26,16 @@ namespace API.Client { return objA; } - /** * Update an existing pet * * @param body Pet object that needs to be added to the store - */ public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'PUT', url: path, @@ -65,26 +53,16 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Add a new pet to the store * * @param body Pet object that needs to be added to the store - */ public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'POST', url: path, @@ -102,31 +80,20 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Finds Pets by status * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter - */ public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { const path = this.basePath + '/pet/findByStatus'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - if (status !== undefined) { queryParameters['status'] = status; } - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -143,31 +110,20 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Finds Pets by tags * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by - */ public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise> { const path = this.basePath + '/pet/findByTags'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - if (tags !== undefined) { queryParameters['tags'] = tags; } - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -184,12 +140,10 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Find pet by ID * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions * @param petId ID of pet that needs to be fetched - */ public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/pet/{petId}' @@ -197,19 +151,10 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling getPetById'); } - - - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -226,14 +171,12 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Updates a pet in the store with form data * * @param petId ID of pet that needs to be updated * @param name Updated name of the pet * @param status Updated status of the pet - */ public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}' @@ -241,35 +184,18 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } - - - - - - - - - headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; - - formParams['name'] = name; - formParams['status'] = status; - let httpRequestParams: any = { method: 'POST', url: path, @@ -287,13 +213,11 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Deletes a pet * * @param petId Pet id to delete * @param apiKey - */ public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}' @@ -301,24 +225,12 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling deletePet'); } - - - - - - headerParams['api_key'] = apiKey; - - - let httpRequestParams: any = { method: 'DELETE', url: path, @@ -335,14 +247,12 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * uploads an image * * @param petId ID of pet to update * @param additionalMetadata Additional data to pass to server * @param file file to upload - */ public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/pet/{petId}/uploadImage' @@ -350,35 +260,18 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling uploadFile'); } - - - - - - - - - headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; - - formParams['additionalMetadata'] = additionalMetadata; - formParams['file'] = file; - let httpRequestParams: any = { method: 'POST', url: path, @@ -396,7 +289,5 @@ namespace API.Client { return this.$http(httpRequestParams); } - } } - diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts index 492ef6885fe..3d3c445a144 100644 --- a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts @@ -2,11 +2,9 @@ /* tslint:disable:no-unused-variable member-ordering */ - namespace API.Client { 'use strict'; - export class StoreApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -28,23 +26,15 @@ namespace API.Client { return objA; } - /** * Returns pet inventories by status * Returns a map of status codes to quantities - */ public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> { const path = this.basePath + '/store/inventory'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -61,26 +51,16 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Place an order for a pet * * @param body order placed for purchasing the pet - */ public placeOrder (body?: Order, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/store/order'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'POST', url: path, @@ -98,12 +78,10 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Find purchase order by ID * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * @param orderId ID of pet that needs to be fetched - */ public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/store/order/{orderId}' @@ -111,19 +89,10 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling getOrderById'); } - - - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -140,12 +109,10 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Delete purchase order by ID * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * @param orderId ID of the order that needs to be deleted - */ public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/store/order/{orderId}' @@ -153,19 +120,10 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling deleteOrder'); } - - - - - - let httpRequestParams: any = { method: 'DELETE', url: path, @@ -182,7 +140,5 @@ namespace API.Client { return this.$http(httpRequestParams); } - } } - diff --git a/samples/client/petstore/typescript-angular/API/Client/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts index 66666719d89..1c0284cce48 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Tag.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts @@ -3,22 +3,11 @@ namespace API.Client { 'use strict'; - - - export interface Tag { - - id?: number; - - name?: string; - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts index 69e94835d30..7c2b0b78b0c 100644 --- a/samples/client/petstore/typescript-angular/API/Client/User.ts +++ b/samples/client/petstore/typescript-angular/API/Client/User.ts @@ -3,50 +3,26 @@ namespace API.Client { 'use strict'; - - - export interface User { - - id?: number; - - username?: string; - - firstName?: string; - - lastName?: string; - - email?: string; - - password?: string; - - phone?: string; - - /** * User Status */ - userStatus?: number; - } - - - } diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts index 036508eb69d..376bdb8935a 100644 --- a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts +++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts @@ -2,11 +2,9 @@ /* tslint:disable:no-unused-variable member-ordering */ - namespace API.Client { 'use strict'; - export class UserApi { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders : any = {}; @@ -28,26 +26,16 @@ namespace API.Client { return objA; } - /** * Create user * This can only be done by the logged in user. * @param body Created user object - */ public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'POST', url: path, @@ -65,26 +53,16 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Creates list of users with given input array * * @param body List of user object - */ public createUsersWithArrayInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/createWithArray'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'POST', url: path, @@ -102,26 +80,16 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Creates list of users with given input array * * @param body List of user object - */ public createUsersWithListInput (body?: Array, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/createWithList'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - - let httpRequestParams: any = { method: 'POST', url: path, @@ -139,39 +107,25 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Logs user into the system * * @param username The user name for login * @param password The password for login in clear text - */ public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/user/login'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - - if (username !== undefined) { queryParameters['username'] = username; } - if (password !== undefined) { queryParameters['password'] = password; } - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -188,23 +142,15 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Logs out current logged in user session * - */ public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/logout'; let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -221,12 +167,10 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Get user by user name * * @param username The name that needs to be fetched. Use user1 for testing. - */ public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise { const path = this.basePath + '/user/{username}' @@ -234,19 +178,10 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling getUserByName'); } - - - - - - let httpRequestParams: any = { method: 'GET', url: path, @@ -263,13 +198,11 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Updated user * This can only be done by the logged in user. * @param username name that need to be deleted * @param body Updated user object - */ public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/{username}' @@ -277,21 +210,10 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling updateUser'); } - - - - - - - - let httpRequestParams: any = { method: 'PUT', url: path, @@ -309,12 +231,10 @@ namespace API.Client { return this.$http(httpRequestParams); } - /** * Delete user * This can only be done by the logged in user. * @param username The name that needs to be deleted - */ public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> { const path = this.basePath + '/user/{username}' @@ -322,19 +242,10 @@ namespace API.Client { let queryParameters: any = {}; let headerParams: any = this.extendObj({}, this.defaultHeaders); - - - // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling deleteUser'); } - - - - - - let httpRequestParams: any = { method: 'DELETE', url: path, @@ -351,7 +262,5 @@ namespace API.Client { return this.$http(httpRequestParams); } - } } - diff --git a/samples/client/petstore/typescript-angular/API/Client/api.d.ts b/samples/client/petstore/typescript-angular/API/Client/api.d.ts index 7a4f79f38b1..19c60623dc9 100644 --- a/samples/client/petstore/typescript-angular/API/Client/api.d.ts +++ b/samples/client/petstore/typescript-angular/API/Client/api.d.ts @@ -1,37 +1,9 @@ - - /// - - - /// - - - /// - - - /// - - - /// - - - - - /// - - - -/// - - - /// - - - +/// diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 4728b6f8c14..ab5f05b46cb 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -8,181 +8,69 @@ import http = require('http'); /* tslint:disable:no-unused-variable */ - - - export class User { - - id: number; - - username: string; - - firstName: string; - - lastName: string; - - email: string; - - password: string; - - phone: string; - - /** * User Status */ - userStatus: number; - } - - - - - export class Category { - - id: number; - - name: string; - } - - - - - export class Pet { - - id: number; - - category: Category; - - name: string; - - photoUrls: Array; - - tags: Array; - - /** * pet status in the store */ - status: Pet.StatusEnum; - } - export namespace Pet { - - - - - - - - - - - - export enum StatusEnum { available = 'available', pending = 'pending', sold = 'sold', } - - } - - - - - export class Tag { - - id: number; - - name: string; - } - - - - - export class Order { - - id: number; - - petId: number; - - quantity: number; - - shipDate: Date; - - /** * Order Status */ - status: Order.StatusEnum; - - complete: boolean; - } - export namespace Order { - - - - - - - - - - export enum StatusEnum { placed = 'placed', approved = 'approved', delivered = 'delivered', } - - - - } - - - interface Authentication { /** * Apply authentication settings to header and query params. @@ -229,10 +117,6 @@ class VoidAuth implements Authentication { } } - - - - export class UserApi { protected basePath = 'http://petstore.swagger.io/v2'; protected defaultHeaders : any = {}; @@ -241,34 +125,13 @@ export class UserApi { public authentications = { 'default': new VoidAuth(), - - - - - 'petstore_auth': new OAuth(), - - - - 'api_key': new ApiKeyAuth('header', 'api_key'), - - - + 'petstore_auth': new OAuth(), } constructor(url: string, basePath?: string); - - - - - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { - - - - - if (basePath) { this.basePath = basePath; } @@ -279,20 +142,9 @@ export class UserApi { } } - - - - - - - - set apiKey(key: string) { this.authentications.api_key.apiKey = key; } - - - private extendObj(objA: T1, objB: T2) { for(let key in objB){ if(objB.hasOwnProperty(key)){ @@ -301,12 +153,10 @@ export class UserApi { } return objA; } - /** * Create user * This can only be done by the logged in user. * @param body Created user object - */ public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user'; @@ -315,11 +165,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -328,12 +175,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -358,12 +202,10 @@ export class UserApi { return deferred.promise; } - /** * Creates list of users with given input array * * @param body List of user object - */ public createUsersWithArrayInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/createWithArray'; @@ -372,11 +214,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -385,12 +224,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -415,12 +251,10 @@ export class UserApi { return deferred.promise; } - /** * Creates list of users with given input array * * @param body List of user object - */ public createUsersWithListInput (body?: Array) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/createWithList'; @@ -429,11 +263,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -442,12 +273,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -472,13 +300,11 @@ export class UserApi { return deferred.promise; } - /** * Logs user into the system * * @param username The user name for login * @param password The password for login in clear text - */ public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string; }> { const path = this.url + this.basePath + '/user/login'; @@ -487,21 +313,16 @@ export class UserApi { let formParams: any = {}; - if (username !== undefined) { queryParameters['username'] = username; } - if (password !== undefined) { queryParameters['password'] = password; } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: string; }>(); let requestOptions: request.Options = { @@ -510,10 +331,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -538,11 +357,9 @@ export class UserApi { return deferred.promise; } - /** * Logs out current logged in user session * - */ public logoutUser () : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/logout'; @@ -551,11 +368,8 @@ export class UserApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -564,10 +378,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -592,12 +404,10 @@ export class UserApi { return deferred.promise; } - /** * Get user by user name * * @param username The name that needs to be fetched. Use user1 for testing. - */ public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User; }> { const path = this.url + this.basePath + '/user/{username}' @@ -612,11 +422,8 @@ export class UserApi { throw new Error('Missing required parameter username when calling getUserByName'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); let requestOptions: request.Options = { @@ -625,10 +432,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -653,13 +458,11 @@ export class UserApi { return deferred.promise; } - /** * Updated user * This can only be done by the logged in user. * @param username name that need to be deleted * @param body Updated user object - */ public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/{username}' @@ -674,11 +477,8 @@ export class UserApi { throw new Error('Missing required parameter username when calling updateUser'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -687,12 +487,9 @@ export class UserApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -717,12 +514,10 @@ export class UserApi { return deferred.promise; } - /** * Delete user * This can only be done by the logged in user. * @param username The name that needs to be deleted - */ public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/user/{username}' @@ -737,11 +532,8 @@ export class UserApi { throw new Error('Missing required parameter username when calling deleteUser'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -750,10 +542,8 @@ export class UserApi { headers: headerParams, uri: path, json: true, - } - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -778,322 +568,7 @@ export class UserApi { return deferred.promise; } - } - - - - -export class StoreApi { - protected basePath = 'http://petstore.swagger.io/v2'; - protected defaultHeaders : any = {}; - - - - public authentications = { - 'default': new VoidAuth(), - - - - - 'petstore_auth': new OAuth(), - - - - - 'api_key': new ApiKeyAuth('header', 'api_key'), - - - - } - - constructor(url: string, basePath?: string); - - - - - - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { - if (password) { - - - - - - if (basePath) { - this.basePath = basePath; - } - } else { - if (basePathOrUsername) { - this.basePath = basePathOrUsername - } - } - } - - - - - - - - - - set apiKey(key: string) { - this.authentications.api_key.apiKey = key; - } - - - - private extendObj(objA: T1, objB: T2) { - for(let key in objB){ - if(objB.hasOwnProperty(key)){ - objA[key] = objB[key]; - } - } - return objA; - } - - /** - * Returns pet inventories by status - * Returns a map of status codes to quantities - - */ - public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { - const path = this.url + this.basePath + '/store/inventory'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - } - - - this.authentications.api_key.applyToRequest(requestOptions); - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - /** - * Place an order for a pet - * - * @param body order placed for purchasing the pet - - */ - public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { - const path = this.url + this.basePath + '/store/order'; - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); - - let requestOptions: request.Options = { - method: 'POST', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - body: body, - - } - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - /** - * Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * @param orderId ID of pet that needs to be fetched - - */ - public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { - const path = this.url + this.basePath + '/store/order/{orderId}' - .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling getOrderById'); - } - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); - - let requestOptions: request.Options = { - method: 'GET', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - } - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - - /** - * Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * @param orderId ID of the order that needs to be deleted - - */ - public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { - const path = this.url + this.basePath + '/store/order/{orderId}' - .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = {}; - let headerParams: any = this.extendObj({}, this.defaultHeaders); - let formParams: any = {}; - - - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling deleteOrder'); - } - - - - let useFormData = false; - - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); - - let requestOptions: request.Options = { - method: 'DELETE', - qs: queryParameters, - headers: headerParams, - uri: path, - json: true, - - } - - - this.authentications.default.applyToRequest(requestOptions); - - if (Object.keys(formParams).length) { - if (useFormData) { - (requestOptions).formData = formParams; - } else { - requestOptions.form = formParams; - } - } - - request(requestOptions, (error, response, body) => { - if (error) { - deferred.reject(error); - } else { - if (response.statusCode >= 200 && response.statusCode <= 299) { - deferred.resolve({ response: response, body: body }); - } else { - deferred.reject({ response: response, body: body }); - } - } - }); - - return deferred.promise; - } - -} - - - - export class PetApi { protected basePath = 'http://petstore.swagger.io/v2'; protected defaultHeaders : any = {}; @@ -1102,34 +577,13 @@ export class PetApi { public authentications = { 'default': new VoidAuth(), - - - - - 'petstore_auth': new OAuth(), - - - - 'api_key': new ApiKeyAuth('header', 'api_key'), - - - + 'petstore_auth': new OAuth(), } constructor(url: string, basePath?: string); - - - - - constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { if (password) { - - - - - if (basePath) { this.basePath = basePath; } @@ -1140,20 +594,9 @@ export class PetApi { } } - - - - - - - - set apiKey(key: string) { this.authentications.api_key.apiKey = key; } - - - private extendObj(objA: T1, objB: T2) { for(let key in objB){ if(objB.hasOwnProperty(key)){ @@ -1162,12 +605,10 @@ export class PetApi { } return objA; } - /** * Update an existing pet * * @param body Pet object that needs to be added to the store - */ public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet'; @@ -1176,11 +617,8 @@ export class PetApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1189,15 +627,11 @@ export class PetApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1222,12 +656,10 @@ export class PetApi { return deferred.promise; } - /** * Add a new pet to the store * * @param body Pet object that needs to be added to the store - */ public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet'; @@ -1236,11 +668,8 @@ export class PetApi { let formParams: any = {}; - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1249,15 +678,11 @@ export class PetApi { headers: headerParams, uri: path, json: true, - body: body, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1282,12 +707,10 @@ export class PetApi { return deferred.promise; } - /** * Finds Pets by status * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter - */ public findPetsByStatus (status?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { const path = this.url + this.basePath + '/pet/findByStatus'; @@ -1296,16 +719,12 @@ export class PetApi { let formParams: any = {}; - if (status !== undefined) { queryParameters['status'] = status; } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); let requestOptions: request.Options = { @@ -1314,13 +733,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1345,12 +761,10 @@ export class PetApi { return deferred.promise; } - /** * Finds Pets by tags * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by - */ public findPetsByTags (tags?: Array) : Promise<{ response: http.ClientResponse; body: Array; }> { const path = this.url + this.basePath + '/pet/findByTags'; @@ -1359,16 +773,12 @@ export class PetApi { let formParams: any = {}; - if (tags !== undefined) { queryParameters['tags'] = tags; } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Array; }>(); let requestOptions: request.Options = { @@ -1377,13 +787,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1408,12 +815,10 @@ export class PetApi { return deferred.promise; } - /** * Find pet by ID * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions * @param petId ID of pet that needs to be fetched - */ public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet; }> { const path = this.url + this.basePath + '/pet/{petId}' @@ -1428,11 +833,8 @@ export class PetApi { throw new Error('Missing required parameter petId when calling getPetById'); } - - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); let requestOptions: request.Options = { @@ -1441,13 +843,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.api_key.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1472,14 +871,12 @@ export class PetApi { return deferred.promise; } - /** * Updates a pet in the store with form data * * @param petId ID of pet that needs to be updated * @param name Updated name of the pet * @param status Updated status of the pet - */ public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet/{petId}' @@ -1494,23 +891,16 @@ export class PetApi { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } - - let useFormData = false; - if (name !== undefined) { formParams['name'] = name; } - - if (status !== undefined) { formParams['status'] = status; } - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1519,13 +909,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1550,13 +937,11 @@ export class PetApi { return deferred.promise; } - /** * Deletes a pet * * @param petId Pet id to delete * @param apiKey - */ public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet/{petId}' @@ -1571,14 +956,10 @@ export class PetApi { throw new Error('Missing required parameter petId when calling deletePet'); } - - headerParams['api_key'] = apiKey; - let useFormData = false; - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1587,13 +968,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1618,14 +996,12 @@ export class PetApi { return deferred.promise; } - /** * uploads an image * * @param petId ID of pet to update * @param additionalMetadata Additional data to pass to server * @param file file to upload - */ public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any; }> { const path = this.url + this.basePath + '/pet/{petId}/uploadImage' @@ -1640,25 +1016,17 @@ export class PetApi { throw new Error('Missing required parameter petId when calling uploadFile'); } - - let useFormData = false; - if (additionalMetadata !== undefined) { formParams['additionalMetadata'] = additionalMetadata; } - - if (file !== undefined) { formParams['file'] = file; } - useFormData = true; - - let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); let requestOptions: request.Options = { @@ -1667,13 +1035,10 @@ export class PetApi { headers: headerParams, uri: path, json: true, - } - this.authentications.petstore_auth.applyToRequest(requestOptions); - this.authentications.default.applyToRequest(requestOptions); if (Object.keys(formParams).length) { @@ -1698,8 +1063,247 @@ export class PetApi { return deferred.promise; } - } +export class StoreApi { + protected basePath = 'http://petstore.swagger.io/v2'; + protected defaultHeaders : any = {}; + public authentications = { + 'default': new VoidAuth(), + 'api_key': new ApiKeyAuth('header', 'api_key'), + 'petstore_auth': new OAuth(), + } + + constructor(url: string, basePath?: string); + constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) { + if (password) { + if (basePath) { + this.basePath = basePath; + } + } else { + if (basePathOrUsername) { + this.basePath = basePathOrUsername + } + } + } + + set apiKey(key: string) { + this.authentications.api_key.apiKey = key; + } + private extendObj(objA: T1, objB: T2) { + for(let key in objB){ + if(objB.hasOwnProperty(key)){ + objA[key] = objB[key]; + } + } + return objA; + } + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + */ + public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; }; }> { + const path = this.url + this.basePath + '/store/inventory'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + } + + this.authentications.api_key.applyToRequest(requestOptions); + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + /** + * Place an order for a pet + * + * @param body order placed for purchasing the pet + */ + public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order; }> { + const path = this.url + this.basePath + '/store/order'; + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + + let requestOptions: request.Options = { + method: 'POST', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + body: body, + } + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * @param orderId ID of pet that needs to be fetched + */ + public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order; }> { + const path = this.url + this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling getOrderById'); + } + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); + + let requestOptions: request.Options = { + method: 'GET', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + } + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } + /** + * Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * @param orderId ID of the order that needs to be deleted + */ + public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any; }> { + const path = this.url + this.basePath + '/store/order/{orderId}' + .replace('{' + 'orderId' + '}', String(orderId)); + let queryParameters: any = {}; + let headerParams: any = this.extendObj({}, this.defaultHeaders); + let formParams: any = {}; + + + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling deleteOrder'); + } + + let useFormData = false; + + let deferred = promise.defer<{ response: http.ClientResponse; body?: any; }>(); + + let requestOptions: request.Options = { + method: 'DELETE', + qs: queryParameters, + headers: headerParams, + uri: path, + json: true, + } + + this.authentications.default.applyToRequest(requestOptions); + + if (Object.keys(formParams).length) { + if (useFormData) { + (requestOptions).formData = formParams; + } else { + requestOptions.form = formParams; + } + } + + request(requestOptions, (error, response, body) => { + if (error) { + deferred.reject(error); + } else { + if (response.statusCode >= 200 && response.statusCode <= 299) { + deferred.resolve({ response: response, body: body }); + } else { + deferred.reject({ response: response, body: body }); + } + } + }); + + return deferred.promise; + } +} From 55bcceac07aa232662b8fe955fa92b0f129e2d57 Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 12 Nov 2015 17:10:03 +0800 Subject: [PATCH 117/142] Fix tests on date format by using custom date format --- .../src/test/java/io/swagger/petstore/test/StoreApiTest.java | 3 +++ .../src/test/java/io/swagger/petstore/test/StoreApiTest.java | 3 +++ .../src/test/java/io/swagger/petstore/test/StoreApiTest.java | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java index a1fd7e345a8..6094f2242e1 100644 --- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -8,6 +8,7 @@ import io.swagger.client.auth.*; import io.swagger.client.model.*; import java.util.Map; +import java.text.SimpleDateFormat; import org.junit.*; import static org.junit.Assert.*; @@ -21,6 +22,8 @@ public class StoreApiTest { // setup authentication ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); apiKeyAuth.setApiKey("special-key"); + // set custom date format that is used by the petstore server + api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")); } @Test diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java index a1fd7e345a8..6094f2242e1 100644 --- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -8,6 +8,7 @@ import io.swagger.client.auth.*; import io.swagger.client.model.*; import java.util.Map; +import java.text.SimpleDateFormat; import org.junit.*; import static org.junit.Assert.*; @@ -21,6 +22,8 @@ public class StoreApiTest { // setup authentication ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); apiKeyAuth.setApiKey("special-key"); + // set custom date format that is used by the petstore server + api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")); } @Test diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java index a1fd7e345a8..9335c0e6ce6 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -8,6 +8,7 @@ import io.swagger.client.auth.*; import io.swagger.client.model.*; import java.util.Map; +import java.text.SimpleDateFormat; import org.junit.*; import static org.junit.Assert.*; @@ -21,6 +22,10 @@ public class StoreApiTest { // setup authentication ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); apiKeyAuth.setApiKey("special-key"); + // set custom date format that is used by the petstore server + // Note: it would still work without this setting as okhttp-gson Java client supports + // various date formats by default, including the one used by petstore server + api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")); } @Test From 6d470d1896d052c718400dc793db2ddc8c25821a Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 12 Nov 2015 17:14:20 +0800 Subject: [PATCH 118/142] remove eclipse files --- .../java/retrofit2/.settings/org.eclipse.m2e.core.prefs | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs diff --git a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 From 93c6966501a318fce118cf00128de0c2b9fb6f78 Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 12 Nov 2015 17:34:12 +0800 Subject: [PATCH 119/142] Fix code of customizing date-time format in test --- .../test/java/io/swagger/petstore/test/StoreApiTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java index 9335c0e6ce6..589dae1a3ca 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -24,8 +24,10 @@ public class StoreApiTest { apiKeyAuth.setApiKey("special-key"); // set custom date format that is used by the petstore server // Note: it would still work without this setting as okhttp-gson Java client supports - // various date formats by default, including the one used by petstore server - api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")); + // various date formats by default (with lenientDatetimeFormat enabled), including + // the one used by petstore server + api.getApiClient().setDatetimeFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")); + api.getApiClient().setLenientDatetimeFormat(false); } @Test From c097696276f83c326e0d67f9a28895d74f598872 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Thu, 12 Nov 2015 13:03:04 +0100 Subject: [PATCH 120/142] Added more formats to autodoc output - narrow - wide - POD - HTML --- .../src/main/resources/perl/AutoDoc.mustache | 301 ++++++++++++++++-- .../src/main/resources/perl/README.md | 15 +- .../src/main/resources/perl/Role.mustache | 17 +- .../resources/perl/autodoc.script.mustache | 49 ++- samples/client/petstore/perl/README.md | 15 +- samples/client/petstore/perl/bin/autodoc | 49 ++- .../perl/lib/WWW/SwaggerClient/Role.pm | 17 +- .../lib/WWW/SwaggerClient/Role/AutoDoc.pm | 301 ++++++++++++++++-- samples/client/petstore/perl/t/04_role.t | 21 +- 9 files changed, 669 insertions(+), 116 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache index c756915f80f..b702c4a45f7 100644 --- a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache @@ -1,19 +1,21 @@ -package WWW::{{moduleName}}::Role::AutoDoc; +package WWW::BookeoClient::Role::AutoDoc; use List::MoreUtils qw(uniq); use Moose::Role; sub autodoc { - my $self = shift; + my ($self, $how) = @_; - $self->_printisa; - $self->_printmethods; - $self->_printattrs; + die "Unknown format '$how'" unless $how =~ /^(pod|wide|narrow)$/; + + $self->_printisa($how); + $self->_printmethods($how); + $self->_printattrs($how); print "\n"; } sub _printisa { - my $self = shift; + my ($self, $how) = @_; my $meta = $self->meta; my $myclass = ref $self; @@ -22,19 +24,26 @@ sub _printisa { my @roles = $meta->calculate_all_roles; shift(@roles); # the first is a composite, the rest are the roles - my $isa = join ', ', $meta->linearized_isa; + my $isa = join ', ', grep {$_ ne $myclass} $meta->linearized_isa; my $sub = join ', ', $meta->subclasses; my $dsub = join ', ', $meta->direct_subclasses; my ($rolepkg, $role_reqs); - $~ = 'INHERIT'; + $~ = $how eq 'pod' ? 'INHERIT_POD' : 'INHERIT'; write; foreach my $role (@roles) { $rolepkg = $role->{package}; + next if $rolepkg eq 'WWW::BookeoClient::Role::AutoDoc'; $role_reqs = join ', ', keys %{$role->{required_methods}}; - $~ = 'ROLES'; + $role_reqs ||= ''; + $~ = $how eq 'pod' ? 'ROLES_POD' : 'ROLES'; + write; + } + + if ($how eq 'pod') { + $~ = 'ROLES_POD_CLOSE'; write; } @@ -51,23 +60,94 @@ $myclass $sub . format ROLES = - Composes: @* - $rolepkg - requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ - $role_reqs + Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $rolepkg + requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ + $role_reqs + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $role_reqs +. + + format INHERIT_POD = +=head1 NAME + +@* +$myclass + +=head1 INHERITANCE + +=head2 Base class(es) + +@* +$isa + +=head2 Direct subclasses + +@* +$dsub + +=head2 All subclasses + +@* +$sub + +=head1 COMPOSITION + +@* composes the following roles: +$myclass + + +. + format ROLES_POD = +=head2 C<@*> + $rolepkg + +Requires: + +@* +$role_reqs + +. + format ROLES_POD_CLOSE = + + . # ----- / format specs ----- } sub _printmethods { - my $self = shift; - $~ = 'METHODHEAD'; - write; - $self->_printmethod($_) for uniq sort $self->meta->get_method_list, $self->meta->get_all_method_names; + my ($self, $how) = @_; + + if ($how eq 'narrow') { + print <_printmethod($_, $how) for uniq sort $self->meta->get_all_method_names; #$self->meta->get_method_list, + + if ($how eq 'pod') { + $~ = 'METHOD_POD_CLOSE'; + write; + } + + } sub _printmethod { - my ($self, $methodname) = @_; + my ($self, $methodname, $how) = @_; return if $methodname =~ /^_/; return if $self->meta->has_attribute($methodname); my %internal = map {$_ => 1} qw(BUILD BUILDARGS meta can new DEMOLISHALL DESTROY @@ -78,44 +158,134 @@ sub _printmethod { return if $method->original_package_name eq __PACKAGE__; - my $delegation = ''; my $delegate_to = ''; my $via = ''; my $on = ''; + my $original_pkg = $method->original_package_name; if ($method->can('associated_attribute')) { $delegate_to = $method->delegate_to_method; my $aa = $method->associated_attribute; $on = $aa->{isa}; $via = $aa->{name}; + $original_pkg = "(flattened into $original_pkg from ???)"; # TODO - need to get hold of the role pkg, not the pkg it's flattened onto + use Data::Dumper; + #print Dumper($aa); + } + + if ($how eq 'narrow') { + $~ = 'METHOD_NARROW'; + write; + } + elsif ($how eq 'pod' and $delegate_to) { + $~ = 'METHOD_POD_DELEGATED'; + write; + } + elsif ($how eq 'pod') { + $~ = 'METHOD_POD'; + write; + } + else { + $~ = 'METHOD'; + write; } - $~ = 'METHOD'; - write; - # ----- format specs ----- format METHODHEAD = METHODS ------- -Name delegate to on via -=================================================================================================================================== +Name delegates to on via +=========================================================================================================================================================================== . format METHOD = -@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<... -$methodname, $delegate_to, $on, $via +@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<... +$methodname, $delegate_to, $on, $via +. + + format METHOD_NARROW = +@* +$methodname + original pkg: @* + $original_pkg + delegates to: @* + $delegate_to + on: @* + $on + via: @* + $via + +. + + format METHODHEAD_POD = + +=head1 METHODS + +. + + format METHOD_POD = + +=head2 C<@*()> + $methodname + + Defined in: @* + $original_pkg + + +. + format METHOD_POD_DELEGATED = + +=head2 C<@*()> + $methodname + + Defined in: @* + $original_pkg + Delegates to: @*() + $delegate_to + On: @* + $on + Via: @*() + $via + Same as: $self->@*->@*() + $via, $delegate_to + +. + format METHOD_POD_CLOSE = + . # ----- / format specs ----- } sub _printattrs { - my $self = shift; - $~ = 'ATTRHEAD'; - write; - $self->_printattr($_) for sort $self->meta->get_attribute_list; + my ($self, $how) = @_; + + if ($how eq 'narrow') { + print <_printattr($_, $how) for sort $self->meta->get_attribute_list; + + if ($how eq 'pod') { + $~ = 'ATTR_POD_CLOSE'; + write; + } } sub _printattr { - my ($self, $attrname) = @_; + my ($self, $attrname, $how) = @_; return if $attrname =~ /^_/; my $attr = $self->meta->get_attribute($attrname) or die "No attr for $attrname"; @@ -128,12 +298,22 @@ sub _printattr { my $tc = $attr->type_constraint || ''; my $from = $attr->associated_class->name || ''; - my $reqd = $attr->is_required ? 'reqd' : 'opt'; - my $lazy = $attr->is_lazy ? 'lazy' : ''; - my $doc = $attr->has_documentation ? 'yes' : ''; + my $reqd = $attr->is_required ? 'yes' : 'no'; + my $lazy = $attr->is_lazy ? 'yes' : 'no'; + my $doc = $attr->has_documentation ? 'yes' : 'no'; my $handles = join ', ', sort @{$attr->handles || []}; + $handles ||= ''; - $~ = 'ATTR'; + if ($how eq 'narrow') { + $~ = 'ATTR_NARROW'; + } + elsif ($how eq 'pod') { + $~ = 'ATTR_POD'; + } + else { + $~ = 'ATTR'; + } + write; # ----- format specs ----- @@ -149,8 +329,59 @@ Name is isa reqd lazy doc handles $attrname, $is, $tc, $reqd, $lazy, $doc, $handles ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ $handles +. + + format ATTR_NARROW = +@* +$attrname + is: @* + $is + isa: @* + $tc + reqd: @* + $reqd + lazy: @* + $lazy + doc: @* + $doc + handles: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $handles + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $handles + +. + format ATTRHEAD_POD = +=head1 ATTRIBUTES + +. + format ATTR_POD = + +=head2 C<@*> + $attrname + + is: @* + $is + isa: @* + $tc + reqd: @* + $reqd + lazy: @* + $lazy + doc: @* + $doc + handles: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $handles + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $handles + +. + format ATTR_POD_CLOSE = + + . # ----- / format specs ----- } + + 1; \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index 491892b2f16..e3690f6f10b 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -175,8 +175,19 @@ you just built. # AUTOMATIC DOCUMENTATION -You can print out a summary of the generated API by running the included -`autodoc` script in the `bin` directory of your generated library. +You can print out a summary of the generated API by running the included +`autodoc` script in the `bin` directory of your generated library. A few +output formats are supported: + + Usage: autodoc [OPTION] + + -w wide format (default) + -n narrow format + -p POD format + -H HTML format + -h print this help message + + # DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index c0891ead424..4f78850ae73 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -51,9 +51,6 @@ sub BUILD { foreach my $method (keys %delegates) { if ( @{$delegates{$method}} > 1 ) { my ($apis) = delete $delegates{$method}; - foreach my $api (@$apis) { - warn sprintf "Cannot delegate %s (use \$self->%s_api->%s instead)\n", $method, lc($api->{api_name}), $method; - } } } @@ -261,8 +258,18 @@ you just built. =head1 AUTOMATIC DOCUMENTATION -You can print out a summary of the generated API by running the included -C script in the C directory of your generated library. +You can print out a summary of the generated API by running the included +C script in the C directory of your generated library. A few +output formats are supported: + + Usage: autodoc [OPTION] + + -w wide format (default) + -n narrow format + -p POD format + -H HTML format + -h print this help message + =head1 DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache index b39bd898647..547aad21d9d 100644 --- a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache @@ -1,19 +1,54 @@ #!/usr/bin/perl -package MyAutodoc; use FindBin; use File::Spec; use lib File::Spec->catdir($FindBin::Bin, '..', 'lib'); +use Getopt::Std; + +my %options=(); +getopts("wnphH", \%options); + +die "Too many options: there can be only one" if keys %options > 1; + +$options{w}++ unless keys %options; + +if ($options{h}) { + print <new; +my $opt; +$opt = 'pod' if $options{p}; +$opt = 'wide' if $options{w}; +$opt = 'narrow' if $options{n}; +$opt = 'pod' if $options{H}; -print $api->autodoc; +my $api = My::App->new; + +if ($options{H}) { + my $pod2html = "pod2html --backlink --css http://st.pimg.net/tucs/style.css?3"; + open STDOUT, "| $pod2html" or die "Can't fork: $!"; + $api->autodoc($opt); + close STDOUT or die "Can't close: $!"; +} +else { + $api->autodoc($opt); +} exit(0); diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index 36e3521958e..4f668b93929 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -175,8 +175,19 @@ you just built. # AUTOMATIC DOCUMENTATION -You can print out a summary of the generated API by running the included -`autodoc` script in the `bin` directory of your generated library. +You can print out a summary of the generated API by running the included +`autodoc` script in the `bin` directory of your generated library. A few +output formats are supported: + + Usage: autodoc [OPTION] + + -w wide format (default) + -n narrow format + -p POD format + -H HTML format + -h print this help message + + # DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/samples/client/petstore/perl/bin/autodoc b/samples/client/petstore/perl/bin/autodoc index 0e9f893e642..547aad21d9d 100644 --- a/samples/client/petstore/perl/bin/autodoc +++ b/samples/client/petstore/perl/bin/autodoc @@ -1,19 +1,54 @@ #!/usr/bin/perl -package MyAutodoc; use FindBin; use File::Spec; use lib File::Spec->catdir($FindBin::Bin, '..', 'lib'); +use Getopt::Std; + +my %options=(); +getopts("wnphH", \%options); + +die "Too many options: there can be only one" if keys %options > 1; + +$options{w}++ unless keys %options; + +if ($options{h}) { + print <new; +my $opt; +$opt = 'pod' if $options{p}; +$opt = 'wide' if $options{w}; +$opt = 'narrow' if $options{n}; +$opt = 'pod' if $options{H}; -print $api->autodoc; +my $api = My::App->new; + +if ($options{H}) { + my $pod2html = "pod2html --backlink --css http://st.pimg.net/tucs/style.css?3"; + open STDOUT, "| $pod2html" or die "Can't fork: $!"; + $api->autodoc($opt); + close STDOUT or die "Can't close: $!"; +} +else { + $api->autodoc($opt); +} exit(0); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index 0983f219fdf..83bfb1b5da0 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -51,9 +51,6 @@ sub BUILD { foreach my $method (keys %delegates) { if ( @{$delegates{$method}} > 1 ) { my ($apis) = delete $delegates{$method}; - foreach my $api (@$apis) { - warn sprintf "Cannot delegate %s (use \$self->%s_api->%s instead)\n", $method, lc($api->{api_name}), $method; - } } } @@ -261,8 +258,18 @@ you just built. =head1 AUTOMATIC DOCUMENTATION -You can print out a summary of the generated API by running the included -C script in the C directory of your generated library. +You can print out a summary of the generated API by running the included +C script in the C directory of your generated library. A few +output formats are supported: + + Usage: autodoc [OPTION] + + -w wide format (default) + -n narrow format + -p POD format + -H HTML format + -h print this help message + =head1 DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm index 93b45427bbe..b702c4a45f7 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm @@ -1,19 +1,21 @@ -package WWW::SwaggerClient::Role::AutoDoc; +package WWW::BookeoClient::Role::AutoDoc; use List::MoreUtils qw(uniq); use Moose::Role; sub autodoc { - my $self = shift; + my ($self, $how) = @_; - $self->_printisa; - $self->_printmethods; - $self->_printattrs; + die "Unknown format '$how'" unless $how =~ /^(pod|wide|narrow)$/; + + $self->_printisa($how); + $self->_printmethods($how); + $self->_printattrs($how); print "\n"; } sub _printisa { - my $self = shift; + my ($self, $how) = @_; my $meta = $self->meta; my $myclass = ref $self; @@ -22,19 +24,26 @@ sub _printisa { my @roles = $meta->calculate_all_roles; shift(@roles); # the first is a composite, the rest are the roles - my $isa = join ', ', $meta->linearized_isa; + my $isa = join ', ', grep {$_ ne $myclass} $meta->linearized_isa; my $sub = join ', ', $meta->subclasses; my $dsub = join ', ', $meta->direct_subclasses; my ($rolepkg, $role_reqs); - $~ = 'INHERIT'; + $~ = $how eq 'pod' ? 'INHERIT_POD' : 'INHERIT'; write; foreach my $role (@roles) { $rolepkg = $role->{package}; + next if $rolepkg eq 'WWW::BookeoClient::Role::AutoDoc'; $role_reqs = join ', ', keys %{$role->{required_methods}}; - $~ = 'ROLES'; + $role_reqs ||= ''; + $~ = $how eq 'pod' ? 'ROLES_POD' : 'ROLES'; + write; + } + + if ($how eq 'pod') { + $~ = 'ROLES_POD_CLOSE'; write; } @@ -51,23 +60,94 @@ $myclass $sub . format ROLES = - Composes: @* - $rolepkg - requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ - $role_reqs + Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $rolepkg + requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ + $role_reqs + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $role_reqs +. + + format INHERIT_POD = +=head1 NAME + +@* +$myclass + +=head1 INHERITANCE + +=head2 Base class(es) + +@* +$isa + +=head2 Direct subclasses + +@* +$dsub + +=head2 All subclasses + +@* +$sub + +=head1 COMPOSITION + +@* composes the following roles: +$myclass + + +. + format ROLES_POD = +=head2 C<@*> + $rolepkg + +Requires: + +@* +$role_reqs + +. + format ROLES_POD_CLOSE = + + . # ----- / format specs ----- } sub _printmethods { - my $self = shift; - $~ = 'METHODHEAD'; - write; - $self->_printmethod($_) for uniq sort $self->meta->get_method_list, $self->meta->get_all_method_names; + my ($self, $how) = @_; + + if ($how eq 'narrow') { + print <_printmethod($_, $how) for uniq sort $self->meta->get_all_method_names; #$self->meta->get_method_list, + + if ($how eq 'pod') { + $~ = 'METHOD_POD_CLOSE'; + write; + } + + } sub _printmethod { - my ($self, $methodname) = @_; + my ($self, $methodname, $how) = @_; return if $methodname =~ /^_/; return if $self->meta->has_attribute($methodname); my %internal = map {$_ => 1} qw(BUILD BUILDARGS meta can new DEMOLISHALL DESTROY @@ -78,44 +158,134 @@ sub _printmethod { return if $method->original_package_name eq __PACKAGE__; - my $delegation = ''; my $delegate_to = ''; my $via = ''; my $on = ''; + my $original_pkg = $method->original_package_name; if ($method->can('associated_attribute')) { $delegate_to = $method->delegate_to_method; my $aa = $method->associated_attribute; $on = $aa->{isa}; $via = $aa->{name}; + $original_pkg = "(flattened into $original_pkg from ???)"; # TODO - need to get hold of the role pkg, not the pkg it's flattened onto + use Data::Dumper; + #print Dumper($aa); + } + + if ($how eq 'narrow') { + $~ = 'METHOD_NARROW'; + write; + } + elsif ($how eq 'pod' and $delegate_to) { + $~ = 'METHOD_POD_DELEGATED'; + write; + } + elsif ($how eq 'pod') { + $~ = 'METHOD_POD'; + write; + } + else { + $~ = 'METHOD'; + write; } - $~ = 'METHOD'; - write; - # ----- format specs ----- format METHODHEAD = METHODS ------- -Name delegate to on via -=================================================================================================================================== +Name delegates to on via +=========================================================================================================================================================================== . format METHOD = -@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<... -$methodname, $delegate_to, $on, $via +@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<... @<<<<<<<<<<<<<<<<... +$methodname, $delegate_to, $on, $via +. + + format METHOD_NARROW = +@* +$methodname + original pkg: @* + $original_pkg + delegates to: @* + $delegate_to + on: @* + $on + via: @* + $via + +. + + format METHODHEAD_POD = + +=head1 METHODS + +. + + format METHOD_POD = + +=head2 C<@*()> + $methodname + + Defined in: @* + $original_pkg + + +. + format METHOD_POD_DELEGATED = + +=head2 C<@*()> + $methodname + + Defined in: @* + $original_pkg + Delegates to: @*() + $delegate_to + On: @* + $on + Via: @*() + $via + Same as: $self->@*->@*() + $via, $delegate_to + +. + format METHOD_POD_CLOSE = + . # ----- / format specs ----- } sub _printattrs { - my $self = shift; - $~ = 'ATTRHEAD'; - write; - $self->_printattr($_) for sort $self->meta->get_attribute_list; + my ($self, $how) = @_; + + if ($how eq 'narrow') { + print <_printattr($_, $how) for sort $self->meta->get_attribute_list; + + if ($how eq 'pod') { + $~ = 'ATTR_POD_CLOSE'; + write; + } } sub _printattr { - my ($self, $attrname) = @_; + my ($self, $attrname, $how) = @_; return if $attrname =~ /^_/; my $attr = $self->meta->get_attribute($attrname) or die "No attr for $attrname"; @@ -128,12 +298,22 @@ sub _printattr { my $tc = $attr->type_constraint || ''; my $from = $attr->associated_class->name || ''; - my $reqd = $attr->is_required ? 'reqd' : 'opt'; - my $lazy = $attr->is_lazy ? 'lazy' : ''; - my $doc = $attr->has_documentation ? 'yes' : ''; + my $reqd = $attr->is_required ? 'yes' : 'no'; + my $lazy = $attr->is_lazy ? 'yes' : 'no'; + my $doc = $attr->has_documentation ? 'yes' : 'no'; my $handles = join ', ', sort @{$attr->handles || []}; + $handles ||= ''; - $~ = 'ATTR'; + if ($how eq 'narrow') { + $~ = 'ATTR_NARROW'; + } + elsif ($how eq 'pod') { + $~ = 'ATTR_POD'; + } + else { + $~ = 'ATTR'; + } + write; # ----- format specs ----- @@ -149,8 +329,59 @@ Name is isa reqd lazy doc handles $attrname, $is, $tc, $reqd, $lazy, $doc, $handles ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ $handles +. + + format ATTR_NARROW = +@* +$attrname + is: @* + $is + isa: @* + $tc + reqd: @* + $reqd + lazy: @* + $lazy + doc: @* + $doc + handles: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $handles + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $handles + +. + format ATTRHEAD_POD = +=head1 ATTRIBUTES + +. + format ATTR_POD = + +=head2 C<@*> + $attrname + + is: @* + $is + isa: @* + $tc + reqd: @* + $reqd + lazy: @* + $lazy + doc: @* + $doc + handles: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $handles + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + $handles + +. + format ATTR_POD_CLOSE = + + . # ----- / format specs ----- } + + 1; \ No newline at end of file diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t index f58e096032a..4a3d6ec13e8 100644 --- a/samples/client/petstore/perl/t/04_role.t +++ b/samples/client/petstore/perl/t/04_role.t @@ -1,4 +1,4 @@ -use Test::More tests => 39; +use Test::More tests => 38; use Test::Exception; use Test::Warnings 'warnings'; use Test::Deep; @@ -15,25 +15,10 @@ SKIP: { sub auth_setup_handler {} "; - skip 'Moose not installed', 39 if $@; + skip 'Moose not installed', 38 if $@; -my $api; -cmp_deeply( - [ warnings { $api = MyApp->new } ], - bag( - "Cannot delegate new (use \$self->pet_api->new instead)\n", - "Cannot delegate new (use \$self->store_api->new instead)\n", - "Cannot delegate new (use \$self->user_api->new instead)\n", - "Cannot delegate class_documentation (use \$self->pet_api->class_documentation instead)\n", - "Cannot delegate class_documentation (use \$self->store_api->class_documentation instead)\n", - "Cannot delegate class_documentation (use \$self->user_api->class_documentation instead)\n", - "Cannot delegate method_documentation (use \$self->pet_api->method_documentation instead)\n", - "Cannot delegate method_documentation (use \$self->store_api->method_documentation instead)\n", - "Cannot delegate method_documentation (use \$self->user_api->method_documentation instead)\n", - ), - 'got expected warnings about non-delegatable methods', - ); +my $api = MyApp->new; my $pet_id = 10008; # note - we don't need to 'use' these modules because they've already been loaded by ApiFactory From 25c19135ffb873b42efdce4926b17a6aede343ca Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Thu, 12 Nov 2015 14:55:48 +0100 Subject: [PATCH 121/142] autodoc can analyse arbitrary classes - added -c option to load and analyse any class --- .../src/main/resources/perl/AutoDoc.mustache | 10 ++-- .../src/main/resources/perl/README.md | 5 +- .../src/main/resources/perl/Role.mustache | 5 +- .../resources/perl/autodoc.script.mustache | 57 ++++++++++++------- samples/client/petstore/perl/README.md | 5 +- samples/client/petstore/perl/bin/autodoc | 57 ++++++++++++------- .../perl/lib/WWW/SwaggerClient/Role.pm | 5 +- .../lib/WWW/SwaggerClient/Role/AutoDoc.pm | 10 ++-- 8 files changed, 96 insertions(+), 58 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache index b702c4a45f7..3817deb8911 100644 --- a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache @@ -1,4 +1,4 @@ -package WWW::BookeoClient::Role::AutoDoc; +package WWW::{{moduleName}}::Role::AutoDoc; use List::MoreUtils qw(uniq); use Moose::Role; @@ -22,7 +22,7 @@ sub _printisa { my $super = join ', ', $meta->superclasses; my @roles = $meta->calculate_all_roles; - shift(@roles); # the first is a composite, the rest are the roles + #shift(@roles) if @roles > 1; # if > 1, the first is a composite, the rest are the roles my $isa = join ', ', grep {$_ ne $myclass} $meta->linearized_isa; my $sub = join ', ', $meta->subclasses; @@ -34,8 +34,8 @@ sub _printisa { write; foreach my $role (@roles) { - $rolepkg = $role->{package}; - next if $rolepkg eq 'WWW::BookeoClient::Role::AutoDoc'; + $rolepkg = $role->{package} || next; # some are anonymous, or something + next if $rolepkg eq 'WWW::{{moduleName}}::Role::AutoDoc'; $role_reqs = join ', ', keys %{$role->{required_methods}}; $role_reqs ||= ''; $~ = $how eq 'pod' ? 'ROLES_POD' : 'ROLES'; @@ -60,7 +60,7 @@ $myclass $sub . format ROLES = - Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ $rolepkg requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ $role_reqs diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index e3690f6f10b..7d0f62dca4b 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -186,8 +186,11 @@ output formats are supported: -p POD format -H HTML format -h print this help message + -c your application class + - +The `-c` option allows you to load and inspect your own application. A dummy +namespace is used if you don't supply your own class. # DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 4f78850ae73..72c4b47390f 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -269,7 +269,10 @@ output formats are supported: -p POD format -H HTML format -h print this help message - + -c your application class + +The C<-c> option allows you to load and inspect your own application. A dummy +namespace is used if you don't supply your own class. =head1 DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache index 547aad21d9d..d669119c28b 100644 --- a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache @@ -3,33 +3,27 @@ use FindBin; use File::Spec; use lib File::Spec->catdir($FindBin::Bin, '..', 'lib'); +use Moose::Util qw(apply_all_roles); use Getopt::Std; my %options=(); -getopts("wnphH", \%options); +getopts("wnphHc:", \%options); +help if $options{h}; -die "Too many options: there can be only one" if keys %options > 1; +my $my_app = $options{c} || 'My::App'; -$options{w}++ unless keys %options; - -if ($options{h}) { - print <new; +my $api = $my_app->new; if ($options{H}) { my $pod2html = "pod2html --backlink --css http://st.pimg.net/tucs/style.css?3"; @@ -52,3 +47,21 @@ else { } exit(0); + +# -------------------- +sub help { + print <catdir($FindBin::Bin, '..', 'lib'); +use Moose::Util qw(apply_all_roles); use Getopt::Std; my %options=(); -getopts("wnphH", \%options); +getopts("wnphHc:", \%options); +help if $options{h}; -die "Too many options: there can be only one" if keys %options > 1; +my $my_app = $options{c} || 'My::App'; -$options{w}++ unless keys %options; - -if ($options{h}) { - print <new; +my $api = $my_app->new; if ($options{H}) { my $pod2html = "pod2html --backlink --css http://st.pimg.net/tucs/style.css?3"; @@ -52,3 +47,21 @@ else { } exit(0); + +# -------------------- +sub help { + print < option allows you to load and inspect your own application. A dummy +namespace is used if you don't supply your own class. =head1 DOCUMENTATION FROM THE SWAGGER SPEC diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm index b702c4a45f7..333f5b4f626 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm @@ -1,4 +1,4 @@ -package WWW::BookeoClient::Role::AutoDoc; +package WWW::SwaggerClient::Role::AutoDoc; use List::MoreUtils qw(uniq); use Moose::Role; @@ -22,7 +22,7 @@ sub _printisa { my $super = join ', ', $meta->superclasses; my @roles = $meta->calculate_all_roles; - shift(@roles); # the first is a composite, the rest are the roles + #shift(@roles) if @roles > 1; # if > 1, the first is a composite, the rest are the roles my $isa = join ', ', grep {$_ ne $myclass} $meta->linearized_isa; my $sub = join ', ', $meta->subclasses; @@ -34,8 +34,8 @@ sub _printisa { write; foreach my $role (@roles) { - $rolepkg = $role->{package}; - next if $rolepkg eq 'WWW::BookeoClient::Role::AutoDoc'; + $rolepkg = $role->{package} || next; # some are anonymous, or something + next if $rolepkg eq 'WWW::SwaggerClient::Role::AutoDoc'; $role_reqs = join ', ', keys %{$role->{required_methods}}; $role_reqs ||= ''; $~ = $how eq 'pod' ? 'ROLES_POD' : 'ROLES'; @@ -60,7 +60,7 @@ $myclass $sub . format ROLES = - Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ + Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ $rolepkg requires: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ $role_reqs From f8db16c5cd1bf7e37df87278f19d4bd4f85c00b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20One=C8=9B?= Date: Wed, 11 Nov 2015 14:32:02 +0200 Subject: [PATCH 122/142] Fix typo in swift error variable name. --- .../src/main/resources/swift/APIs.mustache | 2 +- .../swift/AlamofireImplementations.mustache | 16 ++++++++-------- .../PetstoreClient/Classes/Swaggers/APIs.swift | 2 +- .../Classes/Swaggers/APIs/StoreAPI.swift | 16 ++++++++-------- .../Swaggers/AlamofireImplementations.swift | 16 ++++++++-------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache index dbe41eb9c0a..5a9f1f7a278 100644 --- a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache @@ -52,7 +52,7 @@ public class RequestBuilder { } } - public func execute(completion: (response: Response?, erorr: ErrorType?) -> Void) { } + public func execute(completion: (response: Response?, error: ErrorType?) -> Void) { } public func addHeader(name name: String, value: String) -> Self { if !value.isEmpty { diff --git a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache index dbc25584886..6b4d36f9410 100644 --- a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache @@ -20,7 +20,7 @@ class AlamofireRequestBuilder: RequestBuilder { super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody) } - override func execute(completion: (response: Response?, erorr: ErrorType?) -> Void) { + override func execute(completion: (response: Response?, error: ErrorType?) -> Void) { let managerId = NSUUID().UUIDString // Create a new manager for each request to customize its request header let configuration = NSURLSessionConfiguration.defaultSessionConfiguration() @@ -60,7 +60,7 @@ class AlamofireRequestBuilder: RequestBuilder { case .Success(let upload, _, _): self.processRequest(upload, managerId, completion) case .Failure(let encodingError): - completion(response: nil, erorr: encodingError) + completion(response: nil, error: encodingError) } } ) @@ -70,7 +70,7 @@ class AlamofireRequestBuilder: RequestBuilder { } - private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response?, erorr: ErrorType?) -> Void) { + private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response?, error: ErrorType?) -> Void) { if let credential = self.credential { request.authenticate(usingCredential: credential) } @@ -79,26 +79,26 @@ class AlamofireRequestBuilder: RequestBuilder { managerStore.removeValueForKey(managerId) if response.result.isFailure { - completion(response: nil, erorr: response.result.error) + completion(response: nil, error: response.result.error) return } if () is T { - completion(response: Response(response: response.response!, body: () as! T), erorr: nil) + completion(response: Response(response: response.response!, body: () as! T), error: nil) return } if let json: AnyObject = response.result.value { let body = Decoders.decode(clazz: T.self, source: json) - completion(response: Response(response: response.response!, body: body), erorr: nil) + completion(response: Response(response: response.response!, body: body), error: nil) return } else if "" is T { // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release // https://github.com/swagger-api/swagger-parser/pull/34 - completion(response: Response(response: response.response!, body: "" as! T), erorr: nil) + completion(response: Response(response: response.response!, body: "" as! T), error: nil) return } - completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) + completion(response: nil, error: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) } } diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift index 06155db0201..96eead0d8dd 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift @@ -52,7 +52,7 @@ public class RequestBuilder { } } - public func execute(completion: (response: Response?, erorr: ErrorType?) -> Void) { } + public func execute(completion: (response: Response?, error: ErrorType?) -> Void) { } public func addHeader(name name: String, value: String) -> Self { if !value.isEmpty { diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift index 949cad20310..c3865cb3ccc 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift @@ -52,14 +52,14 @@ extension PetstoreClientAPI { "petId" : 123456789, "quantity" : 123, "id" : 123456789, - "shipDate" : "2015-11-11T10:03:22.835+0000", + "shipDate" : "2015-11-11T12:31:12.079+0000", "complete" : true, "status" : "aeiou" }}, {contentType=application/xml, example= 123456 123456 0 - 2015-11-11T12:03:22.838Z + 2015-11-11T14:31:12.082Z string true }] @@ -67,14 +67,14 @@ extension PetstoreClientAPI { "petId" : 123456789, "quantity" : 123, "id" : 123456789, - "shipDate" : "2015-11-11T10:03:22.835+0000", + "shipDate" : "2015-11-11T12:31:12.079+0000", "complete" : true, "status" : "aeiou" }}, {contentType=application/xml, example= 123456 123456 0 - 2015-11-11T12:03:22.838Z + 2015-11-11T14:31:12.082Z string true }] @@ -104,14 +104,14 @@ extension PetstoreClientAPI { "petId" : 123456789, "quantity" : 123, "id" : 123456789, - "shipDate" : "2015-11-11T10:03:22.839+0000", + "shipDate" : "2015-11-11T12:31:12.083+0000", "complete" : true, "status" : "aeiou" }}, {contentType=application/xml, example= 123456 123456 0 - 2015-11-11T12:03:22.839Z + 2015-11-11T14:31:12.083Z string true }] @@ -119,14 +119,14 @@ extension PetstoreClientAPI { "petId" : 123456789, "quantity" : 123, "id" : 123456789, - "shipDate" : "2015-11-11T10:03:22.839+0000", + "shipDate" : "2015-11-11T12:31:12.083+0000", "complete" : true, "status" : "aeiou" }}, {contentType=application/xml, example= 123456 123456 0 - 2015-11-11T12:03:22.839Z + 2015-11-11T14:31:12.083Z string true }] diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift index dbc25584886..6b4d36f9410 100644 --- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift +++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift @@ -20,7 +20,7 @@ class AlamofireRequestBuilder: RequestBuilder { super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody) } - override func execute(completion: (response: Response?, erorr: ErrorType?) -> Void) { + override func execute(completion: (response: Response?, error: ErrorType?) -> Void) { let managerId = NSUUID().UUIDString // Create a new manager for each request to customize its request header let configuration = NSURLSessionConfiguration.defaultSessionConfiguration() @@ -60,7 +60,7 @@ class AlamofireRequestBuilder: RequestBuilder { case .Success(let upload, _, _): self.processRequest(upload, managerId, completion) case .Failure(let encodingError): - completion(response: nil, erorr: encodingError) + completion(response: nil, error: encodingError) } } ) @@ -70,7 +70,7 @@ class AlamofireRequestBuilder: RequestBuilder { } - private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response?, erorr: ErrorType?) -> Void) { + private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response?, error: ErrorType?) -> Void) { if let credential = self.credential { request.authenticate(usingCredential: credential) } @@ -79,26 +79,26 @@ class AlamofireRequestBuilder: RequestBuilder { managerStore.removeValueForKey(managerId) if response.result.isFailure { - completion(response: nil, erorr: response.result.error) + completion(response: nil, error: response.result.error) return } if () is T { - completion(response: Response(response: response.response!, body: () as! T), erorr: nil) + completion(response: Response(response: response.response!, body: () as! T), error: nil) return } if let json: AnyObject = response.result.value { let body = Decoders.decode(clazz: T.self, source: json) - completion(response: Response(response: response.response!, body: body), erorr: nil) + completion(response: Response(response: response.response!, body: body), error: nil) return } else if "" is T { // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release // https://github.com/swagger-api/swagger-parser/pull/34 - completion(response: Response(response: response.response!, body: "" as! T), erorr: nil) + completion(response: Response(response: response.response!, body: "" as! T), error: nil) return } - completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) + completion(response: nil, error: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) } } From 970c94a4d99ca62543def3ae71d5ea5413997a8f Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Thu, 12 Nov 2015 16:55:20 +0100 Subject: [PATCH 123/142] autodoc retrieves descriptions for delegated methods --- .../src/main/resources/perl/AutoDoc.mustache | 13 ++++++++----- .../src/main/resources/perl/Role.mustache | 4 ++-- .../petstore/perl/lib/WWW/SwaggerClient/Role.pm | 4 ++-- .../perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm | 13 ++++++++----- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache index 3817deb8911..ba0edd840ff 100644 --- a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache @@ -161,15 +161,15 @@ sub _printmethod { my $delegate_to = ''; my $via = ''; my $on = ''; + my $doc = ''; my $original_pkg = $method->original_package_name; if ($method->can('associated_attribute')) { $delegate_to = $method->delegate_to_method; my $aa = $method->associated_attribute; $on = $aa->{isa}; $via = $aa->{name}; - $original_pkg = "(flattened into $original_pkg from ???)"; # TODO - need to get hold of the role pkg, not the pkg it's flattened onto - use Data::Dumper; - #print Dumper($aa); + $original_pkg = $on; + $doc = $original_pkg->method_documentation->{$delegate_to}->{summary}; } if ($how eq 'narrow') { @@ -245,6 +245,8 @@ $methodname $on Via: @*() $via + Doc: @* + $doc Same as: $self->@*->@*() $via, $delegate_to @@ -300,7 +302,8 @@ sub _printattr { my $from = $attr->associated_class->name || ''; my $reqd = $attr->is_required ? 'yes' : 'no'; my $lazy = $attr->is_lazy ? 'yes' : 'no'; - my $doc = $attr->has_documentation ? 'yes' : 'no'; + my $has_doc = $attr->has_documentation ? 'yes' : 'no'; + my $doc = $attr->documentation || ''; my $handles = join ', ', sort @{$attr->handles || []}; $handles ||= ''; @@ -326,7 +329,7 @@ Name is isa reqd lazy doc handles . format ATTR = @<<<<<<<<<<<<<<<<< @< @<<<<<<<<<<<<<<<<<<<<<<<< @<<< @<<< @<< ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -$attrname, $is, $tc, $reqd, $lazy, $doc, $handles +$attrname, $is, $tc, $reqd, $lazy, $has_doc, $handles ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ $handles . diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 72c4b47390f..0ad2573016e 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -42,7 +42,7 @@ sub BUILD { # collect the methods callable on each API foreach my $api_name ($self->api_factory->apis_available) { my $api_class = $self->api_factory->classname_for($api_name); - my $methods = Class::Inspector->methods($api_class, 'expanded'); + my $methods = Class::Inspector->methods($api_class, 'expanded'); # not Moose, so use CI instead my @local_methods = grep {! /^_/} grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; push( @{$delegates{$_}}, {api_name => $api_name, api_class => $api_class} ) for @local_methods; } @@ -66,6 +66,7 @@ sub BUILD { default => sub {$self->api_factory->get_api($api_name)}, lazy => 1, handles => \@delegated, + documentation => $api_class->class_documentation->{description}, # not populated yet ) ); } } @@ -73,7 +74,6 @@ sub BUILD { sub _build_af { my $self = shift; my %args; - $args{auth_setup_handler_object} = $self if $self->can('auth_setup_handler'); $args{base_url} = $self->base_url if $self->base_url; return WWW::{{moduleName}}::ApiFactory->new(%args); } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index 0199f6ee64e..e2797bf8b8f 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -42,7 +42,7 @@ sub BUILD { # collect the methods callable on each API foreach my $api_name ($self->api_factory->apis_available) { my $api_class = $self->api_factory->classname_for($api_name); - my $methods = Class::Inspector->methods($api_class, 'expanded'); + my $methods = Class::Inspector->methods($api_class, 'expanded'); # not Moose, so use CI instead my @local_methods = grep {! /^_/} grep {! $outsiders{$_}} map {$_->[2]} grep {$_->[1] eq $api_class} @$methods; push( @{$delegates{$_}}, {api_name => $api_name, api_class => $api_class} ) for @local_methods; } @@ -66,6 +66,7 @@ sub BUILD { default => sub {$self->api_factory->get_api($api_name)}, lazy => 1, handles => \@delegated, + documentation => $api_class->class_documentation->{description}, # not populated yet ) ); } } @@ -73,7 +74,6 @@ sub BUILD { sub _build_af { my $self = shift; my %args; - $args{auth_setup_handler_object} = $self if $self->can('auth_setup_handler'); $args{base_url} = $self->base_url if $self->base_url; return WWW::SwaggerClient::ApiFactory->new(%args); } diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm index 333f5b4f626..1b9886e1744 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm @@ -161,15 +161,15 @@ sub _printmethod { my $delegate_to = ''; my $via = ''; my $on = ''; + my $doc = ''; my $original_pkg = $method->original_package_name; if ($method->can('associated_attribute')) { $delegate_to = $method->delegate_to_method; my $aa = $method->associated_attribute; $on = $aa->{isa}; $via = $aa->{name}; - $original_pkg = "(flattened into $original_pkg from ???)"; # TODO - need to get hold of the role pkg, not the pkg it's flattened onto - use Data::Dumper; - #print Dumper($aa); + $original_pkg = $on; + $doc = $original_pkg->method_documentation->{$delegate_to}->{summary}; } if ($how eq 'narrow') { @@ -245,6 +245,8 @@ $methodname $on Via: @*() $via + Doc: @* + $doc Same as: $self->@*->@*() $via, $delegate_to @@ -300,7 +302,8 @@ sub _printattr { my $from = $attr->associated_class->name || ''; my $reqd = $attr->is_required ? 'yes' : 'no'; my $lazy = $attr->is_lazy ? 'yes' : 'no'; - my $doc = $attr->has_documentation ? 'yes' : 'no'; + my $has_doc = $attr->has_documentation ? 'yes' : 'no'; + my $doc = $attr->documentation || ''; my $handles = join ', ', sort @{$attr->handles || []}; $handles ||= ''; @@ -326,7 +329,7 @@ Name is isa reqd lazy doc handles . format ATTR = @<<<<<<<<<<<<<<<<< @< @<<<<<<<<<<<<<<<<<<<<<<<< @<<< @<<< @<< ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -$attrname, $is, $tc, $reqd, $lazy, $doc, $handles +$attrname, $is, $tc, $reqd, $lazy, $has_doc, $handles ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~ $handles . From 995a1f547f44b0d88a8030a1747ba4f681c47793 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Fri, 13 Nov 2015 19:30:47 +0100 Subject: [PATCH 124/142] Removed endpoint API class documentation code - there is no standard way for a swagger spec to define descriptive information for an endpoint API - added markdown as a format to the autodoc script - added some version information to autogenerated docs --- .../src/main/resources/perl/AutoDoc.mustache | 45 +- .../src/main/resources/perl/README.md | 13 +- .../src/main/resources/perl/Role.mustache | 40 +- .../src/main/resources/perl/api.mustache | 5 - .../resources/perl/autodoc.script.mustache | 14 +- samples/client/petstore/perl/README.md | 421 ++++++++++-------- samples/client/petstore/perl/bin/autodoc | 14 +- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 5 - .../perl/lib/WWW/SwaggerClient/Role.pm | 40 +- .../lib/WWW/SwaggerClient/Role/AutoDoc.pm | 45 +- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 5 - .../perl/lib/WWW/SwaggerClient/UserApi.pm | 5 - samples/client/petstore/perl/t/04_role.t | 9 +- 13 files changed, 438 insertions(+), 223 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache index ba0edd840ff..76da048b069 100644 --- a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache @@ -28,11 +28,16 @@ sub _printisa { my $sub = join ', ', $meta->subclasses; my $dsub = join ', ', $meta->direct_subclasses; + my $app_name = $self->version_info->{app_name}; + my $app_version = $self->version_info->{app_version}; + my $generated_date = $self->version_info->{generated_date}; + my $generator_class = $self->version_info->{generator_class}; + + $~ = $how eq 'pod' ? 'INHERIT_POD' : 'INHERIT'; + write; + my ($rolepkg, $role_reqs); - $~ = $how eq 'pod' ? 'INHERIT_POD' : 'INHERIT'; - write; - foreach my $role (@roles) { $rolepkg = $role->{package} || next; # some are anonymous, or something next if $rolepkg eq 'WWW::{{moduleName}}::Role::AutoDoc'; @@ -58,6 +63,14 @@ $myclass $dsub All subclasses: @* $sub + + Target API: @* @* + $app_name, $app_version + Generated on: @* + $generated_date + Generator class: @* + $generator_class + . format ROLES = Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ @@ -74,6 +87,26 @@ $myclass @* $myclass +=head1 VERSION + +=head2 @* version: @* + $app_name, $app_version + +Automatically generated by the Perl Swagger Codegen project: + +=over 4 + +=item Build date: @* + $generated_date + +=item Build package: @* + $generator_class + +=item Codegen version: + + +=back + =head1 INHERITANCE =head2 Base class(es) @@ -90,6 +123,7 @@ $dsub @* $sub + =head1 COMPOSITION @@ -171,6 +205,9 @@ sub _printmethod { $original_pkg = $on; $doc = $original_pkg->method_documentation->{$delegate_to}->{summary}; } + else { + $doc = $method->documentation; + } if ($how eq 'narrow') { $~ = 'METHOD_NARROW'; @@ -302,7 +339,7 @@ sub _printattr { my $from = $attr->associated_class->name || ''; my $reqd = $attr->is_required ? 'yes' : 'no'; my $lazy = $attr->is_lazy ? 'yes' : 'no'; - my $has_doc = $attr->has_documentation ? 'yes' : 'no'; + my $has_doc = $attr->has_documentation ? 'yes' : 'no'; # *_api attributes will never have doc, but other attributes might have my $doc = $attr->documentation || ''; my $handles = join ', ', sort @{$attr->handles || []}; $handles ||= ''; diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index 7d0f62dca4b..2e7e57a2c57 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -1,6 +1,16 @@ # NAME -WWW::{{moduleName}}::Role - a Moose role for the Perl Swagger Codegen project +WWW::{{moduleName}}::Role - a Moose role for the {{appName}} + +## {{appName}} version: {{appVersion}} + +# VERSION + +Automatically generated by the Perl Swagger Codegen project: + +- Build date: {{generatedDate}} +- Build package: {{generatorClass}} +- Codegen version: ## A note on Moose @@ -185,6 +195,7 @@ output formats are supported: -n narrow format -p POD format -H HTML format + -m Markdown format -h print this help message -c your application class diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 0ad2573016e..06c230955d8 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -10,25 +10,39 @@ use WWW::{{moduleName}}::ApiFactory; has base_url => ( is => 'ro', required => 0, isa => 'Str', + documentation => 'Root of the server that requests are sent to', ); has api_factory => ( is => 'ro', isa => 'WWW::{{moduleName}}::ApiFactory', builder => '_build_af', lazy => 1, + documentation => 'Builds an instance of the endpoint API class', ); has tokens => ( is => 'ro', isa => 'HashRef', required => 0, - default => sub {{=<% %>=}}{{}}<%={{ }}=%>, # ! + default => sub { {} }, + documentation => 'The auth tokens required by the application - basic, OAuth and/or API key(s)', ); has _cfg => ( is => 'ro', isa => 'Str', default => 'WWW::{{moduleName}}::Configuration', ); - + +has version_info => ( is => 'ro', + isa => 'HashRef', + default => sub { { + app_name => '{{appName}}', + app_version => '{{appVersion}}', + generated_date => '{{generatedDate}}', + generator_class => '{{generatorClass}}', + } }, + documentation => 'Information about the application version and the codegen codebase version' + ); + sub BUILD { my $self = shift; @@ -66,7 +80,6 @@ sub BUILD { default => sub {$self->api_factory->get_api($api_name)}, lazy => 1, handles => \@delegated, - documentation => $api_class->class_documentation->{description}, # not populated yet ) ); } } @@ -80,7 +93,23 @@ sub _build_af { =head1 NAME -WWW::{{moduleName}}::Role - a Moose role for the Perl Swagger Codegen project +WWW::{{moduleName}}::Role - a Moose role for the {{appName}} + +=head2 {{appName}} version: {{appVersion}} + +=head1 VERSION + +Automatically generated by the Perl Swagger Codegen project: + +=over 4 + +=item Build date: {{generatedDate}} + +=item Build package: {{generatorClass}} + +=item Codegen version: + +=back =head2 A note on Moose @@ -268,12 +297,13 @@ output formats are supported: -n narrow format -p POD format -H HTML format + -m Markdown format -h print this help message -c your application class The C<-c> option allows you to load and inspect your own application. A dummy namespace is used if you don't supply your own class. - + =head1 DOCUMENTATION FROM THE SWAGGER SPEC Additional documentation for each class and method may be provided by the Swagger diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index f9312b994b3..d6dd9d598e1 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -33,11 +33,6 @@ use WWW::{{moduleName}}::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); - -__PACKAGE__->class_documentation({description => '', # TODO - class => '{{classname}}', -} ); sub new { my $class = shift; diff --git a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache index d669119c28b..240936d9b51 100644 --- a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache @@ -7,7 +7,7 @@ use Moose::Util qw(apply_all_roles); use Getopt::Std; my %options=(); -getopts("wnphHc:", \%options); +getopts("wnphmHc:", \%options); help if $options{h}; my $my_app = $options{c} || 'My::App'; @@ -28,10 +28,13 @@ else { package main; my $opt; -$opt = 'pod' if $options{p}; $opt = 'wide' if $options{w}; $opt = 'narrow' if $options{n}; + +$opt = 'pod' if $options{p}; $opt = 'pod' if $options{H}; +$opt = 'pod' if $options{m}; + $opt ||= 'wide'; my $api = $my_app->new; @@ -42,6 +45,12 @@ if ($options{H}) { $api->autodoc($opt); close STDOUT or die "Can't close: $!"; } +elsif ($options{m}) { + my $pod2markdown = "pod2markdown --html-encode-chars 1"; + open STDOUT, "| $pod2markdown" or die "Can't fork: $!"; + $api->autodoc($opt); + close STDOUT or die "Can't close: $!"; +} else { $api->autodoc($opt); } @@ -57,6 +66,7 @@ Usage: autodoc [OPTION] [-c My::App::Class] -n narrow format -p POD format -H HTML format + -m Markdown format -h print this help message -c your application class diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index fd237d92d4c..289ce461777 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -1,208 +1,281 @@ # NAME -WWW::SwaggerClient::Role - a Moose role for the Perl Swagger Codegen project +My::App -## A note on Moose +# VERSION -This role is the only component of the library that uses Moose. See -WWW::SwaggerClient::ApiFactory for non-Moosey usage. +## Swagger Petstore version: 1.0.0 -# SYNOPSIS +Automatically generated by the Perl Swagger Codegen project: -The Perl Swagger Codegen project builds a library of Perl modules to interact with -a web service defined by a Swagger specification. See below for how to build the -library. +- Build date: 2015-11-13T18:23:57.025Z +- Build package: class io.swagger.codegen.languages.PerlClientCodegen +- Codegen version: -This module provides an interface to the generated library. All the classes, -objects, and methods (well, not quite \*all\*, see below) are flattened into this -role. +# INHERITANCE - package MyApp; - use Moose; - with 'WWW::SwaggerClient::Role'; - - package main; - - my $api = MyApp->new({ tokens => $tokens }); - - my $pet = $api->get_pet_by_id(pet_id => $pet_id); - +## Base class(es) -## Structure of the library +Moose::Object -The library consists of a set of API classes, one for each endpoint. These APIs -implement the method calls available on each endpoint. +## Direct subclasses -Additionally, there is a set of "object" classes, which represent the objects -returned by and sent to the methods on the endpoints. +## All subclasses -An API factory class is provided, which builds instances of each endpoint API. +# COMPOSITION -This Moose role flattens all the methods from the endpoint APIs onto the consuming -class. It also provides methods to retrieve the endpoint API objects, and the API -factory object, should you need it. +My::App composes the following roles: -For documentation of all these methods, see AUTOMATIC DOCUMENTATION below. +## `WWW::SwaggerClient::Role` -## Configuring authentication - -In the normal case, the Swagger spec will describe what parameters are -required and where to put them. You just need to supply the tokens. - - my $tokens = { - # basic - username => $username, - password => $password, - - # oauth - access_token => $oauth_token, - - # keys - $some_key => { token => $token, - prefix => $prefix, - in => $in, # 'head||query', - }, - - $another => { token => $token, - prefix => $prefix, - in => $in, # 'head||query', - }, - ..., - - }; - - my $api = MyApp->new({ tokens => $tokens }); - -Note these are all optional, as are `prefix` and `in`, and depend on the API -you are accessing. Usually `prefix` and `in` will be determined by the code generator from -the spec and you will not need to set them at run time. If not, `in` will -default to 'head' and `prefix` to the empty string. - -The tokens will be placed in the `WWW::SwaggerClient::Configuration` namespace -as follows, but you don't need to know about this. - -- `$WWW::SwaggerClient::Configuration::username` - - String. The username for basic auth. - -- `$WWW::SwaggerClient::Configuration::password` - - String. The password for basic auth. - -- `$WWW::SwaggerClient::Configuration::api_key` - - Hashref. Keyed on the name of each key (there can be multiple tokens). - - $WWW::SwaggerClient::Configuration::api_key = { - secretKey => 'aaaabbbbccccdddd', - anotherKey => '1111222233334444', - }; - -- `$WWW::SwaggerClient::Configuration::api_key_prefix` - - Hashref. Keyed on the name of each key (there can be multiple tokens). Note not - all api keys require a prefix. - - $WWW::SwaggerClient::Configuration::api_key_prefix = { - secretKey => 'string', - anotherKey => 'same or some other string', - }; - -- `$WWW::SwaggerClient::Configuration::access_token` - - String. The OAuth access token. +Requires: # METHODS -## `base_url` +## `add_pet()` -The generated code has the `base_url` already set as a default value. This method -returns (and optionally sets, but only if the API client has not been -created yet) the current value of `base_url`. + Defined in: WWW::SwaggerClient::PetApi + Delegates to: add_pet() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Add a new pet to the store + Same as: $self->pet_api->add_pet() + +## `create_user()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: create_user() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Create user + Same as: $self->user_api->create_user() + +## `create_users_with_array_input()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: create_users_with_array_input() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Creates list of users with given input array + Same as: $self->user_api->create_users_with_array_input() + +## `create_users_with_list_input()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: create_users_with_list_input() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Creates list of users with given input array + Same as: $self->user_api->create_users_with_list_input() + +## `delete_order()` + + Defined in: WWW::SwaggerClient::StoreApi + Delegates to: delete_order() + On: WWW::SwaggerClient::StoreApi + Via: store_api() + Doc: Delete purchase order by ID + Same as: $self->store_api->delete_order() + +## `delete_pet()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: delete_pet() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Deletes a pet + Same as: $self->pet_api->delete_pet() + +## `delete_user()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: delete_user() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Delete user + Same as: $self->user_api->delete_user() + +## `find_pets_by_status()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: find_pets_by_status() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Finds Pets by status + Same as: $self->pet_api->find_pets_by_status() + +## `find_pets_by_tags()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: find_pets_by_tags() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Finds Pets by tags + Same as: $self->pet_api->find_pets_by_tags() + +## `get_inventory()` + + Defined in: WWW::SwaggerClient::StoreApi + Delegates to: get_inventory() + On: WWW::SwaggerClient::StoreApi + Via: store_api() + Doc: Returns pet inventories by status + Same as: $self->store_api->get_inventory() + +## `get_order_by_id()` + + Defined in: WWW::SwaggerClient::StoreApi + Delegates to: get_order_by_id() + On: WWW::SwaggerClient::StoreApi + Via: store_api() + Doc: Find purchase order by ID + Same as: $self->store_api->get_order_by_id() + +## `get_pet_by_id()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: get_pet_by_id() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Find pet by ID + Same as: $self->pet_api->get_pet_by_id() + +## `get_user_by_name()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: get_user_by_name() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Get user by user name + Same as: $self->user_api->get_user_by_name() + +## `login_user()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: login_user() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Logs user into the system + Same as: $self->user_api->login_user() + +## `logout_user()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: logout_user() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Logs out current logged in user session + Same as: $self->user_api->logout_user() + +## `place_order()` + + Defined in: WWW::SwaggerClient::StoreApi + Delegates to: place_order() + On: WWW::SwaggerClient::StoreApi + Via: store_api() + Doc: Place an order for a pet + Same as: $self->store_api->place_order() + +## `update_pet()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: update_pet() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Update an existing pet + Same as: $self->pet_api->update_pet() + +## `update_pet_with_form()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: update_pet_with_form() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: Updates a pet in the store with form data + Same as: $self->pet_api->update_pet_with_form() + +## `update_user()` + + Defined in: WWW::SwaggerClient::UserApi + Delegates to: update_user() + On: WWW::SwaggerClient::UserApi + Via: user_api() + Doc: Updated user + Same as: $self->user_api->update_user() + +## `upload_file()` + + Defined in: WWW::SwaggerClient::PetApi + Delegates to: upload_file() + On: WWW::SwaggerClient::PetApi + Via: pet_api() + Doc: uploads an image + Same as: $self->pet_api->upload_file() + +# ATTRIBUTES ## `api_factory` -Returns an API factory object. You probably won't need to call this directly. + is: ro + isa: WWW::SwaggerClient::ApiFactory + reqd: no + lazy: yes + doc: Builds an instance of the endpoint API class + handles: - $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance - - $self->pet_api; # the same +## `base_url` -# MISSING METHODS + is: ro + isa: Str + reqd: no + lazy: no + doc: Root of the server that requests are sent to + handles: -Most of the methods on the API are delegated to individual endpoint API objects -(e.g. Pet API, Store API, User API etc). Where different endpoint APIs use the -same method name (e.g. `new()`), these methods can't be delegated. So you need -to call `$api->pet_api->new()`. +## `pet_api` -In principle, every API is susceptible to the presence of a few, random, undelegatable -method names. In practice, because of the way method names are constructed, it's -unlikely in general that any methods will be undelegatable, except for: + is: ro + isa: WWW::SwaggerClient::PetApi + reqd: no + lazy: yes + doc: + handles: add_pet, delete_pet, find_pets_by_status, find_pets_by_tags, + get_pet_by_id, update_pet, update_pet_with_form, upload_file - new() - class_documentation() - method_documentation() +## `store_api` -To call these methods, you need to get a handle on the relevant object, either -by calling `$api->foo_api` or by retrieving an object, e.g. -`$api->get_pet_by_id(pet_id => $pet_id)`. They are class methods, so -you could also call them on class names. + is: ro + isa: WWW::SwaggerClient::StoreApi + reqd: no + lazy: yes + doc: + handles: delete_order, get_inventory, get_order_by_id, place_order -# BUILDING YOUR LIBRARY +## `tokens` -See the homepage `https://github.com/swagger-api/swagger-codegen` for full details. -But briefly, clone the git repository, build the codegen codebase, set up your build -config file, then run the API build script. You will need git, Java 7 and Apache -maven 3.0.3 or better already installed. + is: ro + isa: HashRef + reqd: no + lazy: no + doc: The auth tokens required by the application - basic, OAuth and/or API key(s) + handles: -The config file should specify the project name for the generated library: +## `user_api` - {"moduleName":"MyProjectName"} + is: ro + isa: WWW::SwaggerClient::UserApi + reqd: no + lazy: yes + doc: + handles: create_user, create_users_with_array_input, + create_users_with_list_input, delete_user, get_user_by_name, + login_user, logout_user, update_user -Your library files will be built under `WWW::MyProjectName`. +## `version_info` - $ git clone https://github.com/swagger-api/swagger-codegen.git - $ cd swagger-codegen - $ mvn package - $ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ - -i [URL or file path to JSON swagger API spec] \ - -l perl \ - -c /path/to/config/file.json \ - -o /path/to/output/folder - -Bang, all done. Run the `autodoc` script in the `bin` directory to see the API -you just built. - -# AUTOMATIC DOCUMENTATION - -You can print out a summary of the generated API by running the included -`autodoc` script in the `bin` directory of your generated library. A few -output formats are supported: - - Usage: autodoc [OPTION] - - -w wide format (default) - -n narrow format - -p POD format - -H HTML format - -h print this help message - -c your application class - - -The `-c` option allows you to load and inspect your own application. A dummy -namespace is used if you don't supply your own class. - -# DOCUMENTATION FROM THE SWAGGER SPEC - -Additional documentation for each class and method may be provided by the Swagger -spec. If so, this is available via the `class_documentation()` and -`method_documentation()` methods on each generated API and class: - - my $cdoc = $api->pet_api->class_documentation; - my $cmdoc = $api->pet_api->method_documentation->{$method_name}; - - my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; - my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; - - -Each of these calls returns a hashref with various useful pieces of information. + is: ro + isa: HashRef + reqd: no + lazy: no + doc: Information about the application version and the codegen codebase version + handles: diff --git a/samples/client/petstore/perl/bin/autodoc b/samples/client/petstore/perl/bin/autodoc index 9c167d7a41b..049fcf7fecf 100644 --- a/samples/client/petstore/perl/bin/autodoc +++ b/samples/client/petstore/perl/bin/autodoc @@ -7,7 +7,7 @@ use Moose::Util qw(apply_all_roles); use Getopt::Std; my %options=(); -getopts("wnphHc:", \%options); +getopts("wnphmHc:", \%options); help if $options{h}; my $my_app = $options{c} || 'My::App'; @@ -28,10 +28,13 @@ else { package main; my $opt; -$opt = 'pod' if $options{p}; $opt = 'wide' if $options{w}; $opt = 'narrow' if $options{n}; + +$opt = 'pod' if $options{p}; $opt = 'pod' if $options{H}; +$opt = 'pod' if $options{m}; + $opt ||= 'wide'; my $api = $my_app->new; @@ -42,6 +45,12 @@ if ($options{H}) { $api->autodoc($opt); close STDOUT or die "Can't close: $!"; } +elsif ($options{m}) { + my $pod2markdown = "pod2markdown --html-encode-chars 1"; + open STDOUT, "| $pod2markdown" or die "Can't fork: $!"; + $api->autodoc($opt); + close STDOUT or die "Can't close: $!"; +} else { $api->autodoc($opt); } @@ -57,6 +66,7 @@ Usage: autodoc [OPTION] [-c My::App::Class] -n narrow format -p POD format -H HTML format + -m Markdown format -h print this help message -c your application class diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 7c632f44504..6c415d8e846 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -33,11 +33,6 @@ use WWW::SwaggerClient::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); - -__PACKAGE__->class_documentation({description => '', # TODO - class => 'PetApi', -} ); sub new { my $class = shift; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index e2797bf8b8f..9e719c7d574 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -10,25 +10,39 @@ use WWW::SwaggerClient::ApiFactory; has base_url => ( is => 'ro', required => 0, isa => 'Str', + documentation => 'Root of the server that requests are sent to', ); has api_factory => ( is => 'ro', isa => 'WWW::SwaggerClient::ApiFactory', builder => '_build_af', lazy => 1, + documentation => 'Builds an instance of the endpoint API class', ); has tokens => ( is => 'ro', isa => 'HashRef', required => 0, - default => sub {{}}, # ! + default => sub { {} }, + documentation => 'The auth tokens required by the application - basic, OAuth and/or API key(s)', ); has _cfg => ( is => 'ro', isa => 'Str', default => 'WWW::SwaggerClient::Configuration', ); - + +has version_info => ( is => 'ro', + isa => 'HashRef', + default => sub { { + app_name => 'Swagger Petstore', + app_version => '1.0.0', + generated_date => '2015-11-13T18:23:57.025Z', + generator_class => 'class io.swagger.codegen.languages.PerlClientCodegen', + } }, + documentation => 'Information about the application version and the codegen codebase version' + ); + sub BUILD { my $self = shift; @@ -66,7 +80,6 @@ sub BUILD { default => sub {$self->api_factory->get_api($api_name)}, lazy => 1, handles => \@delegated, - documentation => $api_class->class_documentation->{description}, # not populated yet ) ); } } @@ -80,7 +93,23 @@ sub _build_af { =head1 NAME -WWW::SwaggerClient::Role - a Moose role for the Perl Swagger Codegen project +WWW::SwaggerClient::Role - a Moose role for the Swagger Petstore + +=head2 Swagger Petstore version: 1.0.0 + +=head1 VERSION + +Automatically generated by the Perl Swagger Codegen project: + +=over 4 + +=item Build date: 2015-11-13T18:23:57.025Z + +=item Build package: class io.swagger.codegen.languages.PerlClientCodegen + +=item Codegen version: + +=back =head2 A note on Moose @@ -268,12 +297,13 @@ output formats are supported: -n narrow format -p POD format -H HTML format + -m Markdown format -h print this help message -c your application class The C<-c> option allows you to load and inspect your own application. A dummy namespace is used if you don't supply your own class. - + =head1 DOCUMENTATION FROM THE SWAGGER SPEC Additional documentation for each class and method may be provided by the Swagger diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm index 1b9886e1744..0dc30dbfb90 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm @@ -28,11 +28,16 @@ sub _printisa { my $sub = join ', ', $meta->subclasses; my $dsub = join ', ', $meta->direct_subclasses; + my $app_name = $self->version_info->{app_name}; + my $app_version = $self->version_info->{app_version}; + my $generated_date = $self->version_info->{generated_date}; + my $generator_class = $self->version_info->{generator_class}; + + $~ = $how eq 'pod' ? 'INHERIT_POD' : 'INHERIT'; + write; + my ($rolepkg, $role_reqs); - $~ = $how eq 'pod' ? 'INHERIT_POD' : 'INHERIT'; - write; - foreach my $role (@roles) { $rolepkg = $role->{package} || next; # some are anonymous, or something next if $rolepkg eq 'WWW::SwaggerClient::Role::AutoDoc'; @@ -58,6 +63,14 @@ $myclass $dsub All subclasses: @* $sub + + Target API: @* @* + $app_name, $app_version + Generated on: @* + $generated_date + Generator class: @* + $generator_class + . format ROLES = Composes: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~ @@ -74,6 +87,26 @@ $myclass @* $myclass +=head1 VERSION + +=head2 @* version: @* + $app_name, $app_version + +Automatically generated by the Perl Swagger Codegen project: + +=over 4 + +=item Build date: @* + $generated_date + +=item Build package: @* + $generator_class + +=item Codegen version: + + +=back + =head1 INHERITANCE =head2 Base class(es) @@ -90,6 +123,7 @@ $dsub @* $sub + =head1 COMPOSITION @@ -171,6 +205,9 @@ sub _printmethod { $original_pkg = $on; $doc = $original_pkg->method_documentation->{$delegate_to}->{summary}; } + else { + $doc = $method->documentation; + } if ($how eq 'narrow') { $~ = 'METHOD_NARROW'; @@ -302,7 +339,7 @@ sub _printattr { my $from = $attr->associated_class->name || ''; my $reqd = $attr->is_required ? 'yes' : 'no'; my $lazy = $attr->is_lazy ? 'yes' : 'no'; - my $has_doc = $attr->has_documentation ? 'yes' : 'no'; + my $has_doc = $attr->has_documentation ? 'yes' : 'no'; # *_api attributes will never have doc, but other attributes might have my $doc = $attr->documentation || ''; my $handles = join ', ', sort @{$attr->handles || []}; $handles ||= ''; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 70fd83317cb..21f9433fa32 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -33,11 +33,6 @@ use WWW::SwaggerClient::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); - -__PACKAGE__->class_documentation({description => '', # TODO - class => 'StoreApi', -} ); sub new { my $class = shift; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index 78a09f06138..a3cd164f3bc 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -33,11 +33,6 @@ use WWW::SwaggerClient::Configuration; use base "Class::Data::Inheritable"; __PACKAGE__->mk_classdata('method_documentation' => {}); -__PACKAGE__->mk_classdata('class_documentation' => {}); - -__PACKAGE__->class_documentation({description => '', # TODO - class => 'UserApi', -} ); sub new { my $class = shift; diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/t/04_role.t index 4a3d6ec13e8..73328fa6e62 100644 --- a/samples/client/petstore/perl/t/04_role.t +++ b/samples/client/petstore/perl/t/04_role.t @@ -1,4 +1,4 @@ -use Test::More tests => 38; +use Test::More tests => 37; use Test::Exception; use Test::Warnings 'warnings'; use Test::Deep; @@ -15,8 +15,8 @@ SKIP: { sub auth_setup_handler {} "; - skip 'Moose not installed', 38 if $@; - +# die $@ if $@; + skip 'Moose not installed', 37 if $@; my $api = MyApp->new; @@ -48,9 +48,6 @@ is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id'; # documentation tests -# API class docs -is $api->pet_api->class_documentation->{description}, '', 'got correct Pet API description'; # right now it's blank - # API method docs is_deeply( [sort keys %{$api->pet_api->method_documentation}], [ 'add_pet', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'update_pet', 'update_pet_with_form', 'upload_file'], From 40f8012cbc08a89bb3acd998347625cd8b61ddd7 Mon Sep 17 00:00:00 2001 From: Dave Baird Date: Fri, 13 Nov 2015 21:52:44 +0100 Subject: [PATCH 125/142] Minor cleanup --- .../main/resources/perl/ApiFactory.mustache | 18 +- .../main/resources/perl/BaseObject.mustache | 2 +- .../src/main/resources/perl/README.md | 6 +- .../src/main/resources/perl/Role.mustache | 90 +++---- .../src/main/resources/perl/api.mustache | 23 +- samples/client/petstore/perl/README.md | 2 +- .../perl/lib/WWW/SwaggerClient/ApiFactory.pm | 18 +- .../WWW/SwaggerClient/Object/BaseObject.pm | 2 +- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 234 +++++++++--------- .../perl/lib/WWW/SwaggerClient/Role.pm | 92 +++---- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 82 +++--- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 194 ++++++++------- 12 files changed, 378 insertions(+), 385 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache index c38028fb37a..fc119f7a902 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache @@ -21,9 +21,7 @@ use WWW::{{moduleName}}::ApiClient; use WWW::{{moduleName}}::ApiFactory; - my $api_factory = WWW::{{moduleName}}::ApiFactory->new( base_url => 'http://petstore.swagger.io/v2', - ..., # other args for ApiClient constructor - ); + my $api_factory = WWW::{{moduleName}}::ApiFactory->new( ... ); # any args for ApiClient constructor # later... my $pet_api = $api_factory->get_api('Pet'); @@ -47,23 +45,11 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } =head1 new() - All parameters are optional, and are passed to and stored on the api_client object. + Any parameters are optional, and are passed to and stored on the api_client object. base_url: (optional) supply this to change the default base URL taken from the Swagger definition. - auth_setup_handler_object: (optional) - An object (or class name) that implements an auth_setup_handler() method. - - If set, the auth_setup_handler() method will be called on the object, and - passed a hashref with keys: api_client, query_params, header_params, auth_settings. - - The method should implement the required auth policy, for example, by setting - secret keys in the header, or username and password in the URL, etc. - - This is only necessary when the API specification itself does not describe - authentication. - =cut sub new { diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index 2bc48770632..a41931940ba 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -22,7 +22,7 @@ use base ("Class::Accessor", "Class::Data::Inheritable"); __PACKAGE__->mk_classdata('attribute_map' => {}); __PACKAGE__->mk_classdata('swagger_types' => {}); -__PACKAGE__->mk_classdata('method_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('method_documentation' => {}); __PACKAGE__->mk_classdata('class_documentation' => {}); # new object diff --git a/modules/swagger-codegen/src/main/resources/perl/README.md b/modules/swagger-codegen/src/main/resources/perl/README.md index 2e7e57a2c57..8d0b7695c15 100644 --- a/modules/swagger-codegen/src/main/resources/perl/README.md +++ b/modules/swagger-codegen/src/main/resources/perl/README.md @@ -136,7 +136,7 @@ Returns an API factory object. You probably won't need to call this directly. $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance - $self->pet_api; # the same + $self->pet_api; # the same # MISSING METHODS @@ -207,9 +207,9 @@ namespace is used if you don't supply your own class. Additional documentation for each class and method may be provided by the Swagger spec. If so, this is available via the `class_documentation()` and -`method_documentation()` methods on each generated API and class: +`method_documentation()` methods on each generated object class, and the +`method_documentation()` method on the endpoint API classes: - my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache index 06c230955d8..7bca8cca78d 100644 --- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache @@ -8,40 +8,40 @@ use Log::Any qw($log); use WWW::{{moduleName}}::ApiFactory; has base_url => ( is => 'ro', - required => 0, - isa => 'Str', - documentation => 'Root of the server that requests are sent to', - ); + required => 0, + isa => 'Str', + documentation => 'Root of the server that requests are sent to', + ); has api_factory => ( is => 'ro', - isa => 'WWW::{{moduleName}}::ApiFactory', - builder => '_build_af', - lazy => 1, - documentation => 'Builds an instance of the endpoint API class', - ); + isa => 'WWW::{{moduleName}}::ApiFactory', + builder => '_build_af', + lazy => 1, + documentation => 'Builds an instance of the endpoint API class', + ); has tokens => ( is => 'ro', - isa => 'HashRef', - required => 0, - default => sub { {} }, - documentation => 'The auth tokens required by the application - basic, OAuth and/or API key(s)', - ); + isa => 'HashRef', + required => 0, + default => sub { {} }, + documentation => 'The auth tokens required by the application - basic, OAuth and/or API key(s)', + ); has _cfg => ( is => 'ro', - isa => 'Str', - default => 'WWW::{{moduleName}}::Configuration', - ); + isa => 'Str', + default => 'WWW::{{moduleName}}::Configuration', + ); has version_info => ( is => 'ro', - isa => 'HashRef', - default => sub { { - app_name => '{{appName}}', - app_version => '{{appVersion}}', - generated_date => '{{generatedDate}}', - generator_class => '{{generatorClass}}', - } }, - documentation => 'Information about the application version and the codegen codebase version' - ); + isa => 'HashRef', + default => sub { { + app_name => '{{appName}}', + app_version => '{{appVersion}}', + generated_date => '{{generatedDate}}', + generator_class => '{{generatorClass}}', + } }, + documentation => 'Information about the application version and the codegen codebase version' + ); sub BUILD { my $self = shift; @@ -68,20 +68,20 @@ sub BUILD { } } - # build the flattened API - foreach my $api_name ($self->api_factory->apis_available) { - my $att_name = sprintf "%s_api", lc($api_name); - my $api_class = $self->api_factory->classname_for($api_name); - my @delegated = grep { $delegates{$_}->[0]->{api_name} eq $api_name } keys %delegates; - $log->debugf("Adding API: '%s' handles %s", $att_name, join ', ', @delegated); - $self->meta->add_attribute( $att_name => ( - is => 'ro', - isa => $api_class, - default => sub {$self->api_factory->get_api($api_name)}, - lazy => 1, - handles => \@delegated, - ) ); - } + # build the flattened API + foreach my $api_name ($self->api_factory->apis_available) { + my $att_name = sprintf "%s_api", lc($api_name); + my $api_class = $self->api_factory->classname_for($api_name); + my @delegated = grep { $delegates{$_}->[0]->{api_name} eq $api_name } keys %delegates; + $log->debugf("Adding API: '%s' handles %s", $att_name, join ', ', @delegated); + $self->meta->add_attribute( $att_name => ( + is => 'ro', + isa => $api_class, + default => sub {$self->api_factory->get_api($api_name)}, + lazy => 1, + handles => \@delegated, + ) ); + } } sub _build_af { @@ -235,10 +235,10 @@ created yet) the current value of C. =head2 C Returns an API factory object. You probably won't need to call this directly. - - $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance - $self->pet_api; # the same + $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance + + $self->pet_api; # the same =head1 MISSING METHODS @@ -308,9 +308,9 @@ namespace is used if you don't supply your own class. Additional documentation for each class and method may be provided by the Swagger spec. If so, this is available via the C and -C methods on each generated API and class: +C methods on each generated object class, and the +C method on the endpoint API classes: - my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index d6dd9d598e1..f25c63a528c 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -61,19 +61,20 @@ sub new { {{#allParams}}# @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}} {{/allParams}} { - my $params = { + my $params = { {{#allParams}} - '{{paramName}}' => { - data_type => '{{dataType}}', - description => '{{description}}', - required => {{#required}}'1'{{/required}}{{^required}}'0'{{/required}}, - }, + '{{paramName}}' => { + data_type => '{{dataType}}', + description => '{{description}}', + required => {{#required}}'1'{{/required}}{{^required}}'0'{{/required}}, + }, {{/allParams}} - }; - __PACKAGE__->method_documentation->{ {{nickname}} } = { summary => '{{summary}}', - params => $params, - returns => {{#returnType}}'{{{returnType}}}'{{/returnType}}{{^returnType}}undef{{/returnType}}, - }; + }; + __PACKAGE__->method_documentation->{ {{nickname}} } = { + summary => '{{summary}}', + params => $params, + returns => {{#returnType}}'{{{returnType}}}'{{/returnType}}{{^returnType}}undef{{/returnType}}, + }; } # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} # diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md index 289ce461777..adfe2455d65 100644 --- a/samples/client/petstore/perl/README.md +++ b/samples/client/petstore/perl/README.md @@ -8,7 +8,7 @@ My::App Automatically generated by the Perl Swagger Codegen project: -- Build date: 2015-11-13T18:23:57.025Z +- Build date: 2015-11-13T20:46:43.271Z - Build package: class io.swagger.codegen.languages.PerlClientCodegen - Codegen version: diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm index b428e503b9e..f0846a9b594 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm @@ -21,9 +21,7 @@ use WWW::SwaggerClient::ApiClient; use WWW::SwaggerClient::ApiFactory; - my $api_factory = WWW::SwaggerClient::ApiFactory->new( base_url => 'http://petstore.swagger.io/v2', - ..., # other args for ApiClient constructor - ); + my $api_factory = WWW::SwaggerClient::ApiFactory->new( ... ); # any args for ApiClient constructor # later... my $pet_api = $api_factory->get_api('Pet'); @@ -47,23 +45,11 @@ my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ } =head1 new() - All parameters are optional, and are passed to and stored on the api_client object. + Any parameters are optional, and are passed to and stored on the api_client object. base_url: (optional) supply this to change the default base URL taken from the Swagger definition. - auth_setup_handler_object: (optional) - An object (or class name) that implements an auth_setup_handler() method. - - If set, the auth_setup_handler() method will be called on the object, and - passed a hashref with keys: api_client, query_params, header_params, auth_settings. - - The method should implement the required auth policy, for example, by setting - secret keys in the header, or username and password in the URL, etc. - - This is only necessary when the API specification itself does not describe - authentication. - =cut sub new { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm index d85ecf8a749..f99b7715ae8 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm @@ -22,7 +22,7 @@ use base ("Class::Accessor", "Class::Data::Inheritable"); __PACKAGE__->mk_classdata('attribute_map' => {}); __PACKAGE__->mk_classdata('swagger_types' => {}); -__PACKAGE__->mk_classdata('method_documentation' => {}); # TODO +__PACKAGE__->mk_classdata('method_documentation' => {}); __PACKAGE__->mk_classdata('class_documentation' => {}); # new object diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 6c415d8e846..06ccfca98e8 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -58,17 +58,18 @@ sub new { # # @param Pet $body Pet object that needs to be added to the store (optional) { - my $params = { - 'body' => { - data_type => 'Pet', - description => 'Pet object that needs to be added to the store', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ update_pet } = { summary => 'Update an existing pet', - params => $params, - returns => undef, - }; + my $params = { + 'body' => { + data_type => 'Pet', + description => 'Pet object that needs to be added to the store', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ update_pet } = { + summary => 'Update an existing pet', + params => $params, + returns => undef, + }; } # @return void # @@ -122,17 +123,18 @@ sub update_pet { # # @param Pet $body Pet object that needs to be added to the store (optional) { - my $params = { - 'body' => { - data_type => 'Pet', - description => 'Pet object that needs to be added to the store', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ add_pet } = { summary => 'Add a new pet to the store', - params => $params, - returns => undef, - }; + my $params = { + 'body' => { + data_type => 'Pet', + description => 'Pet object that needs to be added to the store', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ add_pet } = { + summary => 'Add a new pet to the store', + params => $params, + returns => undef, + }; } # @return void # @@ -186,17 +188,18 @@ sub add_pet { # # @param ARRAY[string] $status Status values that need to be considered for filter (optional) { - my $params = { - 'status' => { - data_type => 'ARRAY[string]', - description => 'Status values that need to be considered for filter', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ find_pets_by_status } = { summary => 'Finds Pets by status', - params => $params, - returns => 'ARRAY[Pet]', - }; + my $params = { + 'status' => { + data_type => 'ARRAY[string]', + description => 'Status values that need to be considered for filter', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ find_pets_by_status } = { + summary => 'Finds Pets by status', + params => $params, + returns => 'ARRAY[Pet]', + }; } # @return ARRAY[Pet] # @@ -253,17 +256,18 @@ sub find_pets_by_status { # # @param ARRAY[string] $tags Tags to filter by (optional) { - my $params = { - 'tags' => { - data_type => 'ARRAY[string]', - description => 'Tags to filter by', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ find_pets_by_tags } = { summary => 'Finds Pets by tags', - params => $params, - returns => 'ARRAY[Pet]', - }; + my $params = { + 'tags' => { + data_type => 'ARRAY[string]', + description => 'Tags to filter by', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ find_pets_by_tags } = { + summary => 'Finds Pets by tags', + params => $params, + returns => 'ARRAY[Pet]', + }; } # @return ARRAY[Pet] # @@ -320,17 +324,18 @@ sub find_pets_by_tags { # # @param int $pet_id ID of pet that needs to be fetched (required) { - my $params = { - 'pet_id' => { - data_type => 'int', - description => 'ID of pet that needs to be fetched', - required => '1', - }, - }; - __PACKAGE__->method_documentation->{ get_pet_by_id } = { summary => 'Find pet by ID', - params => $params, - returns => 'Pet', - }; + my $params = { + 'pet_id' => { + data_type => 'int', + description => 'ID of pet that needs to be fetched', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ get_pet_by_id } = { + summary => 'Find pet by ID', + params => $params, + returns => 'Pet', + }; } # @return Pet # @@ -396,27 +401,28 @@ sub get_pet_by_id { # @param string $name Updated name of the pet (optional) # @param string $status Updated status of the pet (optional) { - my $params = { - 'pet_id' => { - data_type => 'string', - description => 'ID of pet that needs to be updated', - required => '1', - }, - 'name' => { - data_type => 'string', - description => 'Updated name of the pet', - required => '0', - }, - 'status' => { - data_type => 'string', - description => 'Updated status of the pet', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ update_pet_with_form } = { summary => 'Updates a pet in the store with form data', - params => $params, - returns => undef, - }; + my $params = { + 'pet_id' => { + data_type => 'string', + description => 'ID of pet that needs to be updated', + required => '1', + }, + 'name' => { + data_type => 'string', + description => 'Updated name of the pet', + required => '0', + }, + 'status' => { + data_type => 'string', + description => 'Updated status of the pet', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ update_pet_with_form } = { + summary => 'Updates a pet in the store with form data', + params => $params, + returns => undef, + }; } # @return void # @@ -488,22 +494,23 @@ sub update_pet_with_form { # @param int $pet_id Pet id to delete (required) # @param string $api_key (optional) { - my $params = { - 'pet_id' => { - data_type => 'int', - description => 'Pet id to delete', - required => '1', - }, - 'api_key' => { - data_type => 'string', - description => '', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ delete_pet } = { summary => 'Deletes a pet', - params => $params, - returns => undef, - }; + my $params = { + 'pet_id' => { + data_type => 'int', + description => 'Pet id to delete', + required => '1', + }, + 'api_key' => { + data_type => 'string', + description => '', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ delete_pet } = { + summary => 'Deletes a pet', + params => $params, + returns => undef, + }; } # @return void # @@ -569,27 +576,28 @@ sub delete_pet { # @param string $additional_metadata Additional data to pass to server (optional) # @param file $file file to upload (optional) { - my $params = { - 'pet_id' => { - data_type => 'int', - description => 'ID of pet to update', - required => '1', - }, - 'additional_metadata' => { - data_type => 'string', - description => 'Additional data to pass to server', - required => '0', - }, - 'file' => { - data_type => 'file', - description => 'file to upload', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ upload_file } = { summary => 'uploads an image', - params => $params, - returns => undef, - }; + my $params = { + 'pet_id' => { + data_type => 'int', + description => 'ID of pet to update', + required => '1', + }, + 'additional_metadata' => { + data_type => 'string', + description => 'Additional data to pass to server', + required => '0', + }, + 'file' => { + data_type => 'file', + description => 'file to upload', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ upload_file } = { + summary => 'uploads an image', + params => $params, + returns => undef, + }; } # @return void # diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm index 9e719c7d574..feb5228cb61 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm @@ -8,40 +8,40 @@ use Log::Any qw($log); use WWW::SwaggerClient::ApiFactory; has base_url => ( is => 'ro', - required => 0, - isa => 'Str', - documentation => 'Root of the server that requests are sent to', - ); + required => 0, + isa => 'Str', + documentation => 'Root of the server that requests are sent to', + ); has api_factory => ( is => 'ro', - isa => 'WWW::SwaggerClient::ApiFactory', - builder => '_build_af', - lazy => 1, - documentation => 'Builds an instance of the endpoint API class', - ); + isa => 'WWW::SwaggerClient::ApiFactory', + builder => '_build_af', + lazy => 1, + documentation => 'Builds an instance of the endpoint API class', + ); has tokens => ( is => 'ro', - isa => 'HashRef', - required => 0, - default => sub { {} }, - documentation => 'The auth tokens required by the application - basic, OAuth and/or API key(s)', - ); + isa => 'HashRef', + required => 0, + default => sub { {} }, + documentation => 'The auth tokens required by the application - basic, OAuth and/or API key(s)', + ); has _cfg => ( is => 'ro', - isa => 'Str', - default => 'WWW::SwaggerClient::Configuration', - ); + isa => 'Str', + default => 'WWW::SwaggerClient::Configuration', + ); has version_info => ( is => 'ro', - isa => 'HashRef', - default => sub { { - app_name => 'Swagger Petstore', - app_version => '1.0.0', - generated_date => '2015-11-13T18:23:57.025Z', - generator_class => 'class io.swagger.codegen.languages.PerlClientCodegen', - } }, - documentation => 'Information about the application version and the codegen codebase version' - ); + isa => 'HashRef', + default => sub { { + app_name => 'Swagger Petstore', + app_version => '1.0.0', + generated_date => '2015-11-13T20:46:43.271Z', + generator_class => 'class io.swagger.codegen.languages.PerlClientCodegen', + } }, + documentation => 'Information about the application version and the codegen codebase version' + ); sub BUILD { my $self = shift; @@ -68,20 +68,20 @@ sub BUILD { } } - # build the flattened API - foreach my $api_name ($self->api_factory->apis_available) { - my $att_name = sprintf "%s_api", lc($api_name); - my $api_class = $self->api_factory->classname_for($api_name); - my @delegated = grep { $delegates{$_}->[0]->{api_name} eq $api_name } keys %delegates; - $log->debugf("Adding API: '%s' handles %s", $att_name, join ', ', @delegated); - $self->meta->add_attribute( $att_name => ( - is => 'ro', - isa => $api_class, - default => sub {$self->api_factory->get_api($api_name)}, - lazy => 1, - handles => \@delegated, - ) ); - } + # build the flattened API + foreach my $api_name ($self->api_factory->apis_available) { + my $att_name = sprintf "%s_api", lc($api_name); + my $api_class = $self->api_factory->classname_for($api_name); + my @delegated = grep { $delegates{$_}->[0]->{api_name} eq $api_name } keys %delegates; + $log->debugf("Adding API: '%s' handles %s", $att_name, join ', ', @delegated); + $self->meta->add_attribute( $att_name => ( + is => 'ro', + isa => $api_class, + default => sub {$self->api_factory->get_api($api_name)}, + lazy => 1, + handles => \@delegated, + ) ); + } } sub _build_af { @@ -103,7 +103,7 @@ Automatically generated by the Perl Swagger Codegen project: =over 4 -=item Build date: 2015-11-13T18:23:57.025Z +=item Build date: 2015-11-13T20:46:43.271Z =item Build package: class io.swagger.codegen.languages.PerlClientCodegen @@ -235,10 +235,10 @@ created yet) the current value of C. =head2 C Returns an API factory object. You probably won't need to call this directly. - - $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance - $self->pet_api; # the same + $self->api_factory('Pet'); # returns a WWW::SwaggerClient::PetApi instance + + $self->pet_api; # the same =head1 MISSING METHODS @@ -308,9 +308,9 @@ namespace is used if you don't supply your own class. Additional documentation for each class and method may be provided by the Swagger spec. If so, this is available via the C and -C methods on each generated API and class: +C methods on each generated object class, and the +C method on the endpoint API classes: - my $cdoc = $api->pet_api->class_documentation; my $cmdoc = $api->pet_api->method_documentation->{$method_name}; my $odoc = $api->get_pet_by_id->(pet_id => $pet_id)->class_documentation; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 21f9433fa32..abe936573e7 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -57,12 +57,13 @@ sub new { # Returns pet inventories by status # { - my $params = { - }; - __PACKAGE__->method_documentation->{ get_inventory } = { summary => 'Returns pet inventories by status', - params => $params, - returns => 'HASH[string,int]', - }; + my $params = { + }; + __PACKAGE__->method_documentation->{ get_inventory } = { + summary => 'Returns pet inventories by status', + params => $params, + returns => 'HASH[string,int]', + }; } # @return HASH[string,int] # @@ -116,17 +117,18 @@ sub get_inventory { # # @param Order $body order placed for purchasing the pet (optional) { - my $params = { - 'body' => { - data_type => 'Order', - description => 'order placed for purchasing the pet', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ place_order } = { summary => 'Place an order for a pet', - params => $params, - returns => 'Order', - }; + my $params = { + 'body' => { + data_type => 'Order', + description => 'order placed for purchasing the pet', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ place_order } = { + summary => 'Place an order for a pet', + params => $params, + returns => 'Order', + }; } # @return Order # @@ -183,17 +185,18 @@ sub place_order { # # @param string $order_id ID of pet that needs to be fetched (required) { - my $params = { - 'order_id' => { - data_type => 'string', - description => 'ID of pet that needs to be fetched', - required => '1', - }, - }; - __PACKAGE__->method_documentation->{ get_order_by_id } = { summary => 'Find purchase order by ID', - params => $params, - returns => 'Order', - }; + my $params = { + 'order_id' => { + data_type => 'string', + description => 'ID of pet that needs to be fetched', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ get_order_by_id } = { + summary => 'Find purchase order by ID', + params => $params, + returns => 'Order', + }; } # @return Order # @@ -257,17 +260,18 @@ sub get_order_by_id { # # @param string $order_id ID of the order that needs to be deleted (required) { - my $params = { - 'order_id' => { - data_type => 'string', - description => 'ID of the order that needs to be deleted', - required => '1', - }, - }; - __PACKAGE__->method_documentation->{ delete_order } = { summary => 'Delete purchase order by ID', - params => $params, - returns => undef, - }; + my $params = { + 'order_id' => { + data_type => 'string', + description => 'ID of the order that needs to be deleted', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ delete_order } = { + summary => 'Delete purchase order by ID', + params => $params, + returns => undef, + }; } # @return void # diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index a3cd164f3bc..9ba45815c8c 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -58,17 +58,18 @@ sub new { # # @param User $body Created user object (optional) { - my $params = { - 'body' => { - data_type => 'User', - description => 'Created user object', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ create_user } = { summary => 'Create user', - params => $params, - returns => undef, - }; + my $params = { + 'body' => { + data_type => 'User', + description => 'Created user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ create_user } = { + summary => 'Create user', + params => $params, + returns => undef, + }; } # @return void # @@ -122,17 +123,18 @@ sub create_user { # # @param ARRAY[User] $body List of user object (optional) { - my $params = { - 'body' => { - data_type => 'ARRAY[User]', - description => 'List of user object', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ create_users_with_array_input } = { summary => 'Creates list of users with given input array', - params => $params, - returns => undef, - }; + my $params = { + 'body' => { + data_type => 'ARRAY[User]', + description => 'List of user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ create_users_with_array_input } = { + summary => 'Creates list of users with given input array', + params => $params, + returns => undef, + }; } # @return void # @@ -186,17 +188,18 @@ sub create_users_with_array_input { # # @param ARRAY[User] $body List of user object (optional) { - my $params = { - 'body' => { - data_type => 'ARRAY[User]', - description => 'List of user object', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ create_users_with_list_input } = { summary => 'Creates list of users with given input array', - params => $params, - returns => undef, - }; + my $params = { + 'body' => { + data_type => 'ARRAY[User]', + description => 'List of user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ create_users_with_list_input } = { + summary => 'Creates list of users with given input array', + params => $params, + returns => undef, + }; } # @return void # @@ -251,22 +254,23 @@ sub create_users_with_list_input { # @param string $username The user name for login (optional) # @param string $password The password for login in clear text (optional) { - my $params = { - 'username' => { - data_type => 'string', - description => 'The user name for login', - required => '0', - }, - 'password' => { - data_type => 'string', - description => 'The password for login in clear text', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ login_user } = { summary => 'Logs user into the system', - params => $params, - returns => 'string', - }; + my $params = { + 'username' => { + data_type => 'string', + description => 'The user name for login', + required => '0', + }, + 'password' => { + data_type => 'string', + description => 'The password for login in clear text', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ login_user } = { + summary => 'Logs user into the system', + params => $params, + returns => 'string', + }; } # @return string # @@ -325,12 +329,13 @@ sub login_user { # Logs out current logged in user session # { - my $params = { - }; - __PACKAGE__->method_documentation->{ logout_user } = { summary => 'Logs out current logged in user session', - params => $params, - returns => undef, - }; + my $params = { + }; + __PACKAGE__->method_documentation->{ logout_user } = { + summary => 'Logs out current logged in user session', + params => $params, + returns => undef, + }; } # @return void # @@ -381,17 +386,18 @@ sub logout_user { # # @param string $username The name that needs to be fetched. Use user1 for testing. (required) { - my $params = { - 'username' => { - data_type => 'string', - description => 'The name that needs to be fetched. Use user1 for testing.', - required => '1', - }, - }; - __PACKAGE__->method_documentation->{ get_user_by_name } = { summary => 'Get user by user name', - params => $params, - returns => 'User', - }; + my $params = { + 'username' => { + data_type => 'string', + description => 'The name that needs to be fetched. Use user1 for testing.', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ get_user_by_name } = { + summary => 'Get user by user name', + params => $params, + returns => 'User', + }; } # @return User # @@ -456,22 +462,23 @@ sub get_user_by_name { # @param string $username name that need to be deleted (required) # @param User $body Updated user object (optional) { - my $params = { - 'username' => { - data_type => 'string', - description => 'name that need to be deleted', - required => '1', - }, - 'body' => { - data_type => 'User', - description => 'Updated user object', - required => '0', - }, - }; - __PACKAGE__->method_documentation->{ update_user } = { summary => 'Updated user', - params => $params, - returns => undef, - }; + my $params = { + 'username' => { + data_type => 'string', + description => 'name that need to be deleted', + required => '1', + }, + 'body' => { + data_type => 'User', + description => 'Updated user object', + required => '0', + }, + }; + __PACKAGE__->method_documentation->{ update_user } = { + summary => 'Updated user', + params => $params, + returns => undef, + }; } # @return void # @@ -535,17 +542,18 @@ sub update_user { # # @param string $username The name that needs to be deleted (required) { - my $params = { - 'username' => { - data_type => 'string', - description => 'The name that needs to be deleted', - required => '1', - }, - }; - __PACKAGE__->method_documentation->{ delete_user } = { summary => 'Delete user', - params => $params, - returns => undef, - }; + my $params = { + 'username' => { + data_type => 'string', + description => 'The name that needs to be deleted', + required => '1', + }, + }; + __PACKAGE__->method_documentation->{ delete_user } = { + summary => 'Delete user', + params => $params, + returns => undef, + }; } # @return void # From b815163ceb8dc9c39c91cf1ff2393c699cf13cd8 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 16 Nov 2015 11:30:34 +0800 Subject: [PATCH 126/142] replace restsharp extension functions with functions in apiclient --- .../main/resources/csharp/ApiClient.mustache | 63 ++++++++++++++++-- .../csharp/IO/Swagger/Client/ApiClient.cs | 63 ++++++++++++++++-- .../bin/Debug/SwaggerClientTest.dll | Bin 61952 -> 62464 bytes .../bin/Debug/SwaggerClientTest.dll.mdb | Bin 18999 -> 19469 bytes ...ClientTest.csproj.FilesWrittenAbsolute.txt | 16 ++--- .../obj/Debug/SwaggerClientTest.dll | Bin 61952 -> 62464 bytes .../obj/Debug/SwaggerClientTest.dll.mdb | Bin 18999 -> 19469 bytes 7 files changed, 126 insertions(+), 16 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache index 883a635472d..87d55ab3f6e 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache @@ -10,7 +10,6 @@ using System.Net; using System.Text; using Newtonsoft.Json; using RestSharp; -using RestSharp.Extensions; namespace {{packageName}}.Client { @@ -171,7 +170,7 @@ namespace {{packageName}}.Client /// Escaped string. public string EscapeString(string str) { - return RestSharp.Extensions.StringExtensions.UrlEncode(str); + return UrlEncode(str); } /// @@ -183,9 +182,9 @@ namespace {{packageName}}.Client public FileParameter ParameterToFile(string name, Stream stream) { if (stream is FileStream) - return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name)); + return FileParameter.Create(name, ReadAsBytes(stream), Path.GetFileName(((FileStream)stream).Name)); else - return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided"); + return FileParameter.Create(name, ReadAsBytes(stream), "no_file_name_provided"); } /// @@ -365,6 +364,62 @@ namespace {{packageName}}.Client public static dynamic ConvertType(dynamic source, Type dest) { return Convert.ChangeType(source, dest); } + + /// + /// Convert stream to byte array + /// Credit/Ref: http://stackoverflow.com/a/221941/677735 + /// + /// Input stream to be converted + /// Byte array + public static byte[] ReadAsBytes(Stream input) + { + byte[] buffer = new byte[16*1024]; + using (MemoryStream ms = new MemoryStream()) + { + int read; + while ((read = input.Read(buffer, 0, buffer.Length)) > 0) + { + ms.Write(buffer, 0, read); + } + return ms.ToArray(); + } + } + + /// + /// URL encode a string + /// Credit/Ref: https://github.com/restsharp/RestSharp/blob/master/RestSharp/Extensions/StringExtensions.cs#L50 + /// + /// String to be URL encoded + /// Byte array + public static string UrlEncode(string input) + { + const int maxLength = 32766; + + if (input == null) + { + throw new ArgumentNullException("input"); + } + + if (input.Length <= maxLength) + { + return Uri.EscapeDataString(input); + } + + StringBuilder sb = new StringBuilder(input.Length * 2); + int index = 0; + + while (index < input.Length) + { + int length = Math.Min(input.Length - index, maxLength); + string subString = input.Substring(index, length); + + sb.Append(Uri.EscapeDataString(subString)); + index += subString.Length; + } + + return sb.ToString(); + } + } } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs index 049c1ef74d8..36217fde02d 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs @@ -10,7 +10,6 @@ using System.Net; using System.Text; using Newtonsoft.Json; using RestSharp; -using RestSharp.Extensions; namespace IO.Swagger.Client { @@ -171,7 +170,7 @@ namespace IO.Swagger.Client /// Escaped string. public string EscapeString(string str) { - return RestSharp.Extensions.StringExtensions.UrlEncode(str); + return UrlEncode(str); } /// @@ -183,9 +182,9 @@ namespace IO.Swagger.Client public FileParameter ParameterToFile(string name, Stream stream) { if (stream is FileStream) - return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name)); + return FileParameter.Create(name, ReadAsBytes(stream), Path.GetFileName(((FileStream)stream).Name)); else - return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided"); + return FileParameter.Create(name, ReadAsBytes(stream), "no_file_name_provided"); } /// @@ -369,6 +368,62 @@ namespace IO.Swagger.Client public static dynamic ConvertType(dynamic source, Type dest) { return Convert.ChangeType(source, dest); } + + /// + /// Convert stream to byte array + /// Credit/Ref: http://stackoverflow.com/a/221941/677735 + /// + /// Input stream to be converted + /// Byte array + public static byte[] ReadAsBytes(Stream input) + { + byte[] buffer = new byte[16*1024]; + using (MemoryStream ms = new MemoryStream()) + { + int read; + while ((read = input.Read(buffer, 0, buffer.Length)) > 0) + { + ms.Write(buffer, 0, read); + } + return ms.ToArray(); + } + } + + /// + /// URL encode a string + /// Credit/Ref: https://github.com/restsharp/RestSharp/blob/master/RestSharp/Extensions/StringExtensions.cs#L50 + /// + /// String to be URL encoded + /// Byte array + public static string UrlEncode(string input) + { + const int maxLength = 32766; + + if (input == null) + { + throw new ArgumentNullException("input"); + } + + if (input.Length <= maxLength) + { + return Uri.EscapeDataString(input); + } + + StringBuilder sb = new StringBuilder(input.Length * 2); + int index = 0; + + while (index < input.Length) + { + int length = Math.Min(input.Length - index, maxLength); + string subString = input.Substring(index, length); + + sb.Append(Uri.EscapeDataString(subString)); + index += subString.Length; + } + + return sb.ToString(); + } + } } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll index c292bea9bad1f0a11e25411e9c1f7c0c89c2a603..c975e54d4bed8fc21372acb08c3eaa6fab9aa969 100755 GIT binary patch delta 12713 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 JSvjl0{|6@%WT*fD diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt index 286fb333c48..3ed0e98c4f7 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt +++ b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt @@ -1,8 +1,8 @@ -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll -/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll +/Users/williamcheng/Code/csharp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll index c292bea9bad1f0a11e25411e9c1f7c0c89c2a603..c975e54d4bed8fc21372acb08c3eaa6fab9aa969 100755 GIT binary patch delta 12713 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 JSvjl0{|6@%WT*fD From cd8cfc50ed3c68c43d0d97552ffc50671b098eab Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 16 Nov 2015 18:00:43 +0800 Subject: [PATCH 127/142] Add Clojure client codegen --- .../io/swagger/codegen/CodegenOperation.java | 8 +- .../io/swagger/codegen/DefaultCodegen.java | 3 + .../languages/ClojureClientCodegen.java | 157 ++++++++++++++++++ .../services/io.swagger.codegen.CodegenConfig | 1 + .../src/main/resources/clojure/api.mustache | 18 ++ .../src/main/resources/clojure/core.mustache | 151 +++++++++++++++++ .../main/resources/clojure/project.mustache | 8 + 7 files changed, 342 insertions(+), 4 deletions(-) create mode 100644 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java create mode 100644 modules/swagger-codegen/src/main/resources/clojure/api.mustache create mode 100644 modules/swagger-codegen/src/main/resources/clojure/core.mustache create mode 100644 modules/swagger-codegen/src/main/resources/clojure/project.mustache diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java index 7183c4d3456..c5b9231341e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java @@ -10,10 +10,10 @@ import java.util.Set; public class CodegenOperation { public final List responseHeaders = new ArrayList(); - public Boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive, - returnSimpleType, subresourceOperation, isMapContainer, isListContainer, - hasMore = Boolean.TRUE, isMultipart, isResponseBinary = Boolean.FALSE, - hasReference = Boolean.FALSE; + public Boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, + returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer, + isListContainer, isMultipart, hasMore = Boolean.TRUE, + isResponseBinary = Boolean.FALSE, hasReference = Boolean.FALSE; public String path, operationId, returnType, httpMethod, returnBaseType, returnContainer, summary, notes, baseName, defaultResponse; public List> consumes, produces; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 3c8758fc15b..99ceca6796c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1299,6 +1299,9 @@ public class DefaultCodegen { p.isFormParam = new Boolean(true); formParams.add(p.copy()); } + if (p.required == null || !p.required) { + op.hasOptionalParams = true; + } } } for (String i : imports) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java new file mode 100644 index 00000000000..1c7b6ab3f2d --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java @@ -0,0 +1,157 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Info; +import io.swagger.models.Swagger; +import org.apache.commons.lang.StringUtils; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.List; + +public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfig { + private static final String PROJECT_NAME = "projectName"; + private static final String PROJECT_DESCRIPTION = "projectDescription"; + private static final String PROJECT_VERSION = "projectVersion"; + private static final String BASE_NAMESPACE = "baseNamespace"; + + protected String projectName = null; + protected String projectDescription = null; + protected String projectVersion = null; + protected String sourceFolder = "src"; + + public ClojureClientCodegen() { + super(); + outputFolder = "generated-code" + File.separator + "clojure"; + apiTemplateFiles.put("api.mustache", ".clj"); + embeddedTemplateDir = templateDir = "clojure"; + } + + @Override + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + @Override + public String getName() { + return "clojure"; + } + + @Override + public String getHelp() { + return "Generates a Clojure client library."; + } + + @Override + public void preprocessSwagger(Swagger swagger) { + super.preprocessSwagger(swagger); + + if (additionalProperties.containsKey(PROJECT_NAME)) { + projectName = ((String) additionalProperties.get(PROJECT_NAME)); + } + if (additionalProperties.containsKey(PROJECT_DESCRIPTION)) { + projectDescription = ((String) additionalProperties.get(PROJECT_DESCRIPTION)); + } + if (additionalProperties.containsKey(PROJECT_VERSION)) { + projectVersion = ((String) additionalProperties.get(PROJECT_VERSION)); + } + + if (swagger.getInfo() != null) { + Info info = swagger.getInfo(); + if (projectName == null && info.getTitle() != null) { + // when projectName is not specified, generate it from info.title + projectName = dashize(info.getTitle()); + } + if (projectVersion == null && info.getVersion() != null) { + // when projectVersion is not specified, use info.version + projectVersion = info.getVersion(); + } + if (projectDescription == null && info.getDescription() != null) { + // when projectDescription is not specified, use info.description + projectDescription = info.getDescription(); + } + } + + // default values + if (projectName == null) { + projectName = "swagger-clj-client"; + } + if (projectVersion == null) { + projectVersion = "1.0.0"; + } + if (projectDescription == null) { + projectDescription = "Client library of " + projectName; + } + + final String baseNamespace = dashize(projectName); + apiPackage = baseNamespace + ".api"; + + additionalProperties.put(PROJECT_NAME, projectName); + additionalProperties.put(PROJECT_DESCRIPTION, escapeText(projectDescription)); + additionalProperties.put(PROJECT_VERSION, projectVersion); + additionalProperties.put(BASE_NAMESPACE, baseNamespace); + additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); + + final String baseNamespaceFolder = sourceFolder + File.separator + namespaceToFolder(baseNamespace); + supportingFiles.add(new SupportingFile("project.mustache", "", "project.clj")); + supportingFiles.add(new SupportingFile("core.mustache", baseNamespaceFolder, "core.clj")); + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separator + sourceFolder + File.separator + namespaceToFolder(apiPackage); + } + + @Override + public String toOperationId(String operationId) { + // throw exception if method name is empty + if (StringUtils.isEmpty(operationId)) { + throw new RuntimeException("Empty method/operation name (operationId) not allowed"); + } + + return dashize(sanitizeName(operationId)); + } + + @Override + public String toApiName(String name) { + return dashize(name); + } + + @Override + public String toParamName(String name) { + return toVarName(name); + } + + @Override + public String toVarName(String name) { + name = name.replaceAll("[^a-zA-Z0-9_-]+", ""); + name = dashize(name); + return name; + } + + @Override + public Map postProcessOperations(Map operations) { + Map objs = (Map) operations.get("operations"); + List ops = (List) objs.get("operation"); + for (CodegenOperation op : ops) { + // Convert httpMethod to lower case, e.g. "get", "post" + op.httpMethod = op.httpMethod.toLowerCase(); + } + return operations; + } + + protected String namespaceToFolder(String ns) { + return ns.replace(".", File.separator).replace("-", "_"); + } + + protected String dashize(String s) { + return underscore(s).replaceAll("[_ ]", "-"); + } +} diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig index 4cf785abbd8..c663ba54a67 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -28,3 +28,4 @@ io.swagger.codegen.languages.TypeScriptAngularClientCodegen io.swagger.codegen.languages.TypeScriptNodeClientCodegen io.swagger.codegen.languages.AkkaScalaClientCodegen io.swagger.codegen.languages.CsharpDotNet2ClientCodegen +io.swagger.codegen.languages.ClojureClientCodegen diff --git a/modules/swagger-codegen/src/main/resources/clojure/api.mustache b/modules/swagger-codegen/src/main/resources/clojure/api.mustache new file mode 100644 index 00000000000..37107435e7b --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/clojure/api.mustache @@ -0,0 +1,18 @@ +(ns {{{package}}}.{{{classname}}} + (:require [{{{projectName}}}.core :refer [call-api check-required-params]])) +{{#operations}}{{#operation}} +(defn {{{nickname}}} + "{{{summary}}}{{#notes}} + {{{notes}}}{{/notes}}"{{#hasOptionalParams}} + ([{{#allParams}}{{#required}}{{{paramName}}} {{/required}}{{/allParams}}] ({{{nickname}}}{{#allParams}} {{#required}}{{{paramName}}}{{/required}}{{/allParams}} nil)){{/hasOptionalParams}} + {{#hasOptionalParams}}({{/hasOptionalParams}}[{{#allParams}}{{#required}}{{{paramName}}} {{/required}}{{/allParams}}{{#hasOptionalParams}} {:keys [{{#allParams}}{{^required}}{{{paramName}}} {{/required}}{{/allParams}}]}{{/hasOptionalParams}}]{{#hasRequiredParams}} + {{#hasOptionalParams}} {{/hasOptionalParams}}(check-required-params{{#allParams}}{{#required}} {{{paramName}}}{{/required}}{{/allParams}}){{/hasRequiredParams}} + {{#hasOptionalParams}} {{/hasOptionalParams}}(call-api "{{{path}}}" :{{{httpMethod}}} + {{#hasOptionalParams}} {{/hasOptionalParams}} {:path-params { {{#pathParams}}"{{{baseName}}}" {{{paramName}}} {{/pathParams}} } + {{#hasOptionalParams}} {{/hasOptionalParams}} :header-params { {{#headerParams}}"{{{baseName}}}" {{{paramName}}} {{/headerParams}} } + {{#hasOptionalParams}} {{/hasOptionalParams}} :query-params { {{#queryParams}}"{{{baseName}}}" {{{paramName}}} {{/queryParams}} } + {{#hasOptionalParams}} {{/hasOptionalParams}} :form-params { {{#formParams}}"{{{baseName}}}" {{{paramName}}} {{/formParams}} }{{#bodyParam}} + {{#hasOptionalParams}} {{/hasOptionalParams}} :body-param {{{paramName}}}{{/bodyParam}} + {{#hasOptionalParams}} {{/hasOptionalParams}} :content-types [{{#consumes}}"{{mediaType}}"{{#hasMore}} {{/hasMore}}{{/consumes}}] + {{#hasOptionalParams}} {{/hasOptionalParams}} :accepts [{{#produces}}"{{mediaType}}"{{#hasMore}} {{/hasMore}}{{/produces}}]})){{#hasOptionalParams}}){{/hasOptionalParams}} +{{/operation}}{{/operations}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/clojure/core.mustache b/modules/swagger-codegen/src/main/resources/clojure/core.mustache new file mode 100644 index 00000000000..b5b8dd06b9a --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/clojure/core.mustache @@ -0,0 +1,151 @@ +(ns {{{baseNamespace}}}.core + (:require [cheshire.core :refer [parse-string]] + [clojure.string :as str] + [clj-http.client :as client]) + (:import (com.fasterxml.jackson.core JsonParseException) + (java.util Date TimeZone) + (java.text SimpleDateFormat))) + +(def default-api-context + "Default API context." + {:base-url "http://petstore.swagger.io/v2" + :date-format "yyyy-MM-dd" + :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" + :debug false}) + +(def ^:dynamic *api-context* + "Dynamic API context to be applied in API calls." + default-api-context) + +(defmacro with-api-context + "A helper macro to wrap *api-context* with default values." + [context & body] + `(binding [*api-context* (merge *api-context* ~context)] + ~@body)) + +(defmacro check-required-params + "Throw exception if the given parameter value is nil." + [& params] + (->> params + (map (fn [p] + `(if (nil? ~p) + (throw (IllegalArgumentException. ~(str "The parameter \"" p "\" is required")))))) + (list* 'do))) + +(defn- make-date-format + ([format-str] (make-date-format format-str nil)) + ([format-str time-zone] + (let [date-format (SimpleDateFormat. format-str)] + (when time-zone + (.setTimeZone date-format (TimeZone/getTimeZone time-zone))) + date-format))) + +(defn format-date + "Format the given Date object with the :date-format defined in *api-options*. + NOTE: The UTC time zone is used." + [^Date date] + (let [{:keys [date-format]} *api-context*] + (-> (make-date-format date-format "UTC") + (.format date)))) + +(defn parse-date + "Parse the given string to a Date object with the :date-format defined in *api-options*. + NOTE: The UTC time zone is used." + [^String s] + (let [{:keys [date-format]} *api-context*] + (-> (make-date-format date-format "UTC") + (.parse s)))) + +(defn format-datetime + "Format the given Date object with the :datetime-format defined in *api-options*. + NOTE: The system's default time zone is used when not provided." + ([^Date date] (format-datetime date nil)) + ([^Date date ^String time-zone] + (let [{:keys [datetime-format]} *api-context*] + (-> (make-date-format datetime-format time-zone) + (.format date))))) + +(defn parse-datetime + "Parse the given string to a Date object with the :datetime-format defined in *api-options*. + NOTE: The system's default time zone is used when not provided." + ([^String s] (parse-datetime s nil)) + ([^String s ^String time-zone] + (let [{:keys [datetime-format]} *api-context*] + (-> (make-date-format datetime-format time-zone) + (.parse s))))) + +(defn param-to-str [param] + "Format the given parameter value to string." + (cond + (instance? Date param) (format-datetime param) + (sequential? param) (str/join "," param) + :else (str param))) + +(defn make-url + "Make full URL by adding base URL and filling path parameters." + [path path-params] + (let [path (reduce (fn [p [k v]] + (str/replace p (re-pattern (str "\\{" k "\\}")) (param-to-str v))) + path + path-params)] + (str (:base-url *api-context*) path))) + +(defn normalize-params + "Normalize parameters values: remove nils, format to string with `param-to-str`." + [params] + (reduce (fn [result [k v]] + (if (nil? v) + result + (assoc result k (if (sequential? v) + (map param-to-str v) + (param-to-str v))))) + {} + params)) + +(defn json-mime? [mime] + "Check if the given MIME is a standard JSON MIME or :json." + (if mime + (or (= :json mime) + (re-matches #"application/json(;.*)?" (name mime))))) + +(defn json-preferred-mime [mimes] + "Choose a MIME from the given MIMEs with JSON preferred, + i.e. return JSON if included, otherwise return the first one." + (-> (filter json-mime? mimes) + first + (or (first mimes)))) + +(defn deserialize + "Deserialize the given HTTP response according to the Content-Type header." + [{:keys [body] {:keys [content-type]} :headers}] + (cond + (json-mime? content-type) + (try + (parse-string body true) + (catch JsonParseException e + ;; return the body string directly on JSON parsing error + body)) + ;; for non-JSON response, return the body string directly + :else body)) + +(defn call-api + "Call an API by making HTTP request and return its response." + [path method {:keys [path-params query-params header-params form-params body-param content-types accepts]}] + (let [{:keys [debug datetime-format]} *api-context* + url (make-url path path-params) + content-type (json-preferred-mime content-types) + accept (or (json-preferred-mime accepts) :json) + opts (cond-> {:url url :method method} + content-type (assoc :content-type content-type) + (json-mime? content-type) (assoc :json-opts {:date-format datetime-format}) + accept (assoc :accept accept) + (seq query-params) (assoc :query-params (normalize-params query-params)) + (seq header-params) (assoc :header-params (normalize-params header-params)) + (seq form-params) (assoc :form-params (normalize-params form-params)) + (and (empty? form-params) body-param) (assoc :form-params body-param) + debug (assoc :debug true :debug-body true)) + resp (client/request opts)] + (when debug + (println "Response:") + (println resp)) + (deserialize resp))) diff --git a/modules/swagger-codegen/src/main/resources/clojure/project.mustache b/modules/swagger-codegen/src/main/resources/clojure/project.mustache new file mode 100644 index 00000000000..ac01fb57152 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/clojure/project.mustache @@ -0,0 +1,8 @@ +(defproject {{{projectName}}} "{{{projectVersion}}}" + :description "{{{projectDescription}}}" + :url "http://example.com/FIXME" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[org.clojure/clojure "1.7.0"] + [clj-http "2.0.0"] + [cheshire "5.5.0"]]) From ff5b1c86ba449278c3a0a819f0195290ea407b3a Mon Sep 17 00:00:00 2001 From: xhh Date: Mon, 16 Nov 2015 23:04:17 +0800 Subject: [PATCH 128/142] Set project URL and license from spec --- .../languages/ClojureClientCodegen.java | 25 ++++++++++++- .../src/main/resources/clojure/api.mustache | 37 ++++++++++--------- .../main/resources/clojure/project.mustache | 11 +++--- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java index 1c7b6ab3f2d..0277c2d9077 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java @@ -6,7 +6,9 @@ import io.swagger.codegen.CodegenOperation; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; +import io.swagger.models.Contact; import io.swagger.models.Info; +import io.swagger.models.License; import io.swagger.models.Swagger; import org.apache.commons.lang.StringUtils; @@ -20,6 +22,9 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi private static final String PROJECT_NAME = "projectName"; private static final String PROJECT_DESCRIPTION = "projectDescription"; private static final String PROJECT_VERSION = "projectVersion"; + private static final String PROJECT_URL = "projectUrl"; + private static final String LICENSE_NAME = "licenseName"; + private static final String LICENSE_URL = "licenseUrl"; private static final String BASE_NAMESPACE = "baseNamespace"; protected String projectName = null; @@ -69,14 +74,30 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi // when projectName is not specified, generate it from info.title projectName = dashize(info.getTitle()); } - if (projectVersion == null && info.getVersion() != null) { + if (projectVersion == null) { // when projectVersion is not specified, use info.version projectVersion = info.getVersion(); } - if (projectDescription == null && info.getDescription() != null) { + if (projectDescription == null) { // when projectDescription is not specified, use info.description projectDescription = info.getDescription(); } + + if (info.getContact() != null) { + Contact contact = info.getContact(); + if (additionalProperties.get(PROJECT_URL) == null) { + additionalProperties.put(PROJECT_URL, contact.getUrl()); + } + } + if (info.getLicense() != null) { + License license = info.getLicense(); + if (additionalProperties.get(LICENSE_NAME) == null) { + additionalProperties.put(LICENSE_NAME, license.getName()); + } + if (additionalProperties.get(LICENSE_URL) == null) { + additionalProperties.put(LICENSE_URL, license.getUrl()); + } + } } // default values diff --git a/modules/swagger-codegen/src/main/resources/clojure/api.mustache b/modules/swagger-codegen/src/main/resources/clojure/api.mustache index 37107435e7b..474a1fc37cf 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/api.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/api.mustache @@ -1,18 +1,19 @@ -(ns {{{package}}}.{{{classname}}} - (:require [{{{projectName}}}.core :refer [call-api check-required-params]])) -{{#operations}}{{#operation}} -(defn {{{nickname}}} - "{{{summary}}}{{#notes}} - {{{notes}}}{{/notes}}"{{#hasOptionalParams}} - ([{{#allParams}}{{#required}}{{{paramName}}} {{/required}}{{/allParams}}] ({{{nickname}}}{{#allParams}} {{#required}}{{{paramName}}}{{/required}}{{/allParams}} nil)){{/hasOptionalParams}} - {{#hasOptionalParams}}({{/hasOptionalParams}}[{{#allParams}}{{#required}}{{{paramName}}} {{/required}}{{/allParams}}{{#hasOptionalParams}} {:keys [{{#allParams}}{{^required}}{{{paramName}}} {{/required}}{{/allParams}}]}{{/hasOptionalParams}}]{{#hasRequiredParams}} - {{#hasOptionalParams}} {{/hasOptionalParams}}(check-required-params{{#allParams}}{{#required}} {{{paramName}}}{{/required}}{{/allParams}}){{/hasRequiredParams}} - {{#hasOptionalParams}} {{/hasOptionalParams}}(call-api "{{{path}}}" :{{{httpMethod}}} - {{#hasOptionalParams}} {{/hasOptionalParams}} {:path-params { {{#pathParams}}"{{{baseName}}}" {{{paramName}}} {{/pathParams}} } - {{#hasOptionalParams}} {{/hasOptionalParams}} :header-params { {{#headerParams}}"{{{baseName}}}" {{{paramName}}} {{/headerParams}} } - {{#hasOptionalParams}} {{/hasOptionalParams}} :query-params { {{#queryParams}}"{{{baseName}}}" {{{paramName}}} {{/queryParams}} } - {{#hasOptionalParams}} {{/hasOptionalParams}} :form-params { {{#formParams}}"{{{baseName}}}" {{{paramName}}} {{/formParams}} }{{#bodyParam}} - {{#hasOptionalParams}} {{/hasOptionalParams}} :body-param {{{paramName}}}{{/bodyParam}} - {{#hasOptionalParams}} {{/hasOptionalParams}} :content-types [{{#consumes}}"{{mediaType}}"{{#hasMore}} {{/hasMore}}{{/consumes}}] - {{#hasOptionalParams}} {{/hasOptionalParams}} :accepts [{{#produces}}"{{mediaType}}"{{#hasMore}} {{/hasMore}}{{/produces}}]})){{#hasOptionalParams}}){{/hasOptionalParams}} -{{/operation}}{{/operations}} \ No newline at end of file +{{=< >=}} +(ns . + (:require [.core :refer [call-api check-required-params]])) +<#operations><#operation> +(defn + "<&summary><#notes> + <¬es>"<#hasOptionalParams> + ([<#allParams><#required> ] (<#allParams><#required> nil)) + <#hasOptionalParams>([<#allParams><#required> <#hasOptionalParams>{:keys [<#allParams><^required> ]}]<#hasRequiredParams> + <#hasOptionalParams> (check-required-params<#allParams><#required> ) + <#hasOptionalParams> (call-api "" : + <#hasOptionalParams> {:path-params {<#pathParams>"" } + <#hasOptionalParams> :header-params {<#headerParams>"" } + <#hasOptionalParams> :query-params {<#queryParams>"" } + <#hasOptionalParams> :form-params {<#formParams>"" }<#bodyParam> + <#hasOptionalParams> :body-param + <#hasOptionalParams> :content-types [<#consumes>""<#hasMore> ] + <#hasOptionalParams> :accepts [<#produces>""<#hasMore> ]}))<#hasOptionalParams>) + \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/clojure/project.mustache b/modules/swagger-codegen/src/main/resources/clojure/project.mustache index ac01fb57152..75e870714a7 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/project.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/project.mustache @@ -1,8 +1,9 @@ -(defproject {{{projectName}}} "{{{projectVersion}}}" - :description "{{{projectDescription}}}" - :url "http://example.com/FIXME" - :license {:name "Eclipse Public License" - :url "http://www.eclipse.org/legal/epl-v10.html"} +{{=< >=}} +(defproject <&projectName> "<&projectVersion>" + :description "<&projectDescription>"<#projectUrl> + :url "<&projectUrl>"<#licenseName> + :license {:name "<&licenseName>"<#licenseUrl> + :url "<&licenseUrl>"} :dependencies [[org.clojure/clojure "1.7.0"] [clj-http "2.0.0"] [cheshire "5.5.0"]]) From 31cb5b11677f726533b6ea9470fd0fc5de6a5302 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 17 Nov 2015 00:36:52 +0800 Subject: [PATCH 129/142] Add serialize method to handle JSON serialization --- .../src/main/resources/clojure/api.mustache | 3 +-- .../src/main/resources/clojure/core.mustache | 18 +++++++++++++----- .../main/resources/clojure/project.mustache | 3 +-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/clojure/api.mustache b/modules/swagger-codegen/src/main/resources/clojure/api.mustache index 474a1fc37cf..3d314531cdc 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/api.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/api.mustache @@ -1,5 +1,4 @@ -{{=< >=}} -(ns . +{{=< >=}}(ns . (:require [.core :refer [call-api check-required-params]])) <#operations><#operation> (defn diff --git a/modules/swagger-codegen/src/main/resources/clojure/core.mustache b/modules/swagger-codegen/src/main/resources/clojure/core.mustache index b5b8dd06b9a..50d23a6a740 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/core.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/core.mustache @@ -1,5 +1,5 @@ (ns {{{baseNamespace}}}.core - (:require [cheshire.core :refer [parse-string]] + (:require [cheshire.core :refer [generate-string parse-string]] [clojure.string :as str] [clj-http.client :as client]) (:import (com.fasterxml.jackson.core JsonParseException) @@ -115,6 +115,14 @@ first (or (first mimes)))) +(defn serialize + "Serialize the given data according to content-type. + Only JSON is supported for now." + [data content-type] + (if (json-mime? content-type) + (generate-string data {:date-format (:datetime-format *api-context*)}) + (throw (IllegalArgumentException. (str "Content type \"" content-type "\" is not support for serialization"))))) + (defn deserialize "Deserialize the given HTTP response according to the Content-Type header." [{:keys [body] {:keys [content-type]} :headers}] @@ -131,18 +139,18 @@ (defn call-api "Call an API by making HTTP request and return its response." [path method {:keys [path-params query-params header-params form-params body-param content-types accepts]}] - (let [{:keys [debug datetime-format]} *api-context* + (let [{:keys [debug]} *api-context* url (make-url path path-params) - content-type (json-preferred-mime content-types) + content-type (or (json-preferred-mime content-types) + (and body-param :json)) accept (or (json-preferred-mime accepts) :json) opts (cond-> {:url url :method method} content-type (assoc :content-type content-type) - (json-mime? content-type) (assoc :json-opts {:date-format datetime-format}) accept (assoc :accept accept) (seq query-params) (assoc :query-params (normalize-params query-params)) (seq header-params) (assoc :header-params (normalize-params header-params)) (seq form-params) (assoc :form-params (normalize-params form-params)) - (and (empty? form-params) body-param) (assoc :form-params body-param) + body-param (assoc :body (serialize body-param content-type)) debug (assoc :debug true :debug-body true)) resp (client/request opts)] (when debug diff --git a/modules/swagger-codegen/src/main/resources/clojure/project.mustache b/modules/swagger-codegen/src/main/resources/clojure/project.mustache index 75e870714a7..c403c9c43c6 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/project.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/project.mustache @@ -1,5 +1,4 @@ -{{=< >=}} -(defproject <&projectName> "<&projectVersion>" +{{=< >=}}(defproject <&projectName> "<&projectVersion>" :description "<&projectDescription>"<#projectUrl> :url "<&projectUrl>"<#licenseName> :license {:name "<&licenseName>"<#licenseUrl> From 9cf7cd9ef687703b0b1a37807a345a0ef9ea9da2 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 17 Nov 2015 00:47:12 +0800 Subject: [PATCH 130/142] And bin/clojure-petstore.sh and build the petstore clojure client sample --- bin/all-petstore.sh | 1 + bin/clojure-petstore.sh | 31 ++++ samples/client/petstore/clojure/.gitignore | 11 ++ samples/client/petstore/clojure/project.clj | 7 + .../clojure/src/swagger_petstore/api/pet.clj | 107 ++++++++++++ .../src/swagger_petstore/api/store.clj | 52 ++++++ .../clojure/src/swagger_petstore/api/user.clj | 107 ++++++++++++ .../clojure/src/swagger_petstore/core.clj | 159 ++++++++++++++++++ .../test/swagger_petstore/api/pet_test.clj | 87 ++++++++++ .../test/swagger_petstore/api/store_test.clj | 27 +++ .../test/swagger_petstore/api/user_test.clj | 57 +++++++ .../test/swagger_petstore/core_test.clj | 125 ++++++++++++++ 12 files changed, 771 insertions(+) create mode 100755 bin/clojure-petstore.sh create mode 100644 samples/client/petstore/clojure/.gitignore create mode 100644 samples/client/petstore/clojure/project.clj create mode 100644 samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj create mode 100644 samples/client/petstore/clojure/src/swagger_petstore/api/store.clj create mode 100644 samples/client/petstore/clojure/src/swagger_petstore/api/user.clj create mode 100644 samples/client/petstore/clojure/src/swagger_petstore/core.clj create mode 100644 samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj create mode 100644 samples/client/petstore/clojure/test/swagger_petstore/api/store_test.clj create mode 100644 samples/client/petstore/clojure/test/swagger_petstore/api/user_test.clj create mode 100644 samples/client/petstore/clojure/test/swagger_petstore/core_test.clj diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh index dc2b4116070..a439d015337 100755 --- a/bin/all-petstore.sh +++ b/bin/all-petstore.sh @@ -20,6 +20,7 @@ fi cd $APP_DIR ./bin/akka-scala-petstore.sh ./bin/android-java-petstore.sh +./bin/clojure-petstore.sh ./bin/csharp-petstore.sh ./bin/dynamic-html.sh ./bin/html-petstore.sh diff --git a/bin/clojure-petstore.sh b/bin/clojure-petstore.sh new file mode 100755 index 00000000000..1f53d9d386c --- /dev/null +++ b/bin/clojure-petstore.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +SCRIPT="$0" + +while [ -h "$SCRIPT" ] ; do + ls=`ls -ld "$SCRIPT"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + SCRIPT="$link" + else + SCRIPT=`dirname "$SCRIPT"`/"$link" + fi +done + +if [ ! -d "${APP_DIR}" ]; then + APP_DIR=`dirname "$SCRIPT"`/.. + APP_DIR=`cd "${APP_DIR}"; pwd` +fi + +executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" + +if [ ! -f "$executable" ] +then + mvn clean package +fi + +# if you've executed sbt assembly previously it will use that instead. +export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" +ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l clojure -o samples/client/petstore/clojure" + +java $JAVA_OPTS -jar $executable $ags diff --git a/samples/client/petstore/clojure/.gitignore b/samples/client/petstore/clojure/.gitignore new file mode 100644 index 00000000000..c53038ec0e3 --- /dev/null +++ b/samples/client/petstore/clojure/.gitignore @@ -0,0 +1,11 @@ +/target +/classes +/checkouts +pom.xml +pom.xml.asc +*.jar +*.class +/.lein-* +/.nrepl-port +.hgignore +.hg/ diff --git a/samples/client/petstore/clojure/project.clj b/samples/client/petstore/clojure/project.clj new file mode 100644 index 00000000000..34dcb2d99a7 --- /dev/null +++ b/samples/client/petstore/clojure/project.clj @@ -0,0 +1,7 @@ +(defproject swagger-petstore "1.0.0" + :description "This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key \"special-key\" to test the authorization filters" + :license {:name "Apache 2.0" + :url "http://www.apache.org/licenses/LICENSE-2.0.html"} + :dependencies [[org.clojure/clojure "1.7.0"] + [clj-http "2.0.0"] + [cheshire "5.5.0"]]) diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj new file mode 100644 index 00000000000..f73ef83893e --- /dev/null +++ b/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj @@ -0,0 +1,107 @@ +(ns swagger-petstore.api.pet + (:require [swagger-petstore.core :refer [call-api check-required-params]])) + +(defn update-pet + "Update an existing pet + " + ([] (update-pet nil)) + ([{:keys [body ]}] + (call-api "/pet" :put + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types ["application/json" "application/xml"] + :accepts ["application/json" "application/xml"]}))) + +(defn add-pet + "Add a new pet to the store + " + ([] (add-pet nil)) + ([{:keys [body ]}] + (call-api "/pet" :post + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types ["application/json" "application/xml"] + :accepts ["application/json" "application/xml"]}))) + +(defn find-pets-by-status + "Finds Pets by status + Multiple status values can be provided with comma seperated strings" + ([] (find-pets-by-status nil)) + ([{:keys [status ]}] + (call-api "/pet/findByStatus" :get + {:path-params {} + :header-params {} + :query-params {"status" status } + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn find-pets-by-tags + "Finds Pets by tags + Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing." + ([] (find-pets-by-tags nil)) + ([{:keys [tags ]}] + (call-api "/pet/findByTags" :get + {:path-params {} + :header-params {} + :query-params {"tags" tags } + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn get-pet-by-id + "Find pet by ID + Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions" + [pet-id ] + (call-api "/pet/{petId}" :get + {:path-params {"petId" pet-id } + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) + +(defn update-pet-with-form + "Updates a pet in the store with form data + " + ([pet-id ] (update-pet-with-form pet-id nil)) + ([pet-id {:keys [name status ]}] + (call-api "/pet/{petId}" :post + {:path-params {"petId" pet-id } + :header-params {} + :query-params {} + :form-params {"name" name "status" status } + :content-types ["application/x-www-form-urlencoded"] + :accepts ["application/json" "application/xml"]}))) + +(defn delete-pet + "Deletes a pet + " + ([pet-id ] (delete-pet pet-id nil)) + ([pet-id {:keys [api-key ]}] + (call-api "/pet/{petId}" :delete + {:path-params {"petId" pet-id } + :header-params {"api_key" api-key } + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn upload-file + "uploads an image + " + ([pet-id ] (upload-file pet-id nil)) + ([pet-id {:keys [additional-metadata file ]}] + (call-api "/pet/{petId}/uploadImage" :post + {:path-params {"petId" pet-id } + :header-params {} + :query-params {} + :form-params {"additionalMetadata" additional-metadata "file" file } + :content-types ["multipart/form-data"] + :accepts ["application/json" "application/xml"]}))) diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj new file mode 100644 index 00000000000..4d5ac3ca325 --- /dev/null +++ b/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj @@ -0,0 +1,52 @@ +(ns swagger-petstore.api.store + (:require [swagger-petstore.core :refer [call-api check-required-params]])) + +(defn get-inventory + "Returns pet inventories by status + Returns a map of status codes to quantities" + [] + (call-api "/store/inventory" :get + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) + +(defn place-order + "Place an order for a pet + " + ([] (place-order nil)) + ([{:keys [body ]}] + (call-api "/store/order" :post + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn get-order-by-id + "Find purchase order by ID + For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions" + [order-id ] + (call-api "/store/order/{orderId}" :get + {:path-params {"orderId" order-id } + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) + +(defn delete-order + "Delete purchase order by ID + For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors" + [order-id ] + (call-api "/store/order/{orderId}" :delete + {:path-params {"orderId" order-id } + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj new file mode 100644 index 00000000000..9f34a1be537 --- /dev/null +++ b/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj @@ -0,0 +1,107 @@ +(ns swagger-petstore.api.user + (:require [swagger-petstore.core :refer [call-api check-required-params]])) + +(defn create-user + "Create user + This can only be done by the logged in user." + ([] (create-user nil)) + ([{:keys [body ]}] + (call-api "/user" :post + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn create-users-with-array-input + "Creates list of users with given input array + " + ([] (create-users-with-array-input nil)) + ([{:keys [body ]}] + (call-api "/user/createWithArray" :post + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn create-users-with-list-input + "Creates list of users with given input array + " + ([] (create-users-with-list-input nil)) + ([{:keys [body ]}] + (call-api "/user/createWithList" :post + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn login-user + "Logs user into the system + " + ([] (login-user nil)) + ([{:keys [username password ]}] + (call-api "/user/login" :get + {:path-params {} + :header-params {} + :query-params {"username" username "password" password } + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn logout-user + "Logs out current logged in user session + " + [] + (call-api "/user/logout" :get + {:path-params {} + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) + +(defn get-user-by-name + "Get user by user name + " + [username ] + (call-api "/user/{username}" :get + {:path-params {"username" username } + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) + +(defn update-user + "Updated user + This can only be done by the logged in user." + ([username ] (update-user username nil)) + ([username {:keys [body ]}] + (call-api "/user/{username}" :put + {:path-params {"username" username } + :header-params {} + :query-params {} + :form-params {} + :body-param body + :content-types [] + :accepts ["application/json" "application/xml"]}))) + +(defn delete-user + "Delete user + This can only be done by the logged in user." + [username ] + (call-api "/user/{username}" :delete + {:path-params {"username" username } + :header-params {} + :query-params {} + :form-params {} + :content-types [] + :accepts ["application/json" "application/xml"]})) diff --git a/samples/client/petstore/clojure/src/swagger_petstore/core.clj b/samples/client/petstore/clojure/src/swagger_petstore/core.clj new file mode 100644 index 00000000000..85856674a19 --- /dev/null +++ b/samples/client/petstore/clojure/src/swagger_petstore/core.clj @@ -0,0 +1,159 @@ +(ns swagger-petstore.core + (:require [cheshire.core :refer [generate-string parse-string]] + [clojure.string :as str] + [clj-http.client :as client]) + (:import (com.fasterxml.jackson.core JsonParseException) + (java.util Date TimeZone) + (java.text SimpleDateFormat))) + +(def default-api-context + "Default API context." + {:base-url "http://petstore.swagger.io/v2" + :date-format "yyyy-MM-dd" + :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" + :debug false}) + +(def ^:dynamic *api-context* + "Dynamic API context to be applied in API calls." + default-api-context) + +(defmacro with-api-context + "A helper macro to wrap *api-context* with default values." + [context & body] + `(binding [*api-context* (merge *api-context* ~context)] + ~@body)) + +(defmacro check-required-params + "Throw exception if the given parameter value is nil." + [& params] + (->> params + (map (fn [p] + `(if (nil? ~p) + (throw (IllegalArgumentException. ~(str "The parameter \"" p "\" is required")))))) + (list* 'do))) + +(defn- make-date-format + ([format-str] (make-date-format format-str nil)) + ([format-str time-zone] + (let [date-format (SimpleDateFormat. format-str)] + (when time-zone + (.setTimeZone date-format (TimeZone/getTimeZone time-zone))) + date-format))) + +(defn format-date + "Format the given Date object with the :date-format defined in *api-options*. + NOTE: The UTC time zone is used." + [^Date date] + (let [{:keys [date-format]} *api-context*] + (-> (make-date-format date-format "UTC") + (.format date)))) + +(defn parse-date + "Parse the given string to a Date object with the :date-format defined in *api-options*. + NOTE: The UTC time zone is used." + [^String s] + (let [{:keys [date-format]} *api-context*] + (-> (make-date-format date-format "UTC") + (.parse s)))) + +(defn format-datetime + "Format the given Date object with the :datetime-format defined in *api-options*. + NOTE: The system's default time zone is used when not provided." + ([^Date date] (format-datetime date nil)) + ([^Date date ^String time-zone] + (let [{:keys [datetime-format]} *api-context*] + (-> (make-date-format datetime-format time-zone) + (.format date))))) + +(defn parse-datetime + "Parse the given string to a Date object with the :datetime-format defined in *api-options*. + NOTE: The system's default time zone is used when not provided." + ([^String s] (parse-datetime s nil)) + ([^String s ^String time-zone] + (let [{:keys [datetime-format]} *api-context*] + (-> (make-date-format datetime-format time-zone) + (.parse s))))) + +(defn param-to-str [param] + "Format the given parameter value to string." + (cond + (instance? Date param) (format-datetime param) + (sequential? param) (str/join "," param) + :else (str param))) + +(defn make-url + "Make full URL by adding base URL and filling path parameters." + [path path-params] + (let [path (reduce (fn [p [k v]] + (str/replace p (re-pattern (str "\\{" k "\\}")) (param-to-str v))) + path + path-params)] + (str (:base-url *api-context*) path))) + +(defn normalize-params + "Normalize parameters values: remove nils, format to string with `param-to-str`." + [params] + (reduce (fn [result [k v]] + (if (nil? v) + result + (assoc result k (if (sequential? v) + (map param-to-str v) + (param-to-str v))))) + {} + params)) + +(defn json-mime? [mime] + "Check if the given MIME is a standard JSON MIME or :json." + (if mime + (or (= :json mime) + (re-matches #"application/json(;.*)?" (name mime))))) + +(defn json-preferred-mime [mimes] + "Choose a MIME from the given MIMEs with JSON preferred, + i.e. return JSON if included, otherwise return the first one." + (-> (filter json-mime? mimes) + first + (or (first mimes)))) + +(defn serialize + "Serialize the given data according to content-type. + Only JSON is supported for now." + [data content-type] + (if (json-mime? content-type) + (generate-string data {:date-format (:datetime-format *api-context*)}) + (throw (IllegalArgumentException. (str "Content type \"" content-type "\" is not support for serialization"))))) + +(defn deserialize + "Deserialize the given HTTP response according to the Content-Type header." + [{:keys [body] {:keys [content-type]} :headers}] + (cond + (json-mime? content-type) + (try + (parse-string body true) + (catch JsonParseException e + ;; return the body string directly on JSON parsing error + body)) + ;; for non-JSON response, return the body string directly + :else body)) + +(defn call-api + "Call an API by making HTTP request and return its response." + [path method {:keys [path-params query-params header-params form-params body-param content-types accepts]}] + (let [{:keys [debug]} *api-context* + url (make-url path path-params) + content-type (or (json-preferred-mime content-types) + (and body-param :json)) + accept (or (json-preferred-mime accepts) :json) + opts (cond-> {:url url :method method} + content-type (assoc :content-type content-type) + accept (assoc :accept accept) + (seq query-params) (assoc :query-params (normalize-params query-params)) + (seq header-params) (assoc :header-params (normalize-params header-params)) + (seq form-params) (assoc :form-params (normalize-params form-params)) + body-param (assoc :body (serialize body-param content-type)) + debug (assoc :debug true :debug-body true)) + resp (client/request opts)] + (when debug + (println "Response:") + (println resp)) + (deserialize resp))) diff --git a/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj new file mode 100644 index 00000000000..8acd528c5a5 --- /dev/null +++ b/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj @@ -0,0 +1,87 @@ +(ns swagger-petstore.api.pet-test + (:require [clojure.test :refer :all] + [clojure.java.io :as io] + [swagger-petstore.api.pet :refer :all])) + +(defn- make-random-pet + ([] (make-random-pet nil)) + ([{:keys [id] :as attrs :or {id (System/currentTimeMillis)}}] + (merge {:id id + :name (str "pet-" id) + :status "available" + :photoUrls ["http://foo.bar.com/1" "http://foo.bar.com/2"] + :category {:name "really-happy"}} + attrs))) + +(deftest test-create-and-get-pet + (let [{:keys [id] :as pet} (make-random-pet) + _ (add-pet {:body pet}) + fetched (get-pet-by-id id)] + (is (identity fetched)) + (is (= id (:id fetched))) + (is (identity (:category fetched))) + (is (= (get-in pet [:category :name]) (get-in fetched [:category :name]))) + (delete-pet id))) + +(deftest test-find-pets-by-status + (let [status "pending" + {:keys [id] :as pet} (make-random-pet {:status status}) + _ (add-pet {:body pet}) + pets (find-pets-by-status {:status [status]})] + (is (seq pets)) + (is (some #{id} (map :id pets))) + (delete-pet id))) + +(deftest test-find-pets-by-tags + (let [tag-name (str "tag-" (rand-int 1000)) + tag {:name tag-name} + {:keys [id] :as pet} (make-random-pet {:tags [tag]}) + _ (add-pet {:body pet}) + pets (find-pets-by-tags {:tags [tag-name]})] + (is (seq pets)) + (is (some #{id} (map :id pets))) + (delete-pet id))) + +(deftest test-update-pet-with-form + (let [{pet-id :id :as pet} (make-random-pet {:name "new name" :status "available"}) + _ (add-pet {:body pet}) + {:keys [id name status]} (get-pet-by-id pet-id)] + (is (= pet-id id)) + (is (= "new name" name)) + (is (= "available" status)) + ;; update "name" only + (update-pet-with-form pet-id {:name "updated name 1"}) + (let [{:keys [id name status]} (get-pet-by-id pet-id)] + (is (= pet-id id)) + (is (= "updated name 1" name)) + (is (= "available" status))) + ;; update "status" only + (update-pet-with-form pet-id {:status "pending"}) + (let [{:keys [id name status]} (get-pet-by-id pet-id)] + (is (= pet-id id)) + (is (= "updated name 1" name)) + (is (= "pending" status))) + ;; update both "name" and "status" + (update-pet-with-form pet-id {:name "updated name 2" :status "sold"}) + (let [{:keys [id name status]} (get-pet-by-id pet-id)] + (is (= pet-id id)) + (is (= "updated name 2" name)) + (is (= "sold" status))) + (delete-pet pet-id))) + +(deftest test-delete-pet + (let [{:keys [id] :as pet} (make-random-pet) + _ (add-pet {:body pet}) + fetched (get-pet-by-id id)] + (is (= id (:id fetched))) + (delete-pet id) + (is (thrown? RuntimeException (get-pet-by-id id))))) + +(comment + ;; TODO support file uploading + (deftest test-upload-file + (let [{:keys [id] :as pet} (make-random-pet) + _ (add-pet {:body pet}) + file (io/file (io/resource "hello.txt"))] + ;; no errors + (upload-file id {:file file :additionalMetadata "uploading file with clojure client"})))) diff --git a/samples/client/petstore/clojure/test/swagger_petstore/api/store_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/api/store_test.clj new file mode 100644 index 00000000000..5a453e3693e --- /dev/null +++ b/samples/client/petstore/clojure/test/swagger_petstore/api/store_test.clj @@ -0,0 +1,27 @@ +(ns swagger-petstore.api.store-test + (:require [clojure.test :refer :all] + [swagger-petstore.api.store :refer :all]) + (:import (java.util Date))) + +(defn- make-random-order [] + {:id (+ 90000 (rand-int 10000)) + :petId 200 + :quantity 13 + :shipDate (Date.) + :status "placed" + :complete true}) + +(deftest test-get-inventory + (let [inventory (get-inventory)] + (is (pos? (count inventory))))) + +(deftest test-place-and-delete-order + (let [order (make-random-order) + order-id (:id order) + _ (place-order {:body order}) + fetched (get-order-by-id order-id)] + (doseq [attr [:id :petId :quantity]] + (is (= (attr order) (attr fetched)))) + (delete-order order-id) + (comment "it seems that delete-order does not really delete the order" + (is (thrown? RuntimeException (get-order-by-id order-id)))))) diff --git a/samples/client/petstore/clojure/test/swagger_petstore/api/user_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/api/user_test.clj new file mode 100644 index 00000000000..aa05b23f19a --- /dev/null +++ b/samples/client/petstore/clojure/test/swagger_petstore/api/user_test.clj @@ -0,0 +1,57 @@ +(ns swagger-petstore.api.user-test + (:require [clojure.test :refer :all] + [swagger-petstore.api.user :refer :all])) + +(defn- make-random-user + ([] (make-random-user nil)) + ([{:keys [id] :as attrs :or {id (System/currentTimeMillis)}}] + (merge {:id id + :username (str "user-" id) + :password "my-password" + :userStatus 0} + attrs))) + +(deftest test-create-and-delete-user + (let [user (make-random-user) + username (:username user) + _ (create-user {:body user}) + fetched (get-user-by-name username)] + (doseq [attr [:id :username :password :userStatus]] + (is (= (attr user) (attr fetched)))) + (delete-user username) + (is (thrown? RuntimeException (get-user-by-name username))))) + +(deftest test-create-users-with-array-input + (let [id1 (System/currentTimeMillis) + id2 (inc id1) + user1 (make-random-user {:id id1}) + user2 (make-random-user {:id id2})] + (create-users-with-array-input {:body [user1 user2]}) + (let [fetched (get-user-by-name (:username user1))] + (is (= id1 (:id fetched)))) + (let [fetched (get-user-by-name (:username user2))] + (is (= id2 (:id fetched)))) + (delete-user (:username user1)) + (delete-user (:username user2)))) + +(deftest test-create-users-with-list-input + (let [id1 (System/currentTimeMillis) + id2 (inc id1) + user1 (make-random-user {:id id1}) + user2 (make-random-user {:id id2})] + (create-users-with-list-input {:body [user1 user2]}) + (let [fetched (get-user-by-name (:username user1))] + (is (= id1 (:id fetched)))) + (let [fetched (get-user-by-name (:username user2))] + (is (= id2 (:id fetched)))) + (delete-user (:username user1)) + (delete-user (:username user2)))) + +(deftest test-login-and-lougout-user + (let [{:keys [username password] :as user} (make-random-user) + _ (create-user {:body user}) + result (login-user {:username username :password password})] + (is (re-matches #"logged in user session:.+" result)) + ;; no error with logout-user + (logout-user) + (delete-user username))) diff --git a/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj new file mode 100644 index 00000000000..ac39e8a503f --- /dev/null +++ b/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj @@ -0,0 +1,125 @@ +(ns swagger-petstore.core-test + (:require [clojure.test :refer :all] + [swagger-petstore.core :refer :all]) + (:import (java.text ParseException))) + +(deftest test-api-context + (testing "default" + (is (= {:base-url "http://petstore.swagger.io/v2" + :date-format "yyyy-MM-dd" + :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" + :debug false} + default-api-context + *api-context* + (with-api-context {} + *api-context*)))) + (testing "customize via with-api-context" + (with-api-context {:base-url "http://localhost" :debug true} + (is (= {:base-url "http://localhost" + :date-format "yyyy-MM-dd" + :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" + :debug true} + *api-context*)) + ;; nested with-api-context inherits values from the outer api context + (with-api-context {:datetime-format "yyyy-MM-dd HH:mm:ss"} + (is (= {:base-url "http://localhost" + :date-format "yyyy-MM-dd" + :datetime-format "yyyy-MM-dd HH:mm:ss" + :debug true} + *api-context*)))) + ;; back to default api context + (is (= {:base-url "http://petstore.swagger.io/v2" + :date-format "yyyy-MM-dd" + :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" + :debug false} + *api-context*)))) + +(deftest test-check-required-params + (let [a nil b :not-nil] + (is (thrown? IllegalArgumentException (check-required-params a))) + (is (nil? (check-required-params b))))) + +(deftest test-parse-and-format-date + (testing "default date format" + (is (= "2015-11-07" (-> "2015-11-07T03:49:09.356+00:00" parse-datetime format-date))) + (is (= "2015-11-07" (-> "2015-11-07" parse-date format-date))) + (is (thrown? ParseException (parse-date "2015-11")))) + (testing "custom date format: without day" + (with-api-context {:date-format "yyyy-MM"} + (is (= "2015-11" (-> "2015-11-07T03:49:09.123Z" parse-datetime format-date))) + (is (= "2015-11" (-> "2015-11" parse-date format-date))) + (is (thrown? ParseException (parse-date "2015")))))) + +(deftest test-parse-and-format-datetime + (testing "default datetime format" + (are [s] + (is (= "2015-11-07T03:49:09.356Z" (-> s parse-datetime (format-datetime "UTC")))) + "2015-11-07T03:49:09.356+00:00" + "2015-11-07T05:49:09.356+02:00" + "2015-11-07T02:49:09.356-01:00" + "2015-11-07T03:49:09.356Z") + (is (thrown? ParseException (parse-datetime "2015-11-07 03:49:09")))) + (testing "custom datetime format: without milliseconds" + (with-api-context {:datetime-format "yyyy-MM-dd'T'HH:mm:ssXXX"} + (are [s] + (is (= "2015-11-07T13:49:09+10:00" (-> s parse-datetime (format-datetime "GMT+10")))) + "2015-11-07T03:49:09+00:00" + "2015-11-07T03:49:09Z" + "2015-11-07T00:49:09-03:00") + (is (thrown? ParseException (parse-datetime "2015-11-07T03:49:09.123Z")))))) + +(deftest test-param-to-str + (let [date (parse-datetime "2015-11-07T03:49:09.123Z")] + (are [param expected] + (is (= expected (param-to-str param))) + nil "" + "abc" "abc" + 123 "123" + 1.0 "1.0" + [12 "34"] "12,34" + date (format-datetime date)))) + +(deftest test-make-url + (are [path path-params url] + (is (= url (make-url path path-params))) + "/pet/{petId}" {"petId" 123} "http://petstore.swagger.io/v2/pet/123" + "/" nil "http://petstore.swagger.io/v2/" + "/pet" {"id" 1} "http://petstore.swagger.io/v2/pet" + "/pet/{id}" nil "http://petstore.swagger.io/v2/pet/{id}")) + +(deftest test-normalize-params + (is (= {:a "123" :b ["4" "5,6"]} + (normalize-params {:a 123 :b [4 [5 "6"]] :c nil})))) + +(deftest test-json-mime? + (are [mime expected] + (is (= expected (boolean (json-mime? mime)))) + :json true + "application/json" true + "application/json; charset=utf8" true + nil false + :xml false + "application/pdf" false)) + +(deftest test-json-preferred-mime + (are [mimes expected] + (is (= expected (json-preferred-mime mimes))) + ["application/xml" "application/json"] "application/json" + [:json] :json + [] nil + nil nil + ["application/xml"] "application/xml")) + +(deftest test-serialize + (is (= "{\"aa\":1,\"bb\":\"2\"}" (serialize {:aa 1 :bb "2"} :json))) + (is (= "{}" (serialize {} "application/json"))) + (is (= "[1,\"2\"]" (serialize [1 "2"] "application/json; charset=UTF8"))) + (is (thrown? IllegalArgumentException (serialize {} "application/xml")))) + +(deftest test-deserialize + (are [body content-type expected] + (is (= expected (deserialize {:body body :headers {:content-type content-type}}))) + "{\"aa\": 1, \"bb\": \"2\"}" "application/json" {:aa 1 :bb "2"} + "[1, \"2\"]" "application/json; charset=UTF8" [1 "2"] + "{invalid json}" "application/json" "{invalid json}" + "plain text" "text/plain" "plain text")) \ No newline at end of file From ce7a707ec15e17ffc85ab8de7a67b77cbb90ea08 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 17 Nov 2015 10:06:38 +0800 Subject: [PATCH 131/142] reapply the fix after rebase --- .../languages/CSharpClientCodegen.java | 25 +++++++++++++++++++ .../SwaggerClientTest.userprefs | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index a7972253188..3ab152cf66d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -5,6 +5,8 @@ import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; +import io.swagger.codegen.CodegenProperty; +import io.swagger.codegen.CodegenModel; import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; @@ -14,10 +16,15 @@ import java.io.File; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.List; +import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig { + private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class); protected String packageName = "IO.Swagger"; protected String packageVersion = "1.0.0"; protected String clientPackage = "IO.Swagger.Client"; @@ -261,4 +268,22 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig public void setPackageVersion(String packageVersion) { this.packageVersion = packageVersion; } + + @Override + public Map postProcessModels(Map objs) { + List models = (List) objs.get("models"); + for (Object _mo : models) { + Map mo = (Map) _mo; + CodegenModel cm = (CodegenModel) mo.get("model"); + for (CodegenProperty var : cm.vars) { + // check to see if model name is same as the property name + // which will result in compilation error + // if found, prepend with _ to workaround the limitation + if (var.name.equals(cm.name)) { + var.name = "_" + var.name; + } + } + } + return objs; + } } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs index 10c2758ea5e..31e5cba141b 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs +++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs @@ -2,7 +2,7 @@ - + From 5eacb4d12c99d8fcb0eb7810807a038092c38f19 Mon Sep 17 00:00:00 2001 From: Curt Hostetter Date: Tue, 17 Nov 2015 09:38:34 -0500 Subject: [PATCH 132/142] Update Jersey to 2.12 to help MIMEXXX.tmp cleanup https://github.com/swagger-api/swagger-codegen/issues/1576 --- .../src/main/resources/Java/libraries/jersey2/pom.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache index e2d0f73d408..c8d2145bc6e 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -162,7 +162,7 @@ 1.5.0 - 2.6 + 2.12 2.4.2 2.3 1.0.0 From 951e56071f796ecc3ca847baf70c1a92a49f0025 Mon Sep 17 00:00:00 2001 From: Curt Hostetter Date: Tue, 17 Nov 2015 11:18:55 -0500 Subject: [PATCH 133/142] Ran ./bin/java-petstore-jersey2.sh to update the Petstore sample --- samples/client/petstore/java/jersey2/pom.xml | 2 +- .../jersey2/src/main/java/io/swagger/client/ApiClient.java | 2 +- .../jersey2/src/main/java/io/swagger/client/ApiException.java | 2 +- .../src/main/java/io/swagger/client/Configuration.java | 2 +- .../java/jersey2/src/main/java/io/swagger/client/JSON.java | 2 +- .../java/jersey2/src/main/java/io/swagger/client/Pair.java | 2 +- .../jersey2/src/main/java/io/swagger/client/StringUtil.java | 2 +- .../java/jersey2/src/main/java/io/swagger/client/TypeRef.java | 2 +- .../jersey2/src/main/java/io/swagger/client/api/PetApi.java | 2 +- .../jersey2/src/main/java/io/swagger/client/api/StoreApi.java | 2 +- .../jersey2/src/main/java/io/swagger/client/api/UserApi.java | 2 +- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 2 +- .../src/main/java/io/swagger/client/auth/Authentication.java | 2 +- .../src/main/java/io/swagger/client/auth/HttpBasicAuth.java | 2 +- .../jersey2/src/main/java/io/swagger/client/auth/OAuth.java | 2 +- .../src/main/java/io/swagger/client/model/Category.java | 2 +- .../jersey2/src/main/java/io/swagger/client/model/Order.java | 2 +- .../jersey2/src/main/java/io/swagger/client/model/Pet.java | 4 ++-- .../jersey2/src/main/java/io/swagger/client/model/Tag.java | 2 +- .../jersey2/src/main/java/io/swagger/client/model/User.java | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml index eee88cd2429..e5353a66ea5 100644 --- a/samples/client/petstore/java/jersey2/pom.xml +++ b/samples/client/petstore/java/jersey2/pom.xml @@ -162,7 +162,7 @@ 1.5.0 - 2.6 + 2.12 2.4.2 2.3 1.0.0 diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java index 9bbc5407af0..c74c6e6ba29 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java @@ -43,7 +43,7 @@ import io.swagger.client.auth.HttpBasicAuth; import io.swagger.client.auth.ApiKeyAuth; import io.swagger.client.auth.OAuth; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-09T11:02:32.553+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class ApiClient { private Client client; private Map hostMap = new HashMap(); diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java index 7c505d33b96..80bf3d260ca 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java @@ -3,7 +3,7 @@ package io.swagger.client; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class ApiException extends Exception { private int code = 0; private Map> responseHeaders = null; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java index f678452b1a0..82b8e0459bc 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class Configuration { private static ApiClient defaultApiClient = new ApiClient(); diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java index 35ab10fd9c6..a05975c0e59 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java @@ -8,7 +8,7 @@ import java.text.DateFormat; import java.io.IOException; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-09T11:02:32.553+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class JSON { private ObjectMapper mapper; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java index a8337005dec..aae34092fc2 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class Pair { private String name = ""; private String value = ""; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java index ac7d51e2497..02e52457fef 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java @@ -1,6 +1,6 @@ package io.swagger.client; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java index f2f9d8a31cc..0452e40e0c4 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java @@ -3,7 +3,7 @@ package io.swagger.client; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class TypeRef { private final Type type; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java index 57c087a7b5f..10134d4f3ea 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java @@ -11,7 +11,7 @@ import java.io.File; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:20.020+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class PetApi { private ApiClient apiClient; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java index b035cde9658..d7e30dd2b0e 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java @@ -11,7 +11,7 @@ import io.swagger.client.model.Order; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:20.020+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class StoreApi { private ApiClient apiClient; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java index 51bac269b53..db04594b56b 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java @@ -11,7 +11,7 @@ import java.util.*; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-21T11:55:20.020+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class UserApi { private ApiClient apiClient; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index 60f3aa7c5b5..d7d3d3e63b0 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -5,7 +5,7 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java index ff1fc732015..0861802a7d3 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java @@ -5,7 +5,7 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public interface Authentication { /** Apply authentication settings to header and query params. */ void applyToParams(List queryParams, Map headerParams); diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java index f3b643a7839..390502ab9e5 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java @@ -8,7 +8,7 @@ import java.util.List; import java.io.UnsupportedEncodingException; import javax.xml.bind.DatatypeConverter; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class HttpBasicAuth implements Authentication { private String username; private String password; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java index 215eb960fd4..144d4c9681f 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java @@ -5,7 +5,7 @@ import io.swagger.client.Pair; import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-02T22:10:35.641+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class OAuth implements Authentication { private String accessToken; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java index 1e5b0410731..26e1b89bba7 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class Category { private Long id = null; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java index 3239bdd4faf..6efc0786703 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class Order { private Long id = null; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java index 2840137e85d..02f0b88d6f5 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java @@ -2,8 +2,8 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; import io.swagger.client.model.Category; -import io.swagger.client.model.Tag; import java.util.*; +import io.swagger.client.model.Tag; @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class Pet { private Long id = null; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java index e71aacd8011..9dc8e017f9f 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class Tag { private Long id = null; diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java index 2f35e770e03..8ad399fcc6b 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-20T11:29:47.599-07:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-17T11:17:50.535-05:00") public class User { private Long id = null; From c7e5c305a937a7dcd86b79b2b62703f4d66bf015 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 17 Nov 2015 18:46:33 -0800 Subject: [PATCH 134/142] fixes #1581, rebuilt server --- .../io/swagger/codegen/DefaultGenerator.java | 24 +- .../languages/NodeJSServerCodegen.java | 41 +- .../main/resources/nodejs/controller.mustache | 12 +- .../src/main/resources/nodejs/index.mustache | 6 +- .../main/resources/nodejs/package.mustache | 3 +- .../main/resources/nodejs/service.mustache | 18 +- .../main/resources/nodejs/swagger.mustache | 44 +- samples/server/petstore/nodejs/README.md | 24 + .../server/petstore/nodejs/api/swagger.json | 867 ------------------ .../server/petstore/nodejs/api/swagger.yaml | 667 ++++++++++++++ .../server/petstore/nodejs/controllers/Pet.js | 101 +- .../petstore/nodejs/controllers/PetService.js | 104 ++- .../petstore/nodejs/controllers/Store.js | 47 +- .../nodejs/controllers/StoreService.js | 66 +- .../petstore/nodejs/controllers/User.js | 97 +- .../nodejs/controllers/UserService.js | 91 +- samples/server/petstore/nodejs/index.js | 6 +- samples/server/petstore/nodejs/package.json | 3 +- 18 files changed, 969 insertions(+), 1252 deletions(-) create mode 100644 samples/server/petstore/nodejs/README.md delete mode 100644 samples/server/petstore/nodejs/api/swagger.json create mode 100644 samples/server/petstore/nodejs/api/swagger.yaml 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 5fa165f0788..3623361387e 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,19 +1,8 @@ package io.swagger.codegen; -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.models.ComposedModel; -import io.swagger.models.Contact; -import io.swagger.models.Info; -import io.swagger.models.License; -import io.swagger.models.Model; -import io.swagger.models.Operation; -import io.swagger.models.Path; -import io.swagger.models.SecurityRequirement; -import io.swagger.models.Swagger; +import io.swagger.models.*; import io.swagger.models.auth.OAuth2Definition; import io.swagger.models.auth.SecuritySchemeDefinition; import io.swagger.models.parameters.Parameter; @@ -23,14 +12,12 @@ import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; +import java.io.*; import java.util.*; +import static org.apache.commons.lang3.StringUtils.capitalize; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; + public class DefaultGenerator extends AbstractGenerator implements Generator { Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class); @@ -321,6 +308,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { if (swagger.getHost() != null) { bundle.put("host", swagger.getHost()); } + bundle.put("swagger", this.swagger); bundle.put("basePath", basePath); bundle.put("scheme", scheme); bundle.put("contextPath", contextPath); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index 664530c33d8..4dee5f6f2df 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -1,27 +1,16 @@ package io.swagger.codegen.languages; -import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenOperation; -import io.swagger.codegen.CodegenParameter; -import io.swagger.codegen.CodegenResponse; -import io.swagger.codegen.CodegenType; -import io.swagger.codegen.DefaultCodegen; -import io.swagger.codegen.SupportingFile; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import io.swagger.codegen.*; +import io.swagger.models.Swagger; +import io.swagger.util.Yaml; + +import java.io.File; +import java.util.*; +import java.util.Map.Entry; public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig { protected String apiVersion = "1.0.0"; @@ -87,7 +76,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig // ); supportingFiles.add(new SupportingFile("swagger.mustache", "api", - "swagger.json") + "swagger.yaml") ); supportingFiles.add(new SupportingFile("index.mustache", "", @@ -97,6 +86,10 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig "", "package.json") ); + supportingFiles.add(new SupportingFile("README.mustache", + "", + "README.md") + ); if (System.getProperty("noservice") == null) { apiTemplateFiles.put( "service.mustache", // the template to use @@ -242,6 +235,14 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig @Override public Map postProcessSupportingFileData(Map objs) { + Swagger swagger = (Swagger)objs.get("swagger"); + if(swagger != null) { + try { + objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } for (Map operations : getOperations(objs)) { @SuppressWarnings("unchecked") List ops = (List) operations.get("operation"); diff --git a/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache b/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache index 85d1f3211a1..0f0c35bc0ee 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache @@ -9,17 +9,7 @@ var {{classname}} = require('./{{classname}}Service'); {{#operation}} module.exports.{{nickname}} = function {{nickname}} (req, res, next) { - {{#allParams}}var {{paramName}} = req.swagger.params['{{baseName}}'].value; - {{/allParams}} - - var result = {{classname}}.{{nickname}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + {{classname}}.{{nickname}}(req.swagger.params, res, next); }; {{/operation}} {{/operations}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/nodejs/index.mustache b/modules/swagger-codegen/src/main/resources/nodejs/index.mustache index 419b3fb5e63..397661d4d52 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/index.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/index.mustache @@ -3,7 +3,8 @@ var app = require('connect')(); var http = require('http'); var swaggerTools = require('swagger-tools'); - +var jsyaml = require('js-yaml'); +var fs = require('fs'); var serverPort = {{serverPort}}; // swaggerRouter configuration @@ -14,7 +15,8 @@ var options = { }; // The Swagger document (require it, build it programmatically, fetch it from a URL, ...) -var swaggerDoc = require('./api/swagger.json'); +var spec = fs.readFileSync('./api/swagger.yaml', 'utf8'); +var swaggerDoc = jsyaml.safeLoad(spec); // Initialize the Swagger middleware swaggerTools.initializeMiddleware(swaggerDoc, function (middleware) { diff --git a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache index 89db4c0b91e..86aa21af635 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache @@ -10,6 +10,7 @@ "private": true, "dependencies": { "connect": "^3.2.0", - "swagger-tools": "0.8.*" + "js-yaml": "^3.3.0", + "swagger-tools": "0.9.*" } } diff --git a/modules/swagger-codegen/src/main/resources/nodejs/service.mustache b/modules/swagger-codegen/src/main/resources/nodejs/service.mustache index d7c2ade5079..5073d249275 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/service.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/service.mustache @@ -2,17 +2,27 @@ {{#operations}} {{#operation}} -exports.{{nickname}} = function({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { +exports.{{nickname}} = function(args, res, next) { + /** + * parameters expected in the args: + {{#allParams}}* {{paramName}} ({{dataType}}) + {{/allParams}}**/ - var examples = {}; +var examples = {}; {{#examples}} examples['{{contentType}}'] = {{{example}}}; {{/examples}} {{#returnType}} - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } {{/returnType}} + {{^returnType}}res.end();{{/returnType}} } {{/operation}} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache b/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache index 1d0f7d78162..51560926bba 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache @@ -1,43 +1 @@ -{ - "swagger": "2.0", - "info": { - "title": "{{appName}}", - "description": "{{{appDescription}}}", - "version": "{{apiVersion}}" - }, -{{#apiInfo}} - "produces": ["application/json"], - "host": "localhost:{{serverPort}}", - "basePath": "{{contextPath}}", - "paths": { -{{#apis}} -{{#operations}} - {{#operationsByPath}} - "{{{path}}}": { - {{#operation}} - "{{httpMethod}}": { - "summary": "{{summary}}", - "description":"{{notes}}", - "x-swagger-router-controller": "{{classname}}", - "tags": ["{{baseName}}"], - "operationId": "{{operationId}}",{{#hasParams}} - "parameters": [ - {{#allParams}}{{{jsonSchema}}}{{#hasMore}},{{/hasMore}} - {{/allParams}} - ],{{/hasParams}} - "responses": { - {{#responses}}"{{code}}": {{{jsonSchema}}} - {{#hasMore}},{{/hasMore}} - {{/responses}} - } - } {{#hasMore}},{{/hasMore}} - {{/operation}} - } {{#hasMore}},{{/hasMore}} - {{/operationsByPath}} -{{/operations}} -{{/apis}} -{{/apiInfo}} - }, "definitions": { - {{#models}}{{#model}}"{{classVarName}}": {{{modelJson}}}{{#hasMoreModels}},{{/hasMoreModels}}{{/model}}{{/models}} - } -} +{{{swagger-yaml}}} \ No newline at end of file diff --git a/samples/server/petstore/nodejs/README.md b/samples/server/petstore/nodejs/README.md new file mode 100644 index 00000000000..edeea0005c0 --- /dev/null +++ b/samples/server/petstore/nodejs/README.md @@ -0,0 +1,24 @@ +# Swagger generated server + +## Overview +This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate a server stub. This is an example of building a node.js server. + +This example uses the [expressjs](http://expressjs.com/) framework. To see how to make this your own, look here: + +[README](https://github.com/swagger-api/swagger-codegen/README.md) + +### Running the server +To run the server, follow these simple steps: + +``` +npm install +node . +``` + +To view the Swagger UI interface: + +``` +open http://localhost:8080/docs +``` + +This project leverages the mega-awesome [swagger-tools](https://github.com/apigee-127/swagger-tools) middleware which does most all the work. \ No newline at end of file diff --git a/samples/server/petstore/nodejs/api/swagger.json b/samples/server/petstore/nodejs/api/swagger.json deleted file mode 100644 index 4c0ad6ea42f..00000000000 --- a/samples/server/petstore/nodejs/api/swagger.json +++ /dev/null @@ -1,867 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Swagger Petstore", - "description": "This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key \"special-key\" to test the authorization filters", - "version": "1.0.0" - }, - "produces": ["application/json"], - "host": "localhost:8080", - "basePath": "/v2", - "paths": { - - "/user/createWithList": { - - "post": { - "summary": "Creates list of users with given input array", - "description":"", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "createUsersWithListInput", - "parameters": [ - { - "in" : "body", - "name" : "body", - "description" : "List of user object", - "required" : false, - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/User" - } - } -} - - ], - "responses": { - "default": { - "description" : "successful operation" -} - - - } - } - - } , - - "/user/createWithArray": { - - "post": { - "summary": "Creates list of users with given input array", - "description":"", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "createUsersWithArrayInput", - "parameters": [ - { - "in" : "body", - "name" : "body", - "description" : "List of user object", - "required" : false, - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/User" - } - } -} - - ], - "responses": { - "default": { - "description" : "successful operation" -} - - - } - } - - } , - - "/user/{username}": { - - "get": { - "summary": "Get user by user name", - "description":"", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "getUserByName", - "parameters": [ - { - "name" : "username", - "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", - "required" : true, - "type" : "string" -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/User" - }, - "examples" : { - "application/json" : { - "id" : 1, - "username" : "johnp", - "firstName" : "John", - "lastName" : "Public", - "email" : "johnp@swagger.io", - "password" : "-secret-", - "phone" : "0123456789", - "userStatus" : 0 - } - } -} - , - "400": { - "description" : "Invalid username supplied" -} - , - "404": { - "description" : "User not found" -} - - - } - } , - - "put": { - "summary": "Updated user", - "description":"This can only be done by the logged in user.", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "updateUser", - "parameters": [ - { - "name" : "username", - "in" : "path", - "description" : "name that need to be deleted", - "required" : true, - "type" : "string" -}, - { - "in" : "body", - "name" : "body", - "description" : "Updated user object", - "required" : false, - "schema" : { - "$ref" : "#/definitions/User" - } -} - - ], - "responses": { - "400": { - "description" : "Invalid user supplied" -} - , - "404": { - "description" : "User not found" -} - - - } - } , - - "delete": { - "summary": "Delete user", - "description":"This can only be done by the logged in user.", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "deleteUser", - "parameters": [ - { - "name" : "username", - "in" : "path", - "description" : "The name that needs to be deleted", - "required" : true, - "type" : "string" -} - - ], - "responses": { - "400": { - "description" : "Invalid username supplied" -} - , - "404": { - "description" : "User not found" -} - - - } - } - - } , - - "/user": { - - "post": { - "summary": "Create user", - "description":"This can only be done by the logged in user.", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "createUser", - "parameters": [ - { - "in" : "body", - "name" : "body", - "description" : "Created user object", - "required" : false, - "schema" : { - "$ref" : "#/definitions/User" - } -} - - ], - "responses": { - "default": { - "description" : "successful operation" -} - - - } - } - - } , - - "/user/logout": { - - "get": { - "summary": "Logs out current logged in user session", - "description":"", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "logoutUser", - "responses": { - "default": { - "description" : "successful operation" -} - - - } - } - - } , - - "/user/login": { - - "get": { - "summary": "Logs user into the system", - "description":"", - "x-swagger-router-controller": "User", - "tags": ["User"], - "operationId": "loginUser", - "parameters": [ - { - "name" : "username", - "in" : "query", - "description" : "The user name for login", - "required" : false, - "type" : "string" -}, - { - "name" : "password", - "in" : "query", - "description" : "The password for login in clear text", - "required" : false, - "type" : "string" -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "type" : "string" - } -} - , - "400": { - "description" : "Invalid username/password supplied" -} - - - } - } - - } , - - - "/pet": { - - "put": { - "summary": "Update an existing pet", - "description":"", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "updatePet", - "parameters": [ - { - "in" : "body", - "name" : "body", - "description" : "Pet object that needs to be added to the store", - "required" : false, - "schema" : { - "$ref" : "#/definitions/Pet" - } -} - - ], - "responses": { - "400": { - "description" : "Invalid ID supplied" -} - , - "404": { - "description" : "Pet not found" -} - , - "405": { - "description" : "Validation exception" -} - - - } - } , - - "post": { - "summary": "Add a new pet to the store", - "description":"", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "addPet", - "parameters": [ - { - "in" : "body", - "name" : "body", - "description" : "Pet object that needs to be added to the store", - "required" : false, - "schema" : { - "$ref" : "#/definitions/Pet" - } -} - - ], - "responses": { - "405": { - "description" : "Invalid input" -} - - - } - } - - } , - - "/pet/{petId}/uploadImage": { - - "post": { - "summary": "uploads an image", - "description":"", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "uploadFile", - "parameters": [ - { - "name" : "petId", - "in" : "path", - "description" : "ID of pet to update", - "required" : true, - "type" : "integer", - "format" : "int64" -}, - { - "name" : "additionalMetadata", - "in" : "formData", - "description" : "Additional data to pass to server", - "required" : false, - "type" : "string" -}, - { - "name" : "file", - "in" : "formData", - "description" : "file to upload", - "required" : false, - "type" : "file" -} - - ], - "responses": { - "default": { - "description" : "successful operation" -} - - - } - } - - } , - - "/pet/findByStatus": { - - "get": { - "summary": "Finds Pets by status", - "description":"Multiple status values can be provided with comma seperated strings", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "findPetsByStatus", - "parameters": [ - { - "name" : "status", - "in" : "query", - "description" : "Status values that need to be considered for filter", - "required" : false, - "type" : "array", - "collectionFormat" : "multi", - "default" : "available" -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/Pet" - } - } -} - , - "400": { - "description" : "Invalid status value" -} - - - } - } - - } , - - "/pet/findByTags": { - - "get": { - "summary": "Finds Pets by tags", - "description":"Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "findPetsByTags", - "parameters": [ - { - "name" : "tags", - "in" : "query", - "description" : "Tags to filter by", - "required" : false, - "type" : "array", - "collectionFormat" : "multi" -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/Pet" - } - } -} - , - "400": { - "description" : "Invalid tag value" -} - - - } - } - - } , - - "/pet/{petId}": { - - "get": { - "summary": "Find pet by ID", - "description":"Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "getPetById", - "parameters": [ - { - "name" : "petId", - "in" : "path", - "description" : "ID of pet that needs to be fetched", - "required" : true, - "type" : "integer", - "format" : "int64" -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/Pet" - } -} - , - "400": { - "description" : "Invalid ID supplied" -} - , - "404": { - "description" : "Pet not found" -} - - - } - } , - - "post": { - "summary": "Updates a pet in the store with form data", - "description":"", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "updatePetWithForm", - "parameters": [ - { - "name" : "petId", - "in" : "path", - "description" : "ID of pet that needs to be updated", - "required" : true, - "type" : "string" -}, - { - "name" : "name", - "in" : "formData", - "description" : "Updated name of the pet", - "required" : false, - "type" : "string" -}, - { - "name" : "status", - "in" : "formData", - "description" : "Updated status of the pet", - "required" : false, - "type" : "string" -} - - ], - "responses": { - "405": { - "description" : "Invalid input" -} - - - } - } , - - "delete": { - "summary": "Deletes a pet", - "description":"", - "x-swagger-router-controller": "Pet", - "tags": ["Pet"], - "operationId": "deletePet", - "parameters": [ - { - "name" : "petId", - "in" : "path", - "description" : "Pet id to delete", - "required" : true, - "type" : "integer", - "format" : "int64" -}, - { - "name" : "api_key", - "in" : "header", - "description" : "", - "required" : false, - "type" : "string" -} - - ], - "responses": { - "400": { - "description" : "Invalid pet value" -} - - - } - } - - } , - - - "/store/order/{orderId}": { - - "get": { - "summary": "Find purchase order by ID", - "description":"For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", - "x-swagger-router-controller": "Store", - "tags": ["Store"], - "operationId": "getOrderById", - "parameters": [ - { - "name" : "orderId", - "in" : "path", - "description" : "ID of pet that needs to be fetched", - "required" : true, - "type" : "string" -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/Order" - } -} - , - "400": { - "description" : "Invalid ID supplied" -} - , - "404": { - "description" : "Order not found" -} - - - } - } , - - "delete": { - "summary": "Delete purchase order by ID", - "description":"For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", - "x-swagger-router-controller": "Store", - "tags": ["Store"], - "operationId": "deleteOrder", - "parameters": [ - { - "name" : "orderId", - "in" : "path", - "description" : "ID of the order that needs to be deleted", - "required" : true, - "type" : "string" -} - - ], - "responses": { - "400": { - "description" : "Invalid ID supplied" -} - , - "404": { - "description" : "Order not found" -} - - - } - } - - } , - - "/store/order": { - - "post": { - "summary": "Place an order for a pet", - "description":"", - "x-swagger-router-controller": "Store", - "tags": ["Store"], - "operationId": "placeOrder", - "parameters": [ - { - "in" : "body", - "name" : "body", - "description" : "order placed for purchasing the pet", - "required" : false, - "schema" : { - "$ref" : "#/definitions/Order" - } -} - - ], - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/Order" - } -} - , - "400": { - "description" : "Invalid Order" -} - - - } - } - - } , - - "/store/inventory": { - - "get": { - "summary": "Returns pet inventories by status", - "description":"Returns a map of status codes to quantities", - "x-swagger-router-controller": "Store", - "tags": ["Store"], - "operationId": "getInventory", - "responses": { - "200": { - "description" : "successful operation", - "schema" : { - "type" : "object", - "additionalProperties" : { - "type" : "integer", - "format" : "int32" - } - } -} - - - } - } - - } - - }, "definitions": { - "User": { - "properties" : { - "id" : { - "type" : "integer", - "format" : "int64" - }, - "username" : { - "type" : "string" - }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "email" : { - "type" : "string" - }, - "password" : { - "type" : "string" - }, - "phone" : { - "type" : "string" - }, - "userStatus" : { - "type" : "integer", - "format" : "int32", - "description" : "User Status" - } - }, - "xml" : { - "name" : "User" - } -},"Category": { - "properties" : { - "id" : { - "type" : "integer", - "format" : "int64" - }, - "name" : { - "type" : "string" - } - }, - "xml" : { - "name" : "Category" - } -},"Pet": { - "required" : [ "name", "photoUrls" ], - "properties" : { - "id" : { - "type" : "integer", - "format" : "int64" - }, - "category" : { - "$ref" : "#/definitions/Category" - }, - "name" : { - "type" : "string", - "example" : "doggie" - }, - "photoUrls" : { - "type" : "array", - "xml" : { - "name" : "photoUrl", - "wrapped" : true - }, - "items" : { - "type" : "string" - } - }, - "tags" : { - "type" : "array", - "xml" : { - "name" : "tag", - "wrapped" : true - }, - "items" : { - "$ref" : "#/definitions/Tag" - } - }, - "status" : { - "type" : "string", - "description" : "pet status in the store", - "enum" : [ "available", "pending", "sold" ] - } - }, - "xml" : { - "name" : "Pet" - } -},"Tag": { - "properties" : { - "id" : { - "type" : "integer", - "format" : "int64" - }, - "name" : { - "type" : "string" - } - }, - "xml" : { - "name" : "Tag" - } -},"Order": { - "properties" : { - "id" : { - "type" : "integer", - "format" : "int64" - }, - "petId" : { - "type" : "integer", - "format" : "int64" - }, - "quantity" : { - "type" : "integer", - "format" : "int32" - }, - "shipDate" : { - "type" : "string", - "format" : "date-time" - }, - "status" : { - "type" : "string", - "description" : "Order Status", - "enum" : [ "placed", "approved", "delivered" ] - }, - "complete" : { - "type" : "boolean" - } - }, - "xml" : { - "name" : "Order" - } -} - } -} diff --git a/samples/server/petstore/nodejs/api/swagger.yaml b/samples/server/petstore/nodejs/api/swagger.yaml new file mode 100644 index 00000000000..49a3405de09 --- /dev/null +++ b/samples/server/petstore/nodejs/api/swagger.yaml @@ -0,0 +1,667 @@ +--- +swagger: "2.0" +info: + description: "This is a sample server Petstore server. You can find out more about\ + \ Swagger at http://swagger.io or on irc.freenode.net,\ + \ #swagger. For this sample, you can use the api key \"special-key\" to test\ + \ the authorization filters" + version: "1.0.0" + title: "Swagger Petstore" + termsOfService: "http://swagger.io/terms/" + contact: + email: "apiteam@swagger.io" + license: + name: "Apache 2.0" + url: "http://www.apache.org/licenses/LICENSE-2.0.html" +host: "petstore.swagger.io" +basePath: "/v2" +schemes: +- "http" +paths: + /pet: + post: + tags: + - "pet" + summary: "Add a new pet to the store" + description: "" + operationId: "addPet" + consumes: + - "application/json" + - "application/xml" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "Pet object that needs to be added to the store" + required: false + schema: + $ref: "#/definitions/Pet" + responses: + 405: + description: "Invalid input" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + put: + tags: + - "pet" + summary: "Update an existing pet" + description: "" + operationId: "updatePet" + consumes: + - "application/json" + - "application/xml" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "Pet object that needs to be added to the store" + required: false + schema: + $ref: "#/definitions/Pet" + responses: + 400: + description: "Invalid ID supplied" + 404: + description: "Pet not found" + 405: + description: "Validation exception" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + /pet/findByStatus: + get: + tags: + - "pet" + summary: "Finds Pets by status" + description: "Multiple status values can be provided with comma seperated strings" + operationId: "findPetsByStatus" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "status" + in: "query" + description: "Status values that need to be considered for filter" + required: false + type: "array" + items: + type: "string" + collectionFormat: "multi" + default: "available" + responses: + 200: + description: "successful operation" + schema: + type: "array" + items: + $ref: "#/definitions/Pet" + 400: + description: "Invalid status value" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + /pet/findByTags: + get: + tags: + - "pet" + summary: "Finds Pets by tags" + description: "Muliple tags can be provided with comma seperated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: "findPetsByTags" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "tags" + in: "query" + description: "Tags to filter by" + required: false + type: "array" + items: + type: "string" + collectionFormat: "multi" + responses: + 200: + description: "successful operation" + schema: + type: "array" + items: + $ref: "#/definitions/Pet" + 400: + description: "Invalid tag value" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + /pet/{petId}: + get: + tags: + - "pet" + summary: "Find pet by ID" + description: "Returns a pet when ID < 10. ID > 10 or nonintegers will simulate\ + \ API error conditions" + operationId: "getPetById" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "petId" + in: "path" + description: "ID of pet that needs to be fetched" + required: true + type: "integer" + format: "int64" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/Pet" + 400: + description: "Invalid ID supplied" + 404: + description: "Pet not found" + security: + - api_key: [] + - petstore_auth: + - "write:pets" + - "read:pets" + post: + tags: + - "pet" + summary: "Updates a pet in the store with form data" + description: "" + operationId: "updatePetWithForm" + consumes: + - "application/x-www-form-urlencoded" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "petId" + in: "path" + description: "ID of pet that needs to be updated" + required: true + type: "string" + - name: "name" + in: "formData" + description: "Updated name of the pet" + required: false + type: "string" + - name: "status" + in: "formData" + description: "Updated status of the pet" + required: false + type: "string" + responses: + 405: + description: "Invalid input" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + delete: + tags: + - "pet" + summary: "Deletes a pet" + description: "" + operationId: "deletePet" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "api_key" + in: "header" + description: "" + required: false + type: "string" + - name: "petId" + in: "path" + description: "Pet id to delete" + required: true + type: "integer" + format: "int64" + responses: + 400: + description: "Invalid pet value" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + /pet/{petId}/uploadImage: + post: + tags: + - "pet" + summary: "uploads an image" + description: "" + operationId: "uploadFile" + consumes: + - "multipart/form-data" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "petId" + in: "path" + description: "ID of pet to update" + required: true + type: "integer" + format: "int64" + - name: "additionalMetadata" + in: "formData" + description: "Additional data to pass to server" + required: false + type: "string" + - name: "file" + in: "formData" + description: "file to upload" + required: false + type: "file" + responses: + default: + description: "successful operation" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + /store/inventory: + get: + tags: + - "store" + summary: "Returns pet inventories by status" + description: "Returns a map of status codes to quantities" + operationId: "getInventory" + produces: + - "application/json" + - "application/xml" + parameters: [] + responses: + 200: + description: "successful operation" + schema: + type: "object" + additionalProperties: + type: "integer" + format: "int32" + security: + - api_key: [] + /store/order: + post: + tags: + - "store" + summary: "Place an order for a pet" + description: "" + operationId: "placeOrder" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "order placed for purchasing the pet" + required: false + schema: + $ref: "#/definitions/Order" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/Order" + 400: + description: "Invalid Order" + /store/order/{orderId}: + get: + tags: + - "store" + summary: "Find purchase order by ID" + description: "For valid response try integer IDs with value <= 5 or > 10. Other\ + \ values will generated exceptions" + operationId: "getOrderById" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "orderId" + in: "path" + description: "ID of pet that needs to be fetched" + required: true + type: "string" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/Order" + 400: + description: "Invalid ID supplied" + 404: + description: "Order not found" + delete: + tags: + - "store" + summary: "Delete purchase order by ID" + description: "For valid response try integer IDs with value < 1000. Anything\ + \ above 1000 or nonintegers will generate API errors" + operationId: "deleteOrder" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "orderId" + in: "path" + description: "ID of the order that needs to be deleted" + required: true + type: "string" + responses: + 400: + description: "Invalid ID supplied" + 404: + description: "Order not found" + /user: + post: + tags: + - "user" + summary: "Create user" + description: "This can only be done by the logged in user." + operationId: "createUser" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "Created user object" + required: false + schema: + $ref: "#/definitions/User" + responses: + default: + description: "successful operation" + /user/createWithArray: + post: + tags: + - "user" + summary: "Creates list of users with given input array" + description: "" + operationId: "createUsersWithArrayInput" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "List of user object" + required: false + schema: + type: "array" + items: + $ref: "#/definitions/User" + responses: + default: + description: "successful operation" + /user/createWithList: + post: + tags: + - "user" + summary: "Creates list of users with given input array" + description: "" + operationId: "createUsersWithListInput" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "List of user object" + required: false + schema: + type: "array" + items: + $ref: "#/definitions/User" + responses: + default: + description: "successful operation" + /user/login: + get: + tags: + - "user" + summary: "Logs user into the system" + description: "" + operationId: "loginUser" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "query" + description: "The user name for login" + required: false + type: "string" + - name: "password" + in: "query" + description: "The password for login in clear text" + required: false + type: "string" + responses: + 200: + description: "successful operation" + schema: + type: "string" + 400: + description: "Invalid username/password supplied" + /user/logout: + get: + tags: + - "user" + summary: "Logs out current logged in user session" + description: "" + operationId: "logoutUser" + produces: + - "application/json" + - "application/xml" + parameters: [] + responses: + default: + description: "successful operation" + /user/{username}: + get: + tags: + - "user" + summary: "Get user by user name" + description: "" + operationId: "getUserByName" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "path" + description: "The name that needs to be fetched. Use user1 for testing. " + required: true + type: "string" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/User" + examples: + application/json: + id: 1 + username: "johnp" + firstName: "John" + lastName: "Public" + email: "johnp@swagger.io" + password: "-secret-" + phone: "0123456789" + userStatus: 0 + 400: + description: "Invalid username supplied" + 404: + description: "User not found" + put: + tags: + - "user" + summary: "Updated user" + description: "This can only be done by the logged in user." + operationId: "updateUser" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "path" + description: "name that need to be deleted" + required: true + type: "string" + - in: "body" + name: "body" + description: "Updated user object" + required: false + schema: + $ref: "#/definitions/User" + responses: + 400: + description: "Invalid user supplied" + 404: + description: "User not found" + delete: + tags: + - "user" + summary: "Delete user" + description: "This can only be done by the logged in user." + operationId: "deleteUser" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "path" + description: "The name that needs to be deleted" + required: true + type: "string" + responses: + 400: + description: "Invalid username supplied" + 404: + description: "User not found" +securityDefinitions: + api_key: + type: "apiKey" + name: "api_key" + in: "header" + petstore_auth: + type: "oauth2" + authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog" + flow: "implicit" + scopes: + write:pets: "modify pets in your account" + read:pets: "read your pets" +definitions: + User: + properties: + id: + type: "integer" + format: "int64" + username: + type: "string" + firstName: + type: "string" + lastName: + type: "string" + email: + type: "string" + password: + type: "string" + phone: + type: "string" + userStatus: + type: "integer" + format: "int32" + description: "User Status" + xml: + name: "User" + Category: + properties: + id: + type: "integer" + format: "int64" + name: + type: "string" + xml: + name: "Category" + Pet: + required: + - "name" + - "photoUrls" + properties: + id: + type: "integer" + format: "int64" + category: + $ref: "#/definitions/Category" + name: + type: "string" + example: "doggie" + photoUrls: + type: "array" + xml: + name: "photoUrl" + wrapped: true + items: + type: "string" + tags: + type: "array" + xml: + name: "tag" + wrapped: true + items: + $ref: "#/definitions/Tag" + status: + type: "string" + description: "pet status in the store" + enum: + - "available" + - "pending" + - "sold" + xml: + name: "Pet" + Tag: + properties: + id: + type: "integer" + format: "int64" + name: + type: "string" + xml: + name: "Tag" + Order: + properties: + id: + type: "integer" + format: "int64" + petId: + type: "integer" + format: "int64" + quantity: + type: "integer" + format: "int32" + shipDate: + type: "string" + format: "date-time" + status: + type: "string" + description: "Order Status" + enum: + - "placed" + - "approved" + - "delivered" + complete: + type: "boolean" + xml: + name: "Order" diff --git a/samples/server/petstore/nodejs/controllers/Pet.js b/samples/server/petstore/nodejs/controllers/Pet.js index a268c8fa700..d272cb8240f 100644 --- a/samples/server/petstore/nodejs/controllers/Pet.js +++ b/samples/server/petstore/nodejs/controllers/Pet.js @@ -7,118 +7,33 @@ var Pet = require('./PetService'); module.exports.updatePet = function updatePet (req, res, next) { - var body = req.swagger.params['body'].value; - - - var result = Pet.updatePet(body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.updatePet(req.swagger.params, res, next); }; module.exports.addPet = function addPet (req, res, next) { - var body = req.swagger.params['body'].value; - - - var result = Pet.addPet(body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.addPet(req.swagger.params, res, next); }; module.exports.findPetsByStatus = function findPetsByStatus (req, res, next) { - var status = req.swagger.params['status'].value; - - - var result = Pet.findPetsByStatus(status); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.findPetsByStatus(req.swagger.params, res, next); }; module.exports.findPetsByTags = function findPetsByTags (req, res, next) { - var tags = req.swagger.params['tags'].value; - - - var result = Pet.findPetsByTags(tags); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.findPetsByTags(req.swagger.params, res, next); }; module.exports.getPetById = function getPetById (req, res, next) { - var petId = req.swagger.params['petId'].value; - - - var result = Pet.getPetById(petId); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.getPetById(req.swagger.params, res, next); }; module.exports.updatePetWithForm = function updatePetWithForm (req, res, next) { - var petId = req.swagger.params['petId'].value; - var name = req.swagger.params['name'].value; - var status = req.swagger.params['status'].value; - - - var result = Pet.updatePetWithForm(petId, name, status); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.updatePetWithForm(req.swagger.params, res, next); }; module.exports.deletePet = function deletePet (req, res, next) { - var petId = req.swagger.params['petId'].value; - var apiKey = req.swagger.params['api_key'].value; - - - var result = Pet.deletePet(petId, apiKey); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.deletePet(req.swagger.params, res, next); }; module.exports.uploadFile = function uploadFile (req, res, next) { - var petId = req.swagger.params['petId'].value; - var additionalMetadata = req.swagger.params['additionalMetadata'].value; - var file = req.swagger.params['file'].value; - - - var result = Pet.uploadFile(petId, additionalMetadata, file); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Pet.uploadFile(req.swagger.params, res, next); }; diff --git a/samples/server/petstore/nodejs/controllers/PetService.js b/samples/server/petstore/nodejs/controllers/PetService.js index f238fa410ac..97a1d3ede62 100644 --- a/samples/server/petstore/nodejs/controllers/PetService.js +++ b/samples/server/petstore/nodejs/controllers/PetService.js @@ -1,22 +1,36 @@ 'use strict'; -exports.updatePet = function(body) { +exports.updatePet = function(args, res, next) { + /** + * parameters expected in the args: + * body (Pet) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.addPet = function(body) { +exports.addPet = function(args, res, next) { + /** + * parameters expected in the args: + * body (Pet) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.findPetsByStatus = function(status) { +exports.findPetsByStatus = function(args, res, next) { + /** + * parameters expected in the args: + * status (List) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = [ { "tags" : [ { @@ -35,13 +49,23 @@ exports.findPetsByStatus = function(status) { - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.findPetsByTags = function(tags) { +exports.findPetsByTags = function(args, res, next) { + /** + * parameters expected in the args: + * tags (List) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = [ { "tags" : [ { @@ -60,13 +84,23 @@ exports.findPetsByTags = function(tags) { - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.getPetById = function(petId) { +exports.getPetById = function(args, res, next) { + /** + * parameters expected in the args: + * petId (Long) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = { "tags" : [ { @@ -85,28 +119,54 @@ exports.getPetById = function(petId) { - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.updatePetWithForm = function(petId, name, status) { +exports.updatePetWithForm = function(args, res, next) { + /** + * parameters expected in the args: + * petId (String) + * name (String) + * status (String) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.deletePet = function(petId, apiKey) { +exports.deletePet = function(args, res, next) { + /** + * parameters expected in the args: + * petId (Long) + * apiKey (String) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.uploadFile = function(petId, additionalMetadata, file) { +exports.uploadFile = function(args, res, next) { + /** + * parameters expected in the args: + * petId (Long) + * additionalMetadata (String) + * file (file) + **/ - var examples = {}; +var examples = {}; + res.end(); } diff --git a/samples/server/petstore/nodejs/controllers/Store.js b/samples/server/petstore/nodejs/controllers/Store.js index 7059f9afa61..8a07dc76ed3 100644 --- a/samples/server/petstore/nodejs/controllers/Store.js +++ b/samples/server/petstore/nodejs/controllers/Store.js @@ -7,56 +7,17 @@ var Store = require('./StoreService'); module.exports.getInventory = function getInventory (req, res, next) { - - - var result = Store.getInventory(); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Store.getInventory(req.swagger.params, res, next); }; module.exports.placeOrder = function placeOrder (req, res, next) { - var body = req.swagger.params['body'].value; - - - var result = Store.placeOrder(body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Store.placeOrder(req.swagger.params, res, next); }; module.exports.getOrderById = function getOrderById (req, res, next) { - var orderId = req.swagger.params['orderId'].value; - - - var result = Store.getOrderById(orderId); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Store.getOrderById(req.swagger.params, res, next); }; module.exports.deleteOrder = function deleteOrder (req, res, next) { - var orderId = req.swagger.params['orderId'].value; - - - var result = Store.deleteOrder(orderId); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + Store.deleteOrder(req.swagger.params, res, next); }; diff --git a/samples/server/petstore/nodejs/controllers/StoreService.js b/samples/server/petstore/nodejs/controllers/StoreService.js index e00a6aee9b9..3bb37b6c01f 100644 --- a/samples/server/petstore/nodejs/controllers/StoreService.js +++ b/samples/server/petstore/nodejs/controllers/StoreService.js @@ -1,8 +1,11 @@ 'use strict'; -exports.getInventory = function() { +exports.getInventory = function(args, res, next) { + /** + * parameters expected in the args: + **/ - var examples = {}; +var examples = {}; examples['application/json'] = { "key" : 123 @@ -10,13 +13,23 @@ exports.getInventory = function() { - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.placeOrder = function(body) { +exports.placeOrder = function(args, res, next) { + /** + * parameters expected in the args: + * body (Order) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = { "id" : 123456789, @@ -24,18 +37,28 @@ exports.placeOrder = function(body) { "complete" : true, "status" : "aeiou", "quantity" : 123, - "shipDate" : "2015-10-20T06:12:23.907+0000" + "shipDate" : "2015-11-18T02:43:54.540+0000" }; - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.getOrderById = function(orderId) { +exports.getOrderById = function(args, res, next) { + /** + * parameters expected in the args: + * orderId (String) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = { "id" : 123456789, @@ -43,19 +66,30 @@ exports.getOrderById = function(orderId) { "complete" : true, "status" : "aeiou", "quantity" : 123, - "shipDate" : "2015-10-20T06:12:23.911+0000" + "shipDate" : "2015-11-18T02:43:54.544+0000" }; - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.deleteOrder = function(orderId) { +exports.deleteOrder = function(args, res, next) { + /** + * parameters expected in the args: + * orderId (String) + **/ - var examples = {}; +var examples = {}; + res.end(); } diff --git a/samples/server/petstore/nodejs/controllers/User.js b/samples/server/petstore/nodejs/controllers/User.js index d89f34c9c3f..d2ce361da52 100644 --- a/samples/server/petstore/nodejs/controllers/User.js +++ b/samples/server/petstore/nodejs/controllers/User.js @@ -7,114 +7,33 @@ var User = require('./UserService'); module.exports.createUser = function createUser (req, res, next) { - var body = req.swagger.params['body'].value; - - - var result = User.createUser(body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.createUser(req.swagger.params, res, next); }; module.exports.createUsersWithArrayInput = function createUsersWithArrayInput (req, res, next) { - var body = req.swagger.params['body'].value; - - - var result = User.createUsersWithArrayInput(body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.createUsersWithArrayInput(req.swagger.params, res, next); }; module.exports.createUsersWithListInput = function createUsersWithListInput (req, res, next) { - var body = req.swagger.params['body'].value; - - - var result = User.createUsersWithListInput(body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.createUsersWithListInput(req.swagger.params, res, next); }; module.exports.loginUser = function loginUser (req, res, next) { - var username = req.swagger.params['username'].value; - var password = req.swagger.params['password'].value; - - - var result = User.loginUser(username, password); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.loginUser(req.swagger.params, res, next); }; module.exports.logoutUser = function logoutUser (req, res, next) { - - - var result = User.logoutUser(); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.logoutUser(req.swagger.params, res, next); }; module.exports.getUserByName = function getUserByName (req, res, next) { - var username = req.swagger.params['username'].value; - - - var result = User.getUserByName(username); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.getUserByName(req.swagger.params, res, next); }; module.exports.updateUser = function updateUser (req, res, next) { - var username = req.swagger.params['username'].value; - var body = req.swagger.params['body'].value; - - - var result = User.updateUser(username, body); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.updateUser(req.swagger.params, res, next); }; module.exports.deleteUser = function deleteUser (req, res, next) { - var username = req.swagger.params['username'].value; - - - var result = User.deleteUser(username); - - if(typeof result !== 'undefined') { - res.setHeader('Content-Type', 'application/json'); - res.end(JSON.stringify(result || {}, null, 2)); - } - else - res.end(); + User.deleteUser(req.swagger.params, res, next); }; diff --git a/samples/server/petstore/nodejs/controllers/UserService.js b/samples/server/petstore/nodejs/controllers/UserService.js index 30aab42ada9..71f34f35bfb 100644 --- a/samples/server/petstore/nodejs/controllers/UserService.js +++ b/samples/server/petstore/nodejs/controllers/UserService.js @@ -1,48 +1,82 @@ 'use strict'; -exports.createUser = function(body) { +exports.createUser = function(args, res, next) { + /** + * parameters expected in the args: + * body (User) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.createUsersWithArrayInput = function(body) { +exports.createUsersWithArrayInput = function(args, res, next) { + /** + * parameters expected in the args: + * body (List) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.createUsersWithListInput = function(body) { +exports.createUsersWithListInput = function(args, res, next) { + /** + * parameters expected in the args: + * body (List) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.loginUser = function(username, password) { +exports.loginUser = function(args, res, next) { + /** + * parameters expected in the args: + * username (String) + * password (String) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = "aeiou"; - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.logoutUser = function() { +exports.logoutUser = function(args, res, next) { + /** + * parameters expected in the args: + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.getUserByName = function(username) { +exports.getUserByName = function(args, res, next) { + /** + * parameters expected in the args: + * username (String) + **/ - var examples = {}; +var examples = {}; examples['application/json'] = { "id" : 1, @@ -57,21 +91,38 @@ exports.getUserByName = function(username) { - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; + if(Object.keys(examples).length > 0) { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2)); + } + else { + res.end(); + } + } -exports.updateUser = function(username, body) { +exports.updateUser = function(args, res, next) { + /** + * parameters expected in the args: + * username (String) + * body (User) + **/ - var examples = {}; +var examples = {}; + res.end(); } -exports.deleteUser = function(username) { +exports.deleteUser = function(args, res, next) { + /** + * parameters expected in the args: + * username (String) + **/ - var examples = {}; +var examples = {}; + res.end(); } diff --git a/samples/server/petstore/nodejs/index.js b/samples/server/petstore/nodejs/index.js index c922cc7c1e7..aaa873a128a 100644 --- a/samples/server/petstore/nodejs/index.js +++ b/samples/server/petstore/nodejs/index.js @@ -3,7 +3,8 @@ var app = require('connect')(); var http = require('http'); var swaggerTools = require('swagger-tools'); - +var jsyaml = require('js-yaml'); +var fs = require('fs'); var serverPort = 8080; // swaggerRouter configuration @@ -14,7 +15,8 @@ var options = { }; // The Swagger document (require it, build it programmatically, fetch it from a URL, ...) -var swaggerDoc = require('./api/swagger.json'); +var spec = fs.readFileSync('./api/swagger.yaml', 'utf8'); +var swaggerDoc = jsyaml.safeLoad(spec); // Initialize the Swagger middleware swaggerTools.initializeMiddleware(swaggerDoc, function (middleware) { diff --git a/samples/server/petstore/nodejs/package.json b/samples/server/petstore/nodejs/package.json index 35390feefda..8befd2669d2 100644 --- a/samples/server/petstore/nodejs/package.json +++ b/samples/server/petstore/nodejs/package.json @@ -10,6 +10,7 @@ "private": true, "dependencies": { "connect": "^3.2.0", - "swagger-tools": "0.8.*" + "js-yaml": "^3.3.0", + "swagger-tools": "0.9.*" } } From 28c49469458beb785aa771a7881eaee550d7bd5a Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 17 Nov 2015 19:51:48 -0800 Subject: [PATCH 135/142] added initial files --- bin/flaskConnexion.sh | 31 ++ .../languages/FlaskConnexionCodegen.java | 274 ++++++++++++++++++ .../languages/NodeJSServerCodegen.java | 2 +- .../codegen/languages/SilexServerCodegen.java | 2 +- .../codegen/languages/StaticDocCodegen.java | 2 +- .../languages/StaticHtmlGenerator.java | 2 +- .../services/io.swagger.codegen.CodegenConfig | 1 + .../resources/flaskConnexion/README.mustache | 12 + .../resources/flaskConnexion/app.mustache | 9 + .../flaskConnexion/controller.mustache | 11 + .../resources/flaskConnexion/swagger.mustache | 1 + 11 files changed, 343 insertions(+), 4 deletions(-) create mode 100755 bin/flaskConnexion.sh create mode 100644 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java create mode 100644 modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache create mode 100644 modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache create mode 100644 modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache create mode 100644 modules/swagger-codegen/src/main/resources/flaskConnexion/swagger.mustache diff --git a/bin/flaskConnexion.sh b/bin/flaskConnexion.sh new file mode 100755 index 00000000000..63f55d3471e --- /dev/null +++ b/bin/flaskConnexion.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +SCRIPT="$0" + +while [ -h "$SCRIPT" ] ; do + ls=`ls -ld "$SCRIPT"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + SCRIPT="$link" + else + SCRIPT=`dirname "$SCRIPT"`/"$link" + fi +done + +if [ ! -d "${APP_DIR}" ]; then + APP_DIR=`dirname "$SCRIPT"`/.. + APP_DIR=`cd "${APP_DIR}"; pwd` +fi + +executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" + +if [ ! -f "$executable" ] +then + mvn clean package +fi + +# if you've executed sbt assembly previously it will use that instead. +export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" +ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l flaskConnexion -o samples/server/petstore/flaskConnexion -t modules/swagger-codegen/src/main/resources/flaskConnexion" + +java $JAVA_OPTS -Dservice -jar $executable $ags diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java new file mode 100644 index 00000000000..62972d5b3a3 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -0,0 +1,274 @@ +package io.swagger.codegen.languages; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import io.swagger.codegen.*; +import io.swagger.models.Operation; +import io.swagger.models.Path; +import io.swagger.models.Swagger; +import io.swagger.util.Yaml; + +import java.io.File; +import java.util.*; + +public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConfig { + protected String apiVersion = "1.0.0"; + protected int serverPort = 8080; + protected String projectName = "swagger-server"; + + public FlaskConnexionCodegen() { + super(); + + languageSpecificPrimitives.clear(); + languageSpecificPrimitives.add("int"); + languageSpecificPrimitives.add("float"); + languageSpecificPrimitives.add("list"); + languageSpecificPrimitives.add("bool"); + languageSpecificPrimitives.add("str"); + languageSpecificPrimitives.add("datetime"); + languageSpecificPrimitives.add("date"); + + typeMapping.clear(); + typeMapping.put("integer", "int"); + typeMapping.put("float", "float"); + typeMapping.put("number", "float"); + typeMapping.put("long", "int"); + typeMapping.put("double", "float"); + typeMapping.put("array", "list"); + typeMapping.put("map", "dict"); + typeMapping.put("boolean", "bool"); + typeMapping.put("string", "str"); + typeMapping.put("date", "date"); + typeMapping.put("DateTime", "datetime"); + typeMapping.put("object", "object"); + typeMapping.put("file", "file"); + + // set the output folder here + outputFolder = "generated-code/connexion"; + + /** + * Models. You can write model files using the modelTemplateFiles map. + * if you want to create one template for file, you can do so here. + * for multiple files for model, just put another entry in the `modelTemplateFiles` with + * a different extension + */ + modelTemplateFiles.clear(); + + /** + * Api classes. You can write classes for each Api file with the apiTemplateFiles map. + * as with models, add multiple entries with different extensions for multiple files per + * class + */ + apiTemplateFiles.put( + "controller.mustache", // the template to use + ".py"); // the extension for each file to write + + /** + * Template Location. This is the location which templates will be read from. The generator + * will use the resource stream to attempt to read the templates. + */ + embeddedTemplateDir = templateDir = "flaskConnexion"; + + // from https://docs.python.org/release/2.5.4/ref/keywords.html + reservedWords = new HashSet( + Arrays.asList( + "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with", + "assert", "else", "if", "pass", "yield", "break", "except", "import", + "print", "class", "exec", "in", "raise", "continue", "finally", "is", + "return", "def", "for", "lambda", "try")); + + /** + * Additional Properties. These values can be passed to the templates and + * are available in models, apis, and supporting files + */ + additionalProperties.put("apiVersion", apiVersion); + additionalProperties.put("serverPort", serverPort); + + /** + * Supporting Files. You can write single files for the generator with the + * entire object tree available. If the input file has a suffix of `.mustache + * it will be processed by the template engine. Otherwise, it will be copied + */ + + supportingFiles.add(new SupportingFile("swagger.mustache", + "swagger", + "swagger.yaml") + ); + supportingFiles.add(new SupportingFile("app.mustache", + "", + "app.py") + ); + supportingFiles.add(new SupportingFile("README.mustache", + "", + "README.md") + ); + supportingFiles.add(new SupportingFile("controller.mustache", + "controllers", + "default_controller.py") + ); + } + + public String apiPackage() { + return "controllers"; + } + + /** + * Configures the type of generator. + * + * @return the CodegenType for this generator + * @see io.swagger.codegen.CodegenType + */ + public CodegenType getTag() { + return CodegenType.SERVER; + } + + /** + * Configures a friendly name for the generator. This will be used by the generator + * to select the library with the -l flag. + * + * @return the friendly name for the generator + */ + public String getName() { + return "flaskConnexion"; + } + + /** + * Returns human-friendly help for the generator. Provide the consumer with help + * tips, parameters here + * + * @return A string value for the help message + */ + public String getHelp() { + return "Generates a python server library using the connexion project. By default, " + + "it will also generate service classes--which you can disable with the `-Dnoservice` environment variable."; + } + + @Override + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultController"; + } + return initialCaps(name); + } + + @Override + public String toApiFilename(String name) { + return toApiName(name); + } + + /** + * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping + * those terms here. This logic is only called if a variable matches the reseved words + * + * @return the escaped term + */ + @Override + public String escapeReservedWord(String name) { + return "_" + name; // add an underscore to the name + } + + /** + * Location to write api files. You can use the apiPackage() as defined when the class is + * instantiated + */ + @Override + public String apiFileFolder() { + return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar); + } + + @Override + public void preprocessSwagger(Swagger swagger) { + if(swagger != null && swagger.getPaths() != null) { + for(String pathname : swagger.getPaths().keySet()) { + Path path = swagger.getPath(pathname); + if(path.getOperations() != null) { + for(Operation operation : path.getOperations()) { + String operationId = operation.getOperationId(); + if(operationId != null && operationId.indexOf(".") == -1) { + operation.setVendorExtension("x-operationId", underscore(sanitizeName(operationId))); + operationId = "controllers.default_controller." + underscore(sanitizeName(operationId)); + operation.setOperationId(operationId); + } + if(operation.getTags() != null) { + List> tags = new ArrayList>(); + for(String tag : operation.getTags()) { + Map value = new HashMap(); + value.put("tag", tag); + value.put("hasMore", "true"); + tags.add(value); + } + if(tags.size() > 0) { + tags.get(tags.size() - 1).remove("hasMore"); + } + if(operation.getTags().size() > 0) { + String tag = operation.getTags().get(0); + operation.setTags(Arrays.asList(tag)); + } + operation.setVendorExtension("x-tags", tags); + } + else { + String tag = "default_controller"; + operation.setTags(Arrays.asList(tag)); + } + } + } + } + } + } + + @SuppressWarnings("unchecked") + private List> getOperations(Map objs) { + List> result = new ArrayList>(); + Map apiInfo = (Map) objs.get("apiInfo"); + List> apis = (List>) apiInfo.get("apis"); + for (Map api : apis) { + result.add((Map) api.get("operations")); + } + return result; + } + + private List> sortOperationsByPath(List ops) { + Multimap opsByPath = ArrayListMultimap.create(); + + for (CodegenOperation op : ops) { + opsByPath.put(op.path, op); + } + + List> opsByPathList = new ArrayList>(); + for (Map.Entry> entry : opsByPath.asMap().entrySet()) { + Map opsByPathEntry = new HashMap(); + opsByPathList.add(opsByPathEntry); + opsByPathEntry.put("path", entry.getKey()); + opsByPathEntry.put("operation", entry.getValue()); + List operationsForThisPath = Lists.newArrayList(entry.getValue()); + operationsForThisPath.get(operationsForThisPath.size() - 1).hasMore = null; + if (opsByPathList.size() < opsByPath.asMap().size()) { + opsByPathEntry.put("hasMore", "true"); + } + } + + return opsByPathList; + } + + @Override + public Map postProcessSupportingFileData(Map objs) { + Swagger swagger = (Swagger)objs.get("swagger"); + if(swagger != null) { + try { + objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } + for (Map operations : getOperations(objs)) { + @SuppressWarnings("unchecked") + List ops = (List) operations.get("operation"); + + List> opsByPathList = sortOperationsByPath(ops); + operations.put("operationsByPath", opsByPathList); + } + return super.postProcessSupportingFileData(objs); + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index 4dee5f6f2df..163af1ed492 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -78,7 +78,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig "api", "swagger.yaml") ); - supportingFiles.add(new SupportingFile("index.mustache", + supportingFiles.add(new SupportingFile("app.mustache", "", "index.js") ); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java index 2e35f412bbf..c56242fdf83 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java @@ -84,7 +84,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig supportingFiles.add(new SupportingFile("README.mustache", packagePath.replace('/', File.separatorChar), "README.md")); supportingFiles.add(new SupportingFile("composer.json", packagePath.replace('/', File.separatorChar), "composer.json")); - supportingFiles.add(new SupportingFile("index.mustache", packagePath.replace('/', File.separatorChar), "index.php")); + supportingFiles.add(new SupportingFile("app.mustache", packagePath.replace('/', File.separatorChar), "index.php")); supportingFiles.add(new SupportingFile(".htaccess", packagePath.replace('/', File.separatorChar), ".htaccess")); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java index b27ba23a4cd..da683916ea4 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java @@ -43,7 +43,7 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig { outputFolder + "/assets/js", "jquery-1.8.3.min.js")); supportingFiles.add(new SupportingFile("assets/js/main.js", outputFolder + "/assets/js", "main.js")); - supportingFiles.add(new SupportingFile("index.mustache", + supportingFiles.add(new SupportingFile("app.mustache", outputFolder, "index.html")); instantiationTypes.put("array", "ArrayList"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java index a86c2244995..2382113c90f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java @@ -43,7 +43,7 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId); additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); - supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); + supportingFiles.add(new SupportingFile("app.mustache", "", "index.html")); reservedWords = new HashSet(); languageSpecificPrimitives = new HashSet(); diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig index 4cf785abbd8..11283011a89 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -3,6 +3,7 @@ io.swagger.codegen.languages.AsyncScalaClientCodegen io.swagger.codegen.languages.CSharpClientCodegen io.swagger.codegen.languages.DartClientCodegen io.swagger.codegen.languages.FlashClientCodegen +io.swagger.codegen.languages.FlaskConnexionCodegen io.swagger.codegen.languages.JavaClientCodegen io.swagger.codegen.languages.JaxRSServerCodegen io.swagger.codegen.languages.JavaInflectorServerCodegen diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache new file mode 100644 index 00000000000..5fdb984a9dc --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +import connexion + +# TODO: operations go here +def post_greeting(name: str) -> str: +return 'Hello {name}'.format(name=name) + +if __name__ == '__main__': + app = connexion.App(__name__, 9090, specification_dir='examples/helloworld/swagger/') + app.add_api('helloworld-api.yaml', arguments={'title': 'Hello World Example'}) + app.run() diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache new file mode 100644 index 00000000000..14af64be6f9 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache @@ -0,0 +1,9 @@ +#!/usr/bin/env python3 + +import connexion + +if __name__ == '__main__': + app = connexion.App(__name__, {{serverPort}}, + specification_dir='./swagger/') + app.add_api('swagger.yaml', arguments={'title': '{{appDescription}}'}) + app.run() diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache new file mode 100644 index 00000000000..a4bb5b0c033 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache @@ -0,0 +1,11 @@ +{{#apiInfo}} +{{#apis}} +{{#operations}} +{{#operation}} + +def {{vendorExtensions.x-operationId}}({{#allParams}}{{paramName}}: ({{dataType}}){{/allParams}}) -> str: + return 'Hello {name}'.format(name=name) +{{/operation}} +{{/operations}} +{{/apis}} +{{/apiInfo}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/swagger.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/swagger.mustache new file mode 100644 index 00000000000..51560926bba --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/swagger.mustache @@ -0,0 +1 @@ +{{{swagger-yaml}}} \ No newline at end of file From d71d5ac1198ee3ce45550a94e95a6a86bb9313fc Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 17 Nov 2015 20:14:53 -0800 Subject: [PATCH 136/142] added files --- bin/flaskConnexion.sh | 2 +- .../io/swagger/codegen/SupportingFile.java | 10 + .../languages/FlaskConnexionCodegen.java | 26 +- .../languages/NodeJSServerCodegen.java | 2 +- .../codegen/languages/SilexServerCodegen.java | 2 +- .../codegen/languages/StaticDocCodegen.java | 2 +- .../languages/StaticHtmlGenerator.java | 2 +- .../resources/flaskConnexion/README.mustache | 33 +- .../flaskConnexion/controller.mustache | 4 +- .../server/petstore/flaskConnexion/README.md | 27 + samples/server/petstore/flaskConnexion/app.py | 9 + .../flaskConnexion/controllers/Pet.py | 0 .../flaskConnexion/controllers/Store.py | 0 .../flaskConnexion/controllers/User.py | 0 .../controllers/default_controller.py | 60 ++ .../flaskConnexion/swagger/swagger.yaml | 727 ++++++++++++++++++ 16 files changed, 872 insertions(+), 34 deletions(-) create mode 100644 samples/server/petstore/flaskConnexion/README.md create mode 100644 samples/server/petstore/flaskConnexion/app.py create mode 100644 samples/server/petstore/flaskConnexion/controllers/Pet.py create mode 100644 samples/server/petstore/flaskConnexion/controllers/Store.py create mode 100644 samples/server/petstore/flaskConnexion/controllers/User.py create mode 100644 samples/server/petstore/flaskConnexion/controllers/default_controller.py create mode 100644 samples/server/petstore/flaskConnexion/swagger/swagger.yaml diff --git a/bin/flaskConnexion.sh b/bin/flaskConnexion.sh index 63f55d3471e..f300d3124b1 100755 --- a/bin/flaskConnexion.sh +++ b/bin/flaskConnexion.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l flaskConnexion -o samples/server/petstore/flaskConnexion -t modules/swagger-codegen/src/main/resources/flaskConnexion" +ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l flaskConnexion -o samples/server/petstore/flaskConnexion " java $JAVA_OPTS -Dservice -jar $executable $ags diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java index 6be69b85d54..53c6ca5ab9b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java @@ -10,4 +10,14 @@ public class SupportingFile { this.folder = folder; this.destinationFilename = destinationFilename; } + + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("SupportingFile:").append("\n"); + builder.append("\ttemplateFile: ").append(templateFile).append("\n"); + builder.append("\tfolder: ").append(folder).append("\n"); + builder.append("\tdestinationFilename: ").append(destinationFilename).append("\n"); + + return builder.toString(); + } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index 62972d5b3a3..e2a0de1599d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -48,22 +48,9 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf // set the output folder here outputFolder = "generated-code/connexion"; - /** - * Models. You can write model files using the modelTemplateFiles map. - * if you want to create one template for file, you can do so here. - * for multiple files for model, just put another entry in the `modelTemplateFiles` with - * a different extension - */ modelTemplateFiles.clear(); - /** - * Api classes. You can write classes for each Api file with the apiTemplateFiles map. - * as with models, add multiple entries with different extensions for multiple files per - * class - */ - apiTemplateFiles.put( - "controller.mustache", // the template to use - ".py"); // the extension for each file to write + apiTemplateFiles.clear(); /** * Template Location. This is the location which templates will be read from. The generator @@ -104,10 +91,13 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf "", "README.md") ); - supportingFiles.add(new SupportingFile("controller.mustache", - "controllers", - "default_controller.py") - ); + + if(!new java.io.File("controllers/default_controller.py").exists()) { + supportingFiles.add(new SupportingFile("controller.mustache", + "controllers", + "default_controller.py") + ); + } } public String apiPackage() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index 163af1ed492..4dee5f6f2df 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -78,7 +78,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig "api", "swagger.yaml") ); - supportingFiles.add(new SupportingFile("app.mustache", + supportingFiles.add(new SupportingFile("index.mustache", "", "index.js") ); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java index c56242fdf83..2e35f412bbf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java @@ -84,7 +84,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig supportingFiles.add(new SupportingFile("README.mustache", packagePath.replace('/', File.separatorChar), "README.md")); supportingFiles.add(new SupportingFile("composer.json", packagePath.replace('/', File.separatorChar), "composer.json")); - supportingFiles.add(new SupportingFile("app.mustache", packagePath.replace('/', File.separatorChar), "index.php")); + supportingFiles.add(new SupportingFile("index.mustache", packagePath.replace('/', File.separatorChar), "index.php")); supportingFiles.add(new SupportingFile(".htaccess", packagePath.replace('/', File.separatorChar), ".htaccess")); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java index da683916ea4..b27ba23a4cd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java @@ -43,7 +43,7 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig { outputFolder + "/assets/js", "jquery-1.8.3.min.js")); supportingFiles.add(new SupportingFile("assets/js/main.js", outputFolder + "/assets/js", "main.js")); - supportingFiles.add(new SupportingFile("app.mustache", + supportingFiles.add(new SupportingFile("index.mustache", outputFolder, "index.html")); instantiationTypes.put("array", "ArrayList"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java index 2382113c90f..a86c2244995 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java @@ -43,7 +43,7 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId); additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); - supportingFiles.add(new SupportingFile("app.mustache", "", "index.html")); + supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); reservedWords = new HashSet(); languageSpecificPrimitives = new HashSet(); diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache index 5fdb984a9dc..effe82bb7dd 100644 --- a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache @@ -1,12 +1,27 @@ -#!/usr/bin/env python3 +# Swagger generated server -import connexion +## Overview +This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the +[swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub. This +is an example of building a swagger-enabled JAX-RS server. -# TODO: operations go here -def post_greeting(name: str) -> str: -return 'Hello {name}'.format(name=name) +This example uses the [connexion](https://github.com/zalando/connexion) library on top of Flask. + +To run the server, please execute the following: + +``` +python3 app.py +``` + +and open your browser to here: + +``` +http://localhost:{{serverPort}}/ui +``` + +Your swagger definition lives here: + +``` +http://localhost:{{serverPort}}{{basePathWithoutHost}}/swagger.json +``` -if __name__ == '__main__': - app = connexion.App(__name__, 9090, specification_dir='examples/helloworld/swagger/') - app.add_api('helloworld-api.yaml', arguments={'title': 'Hello World Example'}) - app.run() diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache index a4bb5b0c033..cb8544aa1b4 100644 --- a/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache @@ -3,8 +3,8 @@ {{#operations}} {{#operation}} -def {{vendorExtensions.x-operationId}}({{#allParams}}{{paramName}}: ({{dataType}}){{/allParams}}) -> str: - return 'Hello {name}'.format(name=name) +def {{vendorExtensions.x-operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> str: + return 'do some magic!' {{/operation}} {{/operations}} {{/apis}} diff --git a/samples/server/petstore/flaskConnexion/README.md b/samples/server/petstore/flaskConnexion/README.md new file mode 100644 index 00000000000..d85f471ba40 --- /dev/null +++ b/samples/server/petstore/flaskConnexion/README.md @@ -0,0 +1,27 @@ +# Swagger generated server + +## Overview +This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the +[swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub. This +is an example of building a swagger-enabled JAX-RS server. + +This example uses the [connexion](https://github.com/zalando/connexion) library on top of Flask. + +To run the server, please execute the following: + +``` +python3 app.py +``` + +and open your browser to here: + +``` +http://localhost:8080/ui +``` + +Your swagger definition lives here: + +``` +http://localhost:8080/swagger.json +``` + diff --git a/samples/server/petstore/flaskConnexion/app.py b/samples/server/petstore/flaskConnexion/app.py new file mode 100644 index 00000000000..ae021b58df9 --- /dev/null +++ b/samples/server/petstore/flaskConnexion/app.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python3 + +import connexion + +if __name__ == '__main__': + app = connexion.App(__name__, 8080, + specification_dir='./swagger/') + app.add_api('swagger.yaml', arguments={'title': 'This is a sample server Petstore server. You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger. For this sample, you can use the api key \"special-key\" to test the authorization filters'}) + app.run() diff --git a/samples/server/petstore/flaskConnexion/controllers/Pet.py b/samples/server/petstore/flaskConnexion/controllers/Pet.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/samples/server/petstore/flaskConnexion/controllers/Store.py b/samples/server/petstore/flaskConnexion/controllers/Store.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/samples/server/petstore/flaskConnexion/controllers/User.py b/samples/server/petstore/flaskConnexion/controllers/User.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/samples/server/petstore/flaskConnexion/controllers/default_controller.py b/samples/server/petstore/flaskConnexion/controllers/default_controller.py new file mode 100644 index 00000000000..8d771afed91 --- /dev/null +++ b/samples/server/petstore/flaskConnexion/controllers/default_controller.py @@ -0,0 +1,60 @@ + +def create_user(body) -> str: + return 'do some magic!' + +def create_users_with_array_input(body) -> str: + return 'do some magic!' + +def create_users_with_list_input(body) -> str: + return 'do some magic!' + +def login_user(username, password) -> str: + return 'do some magic!' + +def logout_user() -> str: + return 'do some magic!' + +def get_user_by_name(username) -> str: + return 'do some magic!' + +def update_user(username, body) -> str: + return 'do some magic!' + +def delete_user(username) -> str: + return 'do some magic!' + +def update_pet(body) -> str: + return 'do some magic!' + +def add_pet(body) -> str: + return 'do some magic!' + +def find_pets_by_status(status) -> str: + return 'do some magic!' + +def find_pets_by_tags(tags) -> str: + return 'do some magic!' + +def get_pet_by_id(petId) -> str: + return 'do some magic!' + +def update_pet_with_form(petId, name, status) -> str: + return 'do some magic!' + +def delete_pet(petId, apiKey) -> str: + return 'do some magic!' + +def upload_file(petId, additionalMetadata, file) -> str: + return 'do some magic!' + +def get_inventory() -> str: + return 'do some magic!' + +def place_order(body) -> str: + return 'do some magic!' + +def get_order_by_id(orderId) -> str: + return 'do some magic!' + +def delete_order(orderId) -> str: + return 'do some magic!' diff --git a/samples/server/petstore/flaskConnexion/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion/swagger/swagger.yaml new file mode 100644 index 00000000000..047d1652a87 --- /dev/null +++ b/samples/server/petstore/flaskConnexion/swagger/swagger.yaml @@ -0,0 +1,727 @@ +--- +swagger: "2.0" +info: + description: "This is a sample server Petstore server. You can find out more about\ + \ Swagger at http://swagger.io or on irc.freenode.net,\ + \ #swagger. For this sample, you can use the api key \"special-key\" to test\ + \ the authorization filters" + version: "1.0.0" + title: "Swagger Petstore" + termsOfService: "http://swagger.io/terms/" + contact: + email: "apiteam@swagger.io" + license: + name: "Apache 2.0" + url: "http://www.apache.org/licenses/LICENSE-2.0.html" +host: "petstore.swagger.io" +basePath: "/v2" +schemes: +- "http" +paths: + /pet: + post: + tags: + - "pet" + summary: "Add a new pet to the store" + description: "" + operationId: "controllers.default_controller.add_pet" + consumes: + - "application/json" + - "application/xml" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "Pet object that needs to be added to the store" + required: false + schema: + $ref: "#/definitions/Pet" + responses: + 405: + description: "Invalid input" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "add_pet" + x-tags: + - tag: "pet" + put: + tags: + - "pet" + summary: "Update an existing pet" + description: "" + operationId: "controllers.default_controller.update_pet" + consumes: + - "application/json" + - "application/xml" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "Pet object that needs to be added to the store" + required: false + schema: + $ref: "#/definitions/Pet" + responses: + 400: + description: "Invalid ID supplied" + 404: + description: "Pet not found" + 405: + description: "Validation exception" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "update_pet" + x-tags: + - tag: "pet" + /pet/findByStatus: + get: + tags: + - "pet" + summary: "Finds Pets by status" + description: "Multiple status values can be provided with comma seperated strings" + operationId: "controllers.default_controller.find_pets_by_status" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "status" + in: "query" + description: "Status values that need to be considered for filter" + required: false + type: "array" + items: + type: "string" + collectionFormat: "multi" + default: "available" + responses: + 200: + description: "successful operation" + schema: + type: "array" + items: + $ref: "#/definitions/Pet" + 400: + description: "Invalid status value" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "find_pets_by_status" + x-tags: + - tag: "pet" + /pet/findByTags: + get: + tags: + - "pet" + summary: "Finds Pets by tags" + description: "Muliple tags can be provided with comma seperated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: "controllers.default_controller.find_pets_by_tags" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "tags" + in: "query" + description: "Tags to filter by" + required: false + type: "array" + items: + type: "string" + collectionFormat: "multi" + responses: + 200: + description: "successful operation" + schema: + type: "array" + items: + $ref: "#/definitions/Pet" + 400: + description: "Invalid tag value" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "find_pets_by_tags" + x-tags: + - tag: "pet" + /pet/{petId}: + get: + tags: + - "pet" + summary: "Find pet by ID" + description: "Returns a pet when ID < 10. ID > 10 or nonintegers will simulate\ + \ API error conditions" + operationId: "controllers.default_controller.get_pet_by_id" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "petId" + in: "path" + description: "ID of pet that needs to be fetched" + required: true + type: "integer" + format: "int64" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/Pet" + 400: + description: "Invalid ID supplied" + 404: + description: "Pet not found" + security: + - api_key: [] + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "get_pet_by_id" + x-tags: + - tag: "pet" + post: + tags: + - "pet" + summary: "Updates a pet in the store with form data" + description: "" + operationId: "controllers.default_controller.update_pet_with_form" + consumes: + - "application/x-www-form-urlencoded" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "petId" + in: "path" + description: "ID of pet that needs to be updated" + required: true + type: "string" + - name: "name" + in: "formData" + description: "Updated name of the pet" + required: false + type: "string" + - name: "status" + in: "formData" + description: "Updated status of the pet" + required: false + type: "string" + responses: + 405: + description: "Invalid input" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "update_pet_with_form" + x-tags: + - tag: "pet" + delete: + tags: + - "pet" + summary: "Deletes a pet" + description: "" + operationId: "controllers.default_controller.delete_pet" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "api_key" + in: "header" + description: "" + required: false + type: "string" + - name: "petId" + in: "path" + description: "Pet id to delete" + required: true + type: "integer" + format: "int64" + responses: + 400: + description: "Invalid pet value" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "delete_pet" + x-tags: + - tag: "pet" + /pet/{petId}/uploadImage: + post: + tags: + - "pet" + summary: "uploads an image" + description: "" + operationId: "controllers.default_controller.upload_file" + consumes: + - "multipart/form-data" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "petId" + in: "path" + description: "ID of pet to update" + required: true + type: "integer" + format: "int64" + - name: "additionalMetadata" + in: "formData" + description: "Additional data to pass to server" + required: false + type: "string" + - name: "file" + in: "formData" + description: "file to upload" + required: false + type: "file" + responses: + default: + description: "successful operation" + security: + - petstore_auth: + - "write:pets" + - "read:pets" + x-operationId: "upload_file" + x-tags: + - tag: "pet" + /store/inventory: + get: + tags: + - "store" + summary: "Returns pet inventories by status" + description: "Returns a map of status codes to quantities" + operationId: "controllers.default_controller.get_inventory" + produces: + - "application/json" + - "application/xml" + parameters: [] + responses: + 200: + description: "successful operation" + schema: + type: "object" + additionalProperties: + type: "integer" + format: "int32" + security: + - api_key: [] + x-operationId: "get_inventory" + x-tags: + - tag: "store" + /store/order: + post: + tags: + - "store" + summary: "Place an order for a pet" + description: "" + operationId: "controllers.default_controller.place_order" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "order placed for purchasing the pet" + required: false + schema: + $ref: "#/definitions/Order" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/Order" + 400: + description: "Invalid Order" + x-operationId: "place_order" + x-tags: + - tag: "store" + /store/order/{orderId}: + get: + tags: + - "store" + summary: "Find purchase order by ID" + description: "For valid response try integer IDs with value <= 5 or > 10. Other\ + \ values will generated exceptions" + operationId: "controllers.default_controller.get_order_by_id" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "orderId" + in: "path" + description: "ID of pet that needs to be fetched" + required: true + type: "string" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/Order" + 400: + description: "Invalid ID supplied" + 404: + description: "Order not found" + x-operationId: "get_order_by_id" + x-tags: + - tag: "store" + delete: + tags: + - "store" + summary: "Delete purchase order by ID" + description: "For valid response try integer IDs with value < 1000. Anything\ + \ above 1000 or nonintegers will generate API errors" + operationId: "controllers.default_controller.delete_order" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "orderId" + in: "path" + description: "ID of the order that needs to be deleted" + required: true + type: "string" + responses: + 400: + description: "Invalid ID supplied" + 404: + description: "Order not found" + x-operationId: "delete_order" + x-tags: + - tag: "store" + /user: + post: + tags: + - "user" + summary: "Create user" + description: "This can only be done by the logged in user." + operationId: "controllers.default_controller.create_user" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "Created user object" + required: false + schema: + $ref: "#/definitions/User" + responses: + default: + description: "successful operation" + x-operationId: "create_user" + x-tags: + - tag: "user" + /user/createWithArray: + post: + tags: + - "user" + summary: "Creates list of users with given input array" + description: "" + operationId: "controllers.default_controller.create_users_with_array_input" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "List of user object" + required: false + schema: + type: "array" + items: + $ref: "#/definitions/User" + responses: + default: + description: "successful operation" + x-operationId: "create_users_with_array_input" + x-tags: + - tag: "user" + /user/createWithList: + post: + tags: + - "user" + summary: "Creates list of users with given input array" + description: "" + operationId: "controllers.default_controller.create_users_with_list_input" + produces: + - "application/json" + - "application/xml" + parameters: + - in: "body" + name: "body" + description: "List of user object" + required: false + schema: + type: "array" + items: + $ref: "#/definitions/User" + responses: + default: + description: "successful operation" + x-operationId: "create_users_with_list_input" + x-tags: + - tag: "user" + /user/login: + get: + tags: + - "user" + summary: "Logs user into the system" + description: "" + operationId: "controllers.default_controller.login_user" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "query" + description: "The user name for login" + required: false + type: "string" + - name: "password" + in: "query" + description: "The password for login in clear text" + required: false + type: "string" + responses: + 200: + description: "successful operation" + schema: + type: "string" + 400: + description: "Invalid username/password supplied" + x-operationId: "login_user" + x-tags: + - tag: "user" + /user/logout: + get: + tags: + - "user" + summary: "Logs out current logged in user session" + description: "" + operationId: "controllers.default_controller.logout_user" + produces: + - "application/json" + - "application/xml" + parameters: [] + responses: + default: + description: "successful operation" + x-operationId: "logout_user" + x-tags: + - tag: "user" + /user/{username}: + get: + tags: + - "user" + summary: "Get user by user name" + description: "" + operationId: "controllers.default_controller.get_user_by_name" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "path" + description: "The name that needs to be fetched. Use user1 for testing. " + required: true + type: "string" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/User" + examples: + application/json: + id: 1 + username: "johnp" + firstName: "John" + lastName: "Public" + email: "johnp@swagger.io" + password: "-secret-" + phone: "0123456789" + userStatus: 0 + 400: + description: "Invalid username supplied" + 404: + description: "User not found" + x-operationId: "get_user_by_name" + x-tags: + - tag: "user" + put: + tags: + - "user" + summary: "Updated user" + description: "This can only be done by the logged in user." + operationId: "controllers.default_controller.update_user" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "path" + description: "name that need to be deleted" + required: true + type: "string" + - in: "body" + name: "body" + description: "Updated user object" + required: false + schema: + $ref: "#/definitions/User" + responses: + 400: + description: "Invalid user supplied" + 404: + description: "User not found" + x-operationId: "update_user" + x-tags: + - tag: "user" + delete: + tags: + - "user" + summary: "Delete user" + description: "This can only be done by the logged in user." + operationId: "controllers.default_controller.delete_user" + produces: + - "application/json" + - "application/xml" + parameters: + - name: "username" + in: "path" + description: "The name that needs to be deleted" + required: true + type: "string" + responses: + 400: + description: "Invalid username supplied" + 404: + description: "User not found" + x-operationId: "delete_user" + x-tags: + - tag: "user" +securityDefinitions: + api_key: + type: "apiKey" + name: "api_key" + in: "header" + petstore_auth: + type: "oauth2" + authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog" + flow: "implicit" + scopes: + write:pets: "modify pets in your account" + read:pets: "read your pets" +definitions: + User: + properties: + id: + type: "integer" + format: "int64" + username: + type: "string" + firstName: + type: "string" + lastName: + type: "string" + email: + type: "string" + password: + type: "string" + phone: + type: "string" + userStatus: + type: "integer" + format: "int32" + description: "User Status" + xml: + name: "User" + Category: + properties: + id: + type: "integer" + format: "int64" + name: + type: "string" + xml: + name: "Category" + Pet: + required: + - "name" + - "photoUrls" + properties: + id: + type: "integer" + format: "int64" + category: + $ref: "#/definitions/Category" + name: + type: "string" + example: "doggie" + photoUrls: + type: "array" + xml: + name: "photoUrl" + wrapped: true + items: + type: "string" + tags: + type: "array" + xml: + name: "tag" + wrapped: true + items: + $ref: "#/definitions/Tag" + status: + type: "string" + description: "pet status in the store" + enum: + - "available" + - "pending" + - "sold" + xml: + name: "Pet" + Tag: + properties: + id: + type: "integer" + format: "int64" + name: + type: "string" + xml: + name: "Tag" + Order: + properties: + id: + type: "integer" + format: "int64" + petId: + type: "integer" + format: "int64" + quantity: + type: "integer" + format: "int32" + shipDate: + type: "string" + format: "date-time" + status: + type: "string" + description: "Order Status" + enum: + - "placed" + - "approved" + - "delivered" + complete: + type: "boolean" + xml: + name: "Order" From 5db7f6ebb99b97032d37e561dc4bc3206a5ebc51 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Wed, 18 Nov 2015 00:17:21 -0600 Subject: [PATCH 137/142] updated configuration for system properties --- .../java/io/swagger/codegen/config/CodegenConfigurator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java index 27a6716eceb..ad892917c70 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java @@ -339,6 +339,9 @@ public class CodegenConfigurator { if (dynamicProperties.containsKey(opt)) { codegenConfig.additionalProperties().put(opt, dynamicProperties.get(opt)); } + else if(systemProperties.containsKey(opt)) { + codegenConfig.additionalProperties().put(opt, systemProperties.get(opt).toString()); + } } } From 7f62576d883eea00ad07bdd4db807d44780d8fe3 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Wed, 18 Nov 2015 00:17:33 -0600 Subject: [PATCH 138/142] added connexion --- README.md | 3 +- .../languages/FlaskConnexionCodegen.java | 41 ++++++++++++++++--- .../flaskConnexion/controllers/Pet.py | 0 .../flaskConnexion/controllers/Store.py | 0 .../flaskConnexion/controllers/User.py | 0 5 files changed, 38 insertions(+), 6 deletions(-) delete mode 100644 samples/server/petstore/flaskConnexion/controllers/Pet.py delete mode 100644 samples/server/petstore/flaskConnexion/controllers/Store.py delete mode 100644 samples/server/petstore/flaskConnexion/controllers/User.py diff --git a/README.md b/README.md index 664b8e20ef1..c683b98aae6 100644 --- a/README.md +++ b/README.md @@ -305,7 +305,8 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/client/petstore/java \ -c path/to/config.json ``` -Supported config options can be different per language. Running `config-help -l {lang}` will show available options. +Supported config options can be different per language. Running `config-help -l {lang}` will show available options. **These options are applied +by passing them with `-D{optionName}={optionValue}**. ``` java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar config-help -l java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index e2a0de1599d..2e3282b7ebc 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -14,9 +14,14 @@ import java.io.File; import java.util.*; public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConfig { + public static final String CONTROLLER_PACKAGE = "controllerPackage"; + public static final String DEFAULT_CONTROLLER = "defaultController"; + protected String apiVersion = "1.0.0"; protected int serverPort = 8080; protected String projectName = "swagger-server"; + protected String controllerPackage; + protected String defaultController; public FlaskConnexionCodegen() { super(); @@ -92,16 +97,42 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf "README.md") ); - if(!new java.io.File("controllers/default_controller.py").exists()) { + cliOptions.add(new CliOption(CONTROLLER_PACKAGE, "controller package"). + defaultValue("controllers")); + cliOptions.add(new CliOption(DEFAULT_CONTROLLER, "default controller"). + defaultValue("default_controller")); + } + + @Override + public void processOpts() { + super.processOpts(); + apiTemplateFiles.clear(); + + if (additionalProperties.containsKey(CONTROLLER_PACKAGE)) { + this.controllerPackage = additionalProperties.get(CONTROLLER_PACKAGE).toString(); + } + else { + this.controllerPackage = "controllers"; + additionalProperties.put(CONTROLLER_PACKAGE, this.controllerPackage); + } + if (additionalProperties.containsKey(DEFAULT_CONTROLLER)) { + this.defaultController = additionalProperties.get(DEFAULT_CONTROLLER).toString(); + } + else { + this.defaultController = "default_controller"; + additionalProperties.put(DEFAULT_CONTROLLER, this.defaultController); + } + + if(!new java.io.File(controllerPackage + File.separator + defaultController + ".py").exists()) { supportingFiles.add(new SupportingFile("controller.mustache", - "controllers", - "default_controller.py") + controllerPackage, + defaultController + ".py") ); } } public String apiPackage() { - return "controllers"; + return controllerPackage; } /** @@ -178,7 +209,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf String operationId = operation.getOperationId(); if(operationId != null && operationId.indexOf(".") == -1) { operation.setVendorExtension("x-operationId", underscore(sanitizeName(operationId))); - operationId = "controllers.default_controller." + underscore(sanitizeName(operationId)); + operationId = controllerPackage + "." + defaultController + "." + underscore(sanitizeName(operationId)); operation.setOperationId(operationId); } if(operation.getTags() != null) { diff --git a/samples/server/petstore/flaskConnexion/controllers/Pet.py b/samples/server/petstore/flaskConnexion/controllers/Pet.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/samples/server/petstore/flaskConnexion/controllers/Store.py b/samples/server/petstore/flaskConnexion/controllers/Store.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/samples/server/petstore/flaskConnexion/controllers/User.py b/samples/server/petstore/flaskConnexion/controllers/User.py deleted file mode 100644 index e69de29bb2d..00000000000 From 5e68bd58fc584355b6e09ae0153c073aadc216f8 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Wed, 18 Nov 2015 00:33:49 -0600 Subject: [PATCH 139/142] fixed swagger listing --- .../src/main/java/io/swagger/generator/online/Generator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index bc7f4a8cc68..9946831640d 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -109,6 +109,7 @@ public class Generator { if (opts.getOptions() != null) { codegenConfig.additionalProperties().putAll(opts.getOptions()); + codegenConfig.additionalProperties().put("swagger", swagger); } codegenConfig.setOutputDir(outputFolder); From f95409210bacbad9fe11544939b6ba6807480d69 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Wed, 18 Nov 2015 00:43:52 -0600 Subject: [PATCH 140/142] fixed cp bug --- .../src/main/resources/flaskConnexion/README.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache index effe82bb7dd..ed64b667558 100644 --- a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache +++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache @@ -3,7 +3,7 @@ ## Overview This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the [swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub. This -is an example of building a swagger-enabled JAX-RS server. +is an example of building a swagger-enabled flask server. This example uses the [connexion](https://github.com/zalando/connexion) library on top of Flask. From 473aab2d8e29138956d801b33a9bbc394ac18ca0 Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 18 Nov 2015 17:21:32 +0800 Subject: [PATCH 141/142] Support file uploading in Clojure client --- .../src/main/resources/clojure/api.mustache | 7 ++-- .../src/main/resources/clojure/core.mustache | 39 ++++++++++++++----- .../petstore/clojure/resources/hello.txt | 1 + .../clojure/src/swagger_petstore/api/pet.clj | 5 ++- .../src/swagger_petstore/api/store.clj | 3 +- .../clojure/src/swagger_petstore/api/user.clj | 3 +- .../clojure/src/swagger_petstore/core.clj | 39 ++++++++++++++----- .../test/swagger_petstore/api/pet_test.clj | 14 +++---- .../test/swagger_petstore/core_test.clj | 14 ++++++- 9 files changed, 88 insertions(+), 37 deletions(-) create mode 100644 samples/client/petstore/clojure/resources/hello.txt diff --git a/modules/swagger-codegen/src/main/resources/clojure/api.mustache b/modules/swagger-codegen/src/main/resources/clojure/api.mustache index 3d314531cdc..a4425280f1b 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/api.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/api.mustache @@ -1,11 +1,12 @@ {{=< >=}}(ns . - (:require [.core :refer [call-api check-required-params]])) + (:require [.core :refer [call-api check-required-params]]) + (:import (java.io File))) <#operations><#operation> (defn "<&summary><#notes> <¬es>"<#hasOptionalParams> - ([<#allParams><#required> ] (<#allParams><#required> nil)) - <#hasOptionalParams>([<#allParams><#required> <#hasOptionalParams>{:keys [<#allParams><^required> ]}]<#hasRequiredParams> + ([<#allParams><#required><#isFile>^File ] (<#allParams><#required> nil)) + <#hasOptionalParams>([<#allParams><#required><#isFile>^File <#hasOptionalParams>{:keys [<#allParams><^required><#isFile>^File ]}]<#hasRequiredParams> <#hasOptionalParams> (check-required-params<#allParams><#required> ) <#hasOptionalParams> (call-api "" : <#hasOptionalParams> {:path-params {<#pathParams>"" } diff --git a/modules/swagger-codegen/src/main/resources/clojure/core.mustache b/modules/swagger-codegen/src/main/resources/clojure/core.mustache index 50d23a6a740..32aa8a6bc0d 100644 --- a/modules/swagger-codegen/src/main/resources/clojure/core.mustache +++ b/modules/swagger-codegen/src/main/resources/clojure/core.mustache @@ -3,6 +3,7 @@ [clojure.string :as str] [clj-http.client :as client]) (:import (com.fasterxml.jackson.core JsonParseException) + (java.io File) (java.util Date TimeZone) (java.text SimpleDateFormat))) @@ -90,17 +91,24 @@ path-params)] (str (:base-url *api-context*) path))) +(defn normalize-param + "Normalize parameter value, handling three cases: + for sequential value, normalize each elements of it; + for File value, do nothing with it; + otherwise, call `param-to-string`." + [param] + (cond + (sequential? param) (map normalize-param param) + (instance? File param) param + :else (param-to-str param))) + (defn normalize-params "Normalize parameters values: remove nils, format to string with `param-to-str`." [params] - (reduce (fn [result [k v]] - (if (nil? v) - result - (assoc result k (if (sequential? v) - (map param-to-str v) - (param-to-str v))))) - {} - params)) + (->> params + (remove (comp nil? second)) + (map (fn [[k v]] [k (normalize-param v)])) + (into {}))) (defn json-mime? [mime] "Check if the given MIME is a standard JSON MIME or :json." @@ -136,6 +144,13 @@ ;; for non-JSON response, return the body string directly :else body)) +(defn form-params-to-multipart + "Convert the given form parameters map into a vector as clj-http's :multipart option." + [form-params] + (->> form-params + (map (fn [[k v]] (array-map :name k :content v))) + vec)) + (defn call-api "Call an API by making HTTP request and return its response." [path method {:keys [path-params query-params header-params form-params body-param content-types accepts]}] @@ -144,12 +159,16 @@ content-type (or (json-preferred-mime content-types) (and body-param :json)) accept (or (json-preferred-mime accepts) :json) + multipart? (= "multipart/form-data" content-type) opts (cond-> {:url url :method method} - content-type (assoc :content-type content-type) accept (assoc :accept accept) (seq query-params) (assoc :query-params (normalize-params query-params)) (seq header-params) (assoc :header-params (normalize-params header-params)) - (seq form-params) (assoc :form-params (normalize-params form-params)) + (and content-type (not multipart?)) (assoc :content-type content-type) + multipart? (assoc :multipart (-> form-params + normalize-params + form-params-to-multipart)) + (and (not multipart?) (seq form-params)) (assoc :form-params (normalize-params form-params)) body-param (assoc :body (serialize body-param content-type)) debug (assoc :debug true :debug-body true)) resp (client/request opts)] diff --git a/samples/client/petstore/clojure/resources/hello.txt b/samples/client/petstore/clojure/resources/hello.txt new file mode 100644 index 00000000000..6769dd60bdf --- /dev/null +++ b/samples/client/petstore/clojure/resources/hello.txt @@ -0,0 +1 @@ +Hello world! \ No newline at end of file diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj index f73ef83893e..c331444c886 100644 --- a/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj +++ b/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj @@ -1,5 +1,6 @@ (ns swagger-petstore.api.pet - (:require [swagger-petstore.core :refer [call-api check-required-params]])) + (:require [swagger-petstore.core :refer [call-api check-required-params]]) + (:import (java.io File))) (defn update-pet "Update an existing pet @@ -97,7 +98,7 @@ "uploads an image " ([pet-id ] (upload-file pet-id nil)) - ([pet-id {:keys [additional-metadata file ]}] + ([pet-id {:keys [additional-metadata ^File file ]}] (call-api "/pet/{petId}/uploadImage" :post {:path-params {"petId" pet-id } :header-params {} diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj index 4d5ac3ca325..f2a18cea2e8 100644 --- a/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj +++ b/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj @@ -1,5 +1,6 @@ (ns swagger-petstore.api.store - (:require [swagger-petstore.core :refer [call-api check-required-params]])) + (:require [swagger-petstore.core :refer [call-api check-required-params]]) + (:import (java.io File))) (defn get-inventory "Returns pet inventories by status diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj index 9f34a1be537..15d41515ebb 100644 --- a/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj +++ b/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj @@ -1,5 +1,6 @@ (ns swagger-petstore.api.user - (:require [swagger-petstore.core :refer [call-api check-required-params]])) + (:require [swagger-petstore.core :refer [call-api check-required-params]]) + (:import (java.io File))) (defn create-user "Create user diff --git a/samples/client/petstore/clojure/src/swagger_petstore/core.clj b/samples/client/petstore/clojure/src/swagger_petstore/core.clj index 85856674a19..e7c55258e79 100644 --- a/samples/client/petstore/clojure/src/swagger_petstore/core.clj +++ b/samples/client/petstore/clojure/src/swagger_petstore/core.clj @@ -3,6 +3,7 @@ [clojure.string :as str] [clj-http.client :as client]) (:import (com.fasterxml.jackson.core JsonParseException) + (java.io File) (java.util Date TimeZone) (java.text SimpleDateFormat))) @@ -90,17 +91,24 @@ path-params)] (str (:base-url *api-context*) path))) +(defn normalize-param + "Normalize parameter value, handling three cases: + for sequential value, normalize each elements of it; + for File value, do nothing with it; + otherwise, call `param-to-string`." + [param] + (cond + (sequential? param) (map normalize-param param) + (instance? File param) param + :else (param-to-str param))) + (defn normalize-params "Normalize parameters values: remove nils, format to string with `param-to-str`." [params] - (reduce (fn [result [k v]] - (if (nil? v) - result - (assoc result k (if (sequential? v) - (map param-to-str v) - (param-to-str v))))) - {} - params)) + (->> params + (remove (comp nil? second)) + (map (fn [[k v]] [k (normalize-param v)])) + (into {}))) (defn json-mime? [mime] "Check if the given MIME is a standard JSON MIME or :json." @@ -136,6 +144,13 @@ ;; for non-JSON response, return the body string directly :else body)) +(defn form-params-to-multipart + "Convert the given form parameters map into a vector as clj-http's :multipart option." + [form-params] + (->> form-params + (map (fn [[k v]] (array-map :name k :content v))) + vec)) + (defn call-api "Call an API by making HTTP request and return its response." [path method {:keys [path-params query-params header-params form-params body-param content-types accepts]}] @@ -144,12 +159,16 @@ content-type (or (json-preferred-mime content-types) (and body-param :json)) accept (or (json-preferred-mime accepts) :json) + multipart? (= "multipart/form-data" content-type) opts (cond-> {:url url :method method} - content-type (assoc :content-type content-type) accept (assoc :accept accept) (seq query-params) (assoc :query-params (normalize-params query-params)) (seq header-params) (assoc :header-params (normalize-params header-params)) - (seq form-params) (assoc :form-params (normalize-params form-params)) + (and content-type (not multipart?)) (assoc :content-type content-type) + multipart? (assoc :multipart (-> form-params + normalize-params + form-params-to-multipart)) + (and (not multipart?) (seq form-params)) (assoc :form-params (normalize-params form-params)) body-param (assoc :body (serialize body-param content-type)) debug (assoc :debug true :debug-body true)) resp (client/request opts)] diff --git a/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj index 8acd528c5a5..7327b44c45d 100644 --- a/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj +++ b/samples/client/petstore/clojure/test/swagger_petstore/api/pet_test.clj @@ -77,11 +77,9 @@ (delete-pet id) (is (thrown? RuntimeException (get-pet-by-id id))))) -(comment - ;; TODO support file uploading - (deftest test-upload-file - (let [{:keys [id] :as pet} (make-random-pet) - _ (add-pet {:body pet}) - file (io/file (io/resource "hello.txt"))] - ;; no errors - (upload-file id {:file file :additionalMetadata "uploading file with clojure client"})))) +(deftest test-upload-file + (let [{:keys [id] :as pet} (make-random-pet) + _ (add-pet {:body pet}) + file (io/file (io/resource "hello.txt"))] + ;; no errors with upload-file + (upload-file id {:file file :additional-metadata "uploading file with clojure client"}))) diff --git a/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj index ac39e8a503f..394824aa4a9 100644 --- a/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj +++ b/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj @@ -1,5 +1,6 @@ (ns swagger-petstore.core-test - (:require [clojure.test :refer :all] + (:require [clojure.java.io :as io] + [clojure.test :refer :all] [swagger-petstore.core :refer :all]) (:import (java.text ParseException))) @@ -87,8 +88,17 @@ "/pet" {"id" 1} "http://petstore.swagger.io/v2/pet" "/pet/{id}" nil "http://petstore.swagger.io/v2/pet/{id}")) +(deftest test-normalize-param + (let [file (-> "hello.txt" io/resource io/file)] + (are [param expected] + (is (= expected (normalize-param param))) + [12 "34"] ["12" "34"] + file file + "abc" "abc" + [[12 "34"] file "abc"] [["12" "34"] file "abc"]))) + (deftest test-normalize-params - (is (= {:a "123" :b ["4" "5,6"]} + (is (= {:a "123" :b ["4" ["5" "6"]]} (normalize-params {:a 123 :b [4 [5 "6"]] :c nil})))) (deftest test-json-mime? From 041eb94a271f645c32f12784045d53fe94e6758a Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Wed, 18 Nov 2015 08:44:45 -0600 Subject: [PATCH 142/142] renamed --- .../io/swagger/codegen/languages/FlaskConnexionCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index 2e3282b7ebc..b3de913501a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -152,7 +152,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf * @return the friendly name for the generator */ public String getName() { - return "flaskConnexion"; + return "python-flask"; } /**