diff --git a/README.md b/README.md index 03876e61ed9..a74dc04c883 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The Swagger Specification has undergone 3 revisions since initial creation in 20 Swagger Codegen Version | Release Date | Swagger Spec compatibility | Notes ----------------------- | ------------ | -------------------------- | ----- -2.1.1-M2-SNAPSHOT | 2015-04-06 | 1.0, 1.1, 1.2, 2.0 | [master](https://github.com/swagger-api/swagger-codegen) +2.1.0 | 2015-06-09 | 1.0, 1.1, 1.2, 2.0 | [master](https://github.com/swagger-api/swagger-codegen) 2.0.17 | 2014-08-22 | 1.1, 1.2 | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17) 1.0.4 | 2012-04-12 | 1.0, 1.1 | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1) @@ -154,7 +154,8 @@ Great for creating libraries on your ci server, from the [Swagger Editor](http:/ There are different aspects of customizing the code generator beyond just creating or modifying templates. Each language has a supporting configuration file to handle different type mappings, etc: ``` -$ ls -1 modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ +$ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ +AkkaScalaClientCodegen.java AndroidClientCodegen.java AsyncScalaClientCodegen.java CSharpClientCodegen.java @@ -167,6 +168,7 @@ PhpClientCodegen.java Python3ClientCodegen.java PythonClientCodegen.java Qt5CPPGenerator.java +RetrofitClientCodegen.java RubyClientCodegen.java ScalaClientCodegen.java ScalatraServerCodegen.java @@ -175,6 +177,7 @@ StaticDocCodegen.java StaticHtmlGenerator.java SwaggerGenerator.java SwaggerYamlGenerator.java +SwiftGenerator.java TizenClientCodegen.java ``` @@ -237,7 +240,7 @@ To change, for example, the prefix for the Objective-C generated files, simply s ``` package com.mycompany.swagger.codegen; -import com.wordnik.swagger.codegen.languages.*; +import io.swagger.codegen.languages.*; public class MyObjcCodegen extends ObjcClientCodegen { static { diff --git a/bin/akka-scala-petstore.sh b/bin/akka-scala-petstore.sh new file mode 100755 index 00000000000..42beb3ce08a --- /dev/null +++ b/bin/akka-scala-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 -t modules/swagger-codegen/src/main/resources/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l akka-scala -o samples/client/petstore/akka-scala" + +java $JAVA_OPTS -jar $executable $ags diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml index 388dd1a8392..ec0d6875358 100644 --- a/modules/swagger-codegen-cli/pom.xml +++ b/modules/swagger-codegen-cli/pom.xml @@ -1,9 +1,9 @@ - - com.wordnik + io.swagger swagger-codegen-project - 2.1.1-M2-SNAPSHOT + 2.1.1 ../.. 4.0.0 @@ -16,12 +16,12 @@ swagger-codegen-cli - - src/main/resources - - logback.xml - - + + src/main/resources + + logback.xml + + @@ -30,7 +30,7 @@ - com.wordnik.swagger.codegen.SwaggerCodegen + io.swagger.codegen.SwaggerCodegen @@ -62,7 +62,8 @@ - + @@ -74,7 +75,7 @@ - com.wordnik + io.swagger swagger-codegen ${project.version} diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java similarity index 78% rename from modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java index f2c794776ce..3cdc01fe3f5 100644 --- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java @@ -1,17 +1,17 @@ -package com.wordnik.swagger.codegen; +package io.swagger.codegen; -import com.wordnik.swagger.codegen.cmd.ConfigHelp; -import com.wordnik.swagger.codegen.cmd.Generate; -import com.wordnik.swagger.codegen.cmd.Langs; -import com.wordnik.swagger.codegen.cmd.Meta; import io.airlift.airline.Cli; import io.airlift.airline.Help; +import io.swagger.codegen.cmd.ConfigHelp; +import io.swagger.codegen.cmd.Generate; +import io.swagger.codegen.cmd.Langs; +import io.swagger.codegen.cmd.Meta; /** * User: lanwen * Date: 24.03.15 * Time: 17:56 - * + *

* Command line interface for swagger codegen * use `swagger-codegen-cli.jar help` for more info * diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java similarity index 91% rename from modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/ConfigHelp.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java index fbdca12e6e8..6b34a4bf56d 100644 --- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/ConfigHelp.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java @@ -1,33 +1,24 @@ -package com.wordnik.swagger.codegen.cmd; +package io.swagger.codegen.cmd; -import com.wordnik.swagger.codegen.CliOption; -import com.wordnik.swagger.codegen.CodegenConfig; import io.airlift.airline.Command; import io.airlift.airline.Option; +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; + import java.util.ServiceLoader; + import static java.util.ServiceLoader.load; @Command(name = "config-help", description = "Config help for chosen lang") public class ConfigHelp implements Runnable { - + @Option(name = {"-l", "--lang"}, title = "language", required = true, description = "language to get config help for") private String lang; - @Override - public void run() { - System.out.println(); - CodegenConfig config = forName(lang); - System.out.println("CONFIG OPTIONS"); - for (CliOption langCliOption : config.cliOptions()) { - System.out.println("\t" + langCliOption.getOpt()); - System.out.println("\t " + langCliOption.getDescription()); - System.out.println(); - } - } - /** * Tries to load config class with SPI first, then with class name directly from classpath + * * @param name name of config, or full qualified class name in classpath * @return config class */ @@ -46,4 +37,16 @@ private static CodegenConfig forName(String name) { throw new RuntimeException("Can't load config class with name ".concat(name), e); } } + + @Override + public void run() { + System.out.println(); + CodegenConfig config = forName(lang); + System.out.println("CONFIG OPTIONS"); + for (CliOption langCliOption : config.cliOptions()) { + System.out.println("\t" + langCliOption.getOpt()); + System.out.println("\t " + langCliOption.getDescription()); + System.out.println(); + } + } } diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java similarity index 84% rename from modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java index 3485eb8dd24..0d7e94e8f28 100644 --- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java @@ -1,15 +1,15 @@ -package com.wordnik.swagger.codegen.cmd; - -import com.wordnik.swagger.codegen.CliOption; -import com.wordnik.swagger.codegen.ClientOptInput; -import com.wordnik.swagger.codegen.ClientOpts; -import com.wordnik.swagger.codegen.CodegenConfig; -import com.wordnik.swagger.codegen.DefaultGenerator; -import com.wordnik.swagger.models.Swagger; +package io.swagger.codegen.cmd; + import config.Config; import config.ConfigParser; import io.airlift.airline.Command; import io.airlift.airline.Option; +import io.swagger.codegen.CliOption; +import io.swagger.codegen.ClientOptInput; +import io.swagger.codegen.ClientOpts; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.DefaultGenerator; +import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,15 +57,37 @@ public class Generate implements Runnable { "Pass in a URL-encoded string of name:header with a comma separating multiple values") private String auth; - @Option( name= {"-D"}, title = "system properties", description = "sets specified system properties in " + + @Option(name = {"-D"}, title = "system properties", description = "sets specified system properties in " + "the format of name=value,name=value") private String systemProperties; - - @Option( name= {"-c", "--config"}, title = "configuration file", description = "Path to json configuration file. " + + + @Option(name = {"-c", "--config"}, title = "configuration file", description = "Path to json configuration file. " + "File content should be in a json format {\"optionKey\":\"optionValue\", \"optionKey1\":\"optionValue1\"...} " + "Supported options can be different for each language. Run config-help -l {lang} command for language specific config options.") private String configFile; + /** + * Tries to load config class with SPI first, then with class name directly from classpath + * + * @param name name of config, or full qualified class name in classpath + * @return config class + */ + private static CodegenConfig forName(String name) { + ServiceLoader loader = load(CodegenConfig.class); + for (CodegenConfig config : loader) { + if (config.getName().equals(name)) { + return config; + } + } + + // else try to load directly + try { + return (CodegenConfig) Class.forName(name).newInstance(); + } catch (Exception e) { + throw new RuntimeException("Can't load config class with name ".concat(name), e); + } + } + @Override public void run() { verbosed(verbose); @@ -84,13 +106,13 @@ public void run() { if (null != templateDir) { config.additionalProperties().put(TEMPLATE_DIR_PARAM, new File(templateDir).getAbsolutePath()); } - - if(null != configFile){ + + if (null != configFile) { Config genConfig = ConfigParser.read(configFile); if (null != genConfig) { for (CliOption langCliOption : config.cliOptions()) { if (genConfig.hasOption(langCliOption.getOpt())) { - config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt())); + config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt())); } } } @@ -103,11 +125,11 @@ public void run() { } private void setSystemProperties() { - if( systemProperties != null && systemProperties.length() > 0 ){ - for( String property : systemProperties.split(",")) { + if (systemProperties != null && systemProperties.length() > 0) { + for (String property : systemProperties.split(",")) { int ix = property.indexOf('='); - if( ix > 0 && ix < property.length()-1 ){ - System.setProperty( property.substring(0, ix), property.substring(ix+1) ); + if (ix > 0 && ix < property.length() - 1) { + System.setProperty(property.substring(0, ix), property.substring(ix + 1)); } } } @@ -115,6 +137,7 @@ private void setSystemProperties() { /** * If true parameter, adds system properties which enables debug mode in generator + * * @param verbose - if true, enables debug mode */ private void verbosed(boolean verbose) { @@ -132,25 +155,4 @@ private void verbosed(boolean verbose) { System.setProperty("debugOperations", ""); System.setProperty("debugSupportingFiles", ""); } - - /** - * Tries to load config class with SPI first, then with class name directly from classpath - * @param name name of config, or full qualified class name in classpath - * @return config class - */ - private static CodegenConfig forName(String name) { - ServiceLoader loader = load(CodegenConfig.class); - for (CodegenConfig config : loader) { - if (config.getName().equals(name)) { - return config; - } - } - - // else try to load directly - try { - return (CodegenConfig) Class.forName(name).newInstance(); - } catch (Exception e) { - throw new RuntimeException("Can't load config class with name ".concat(name), e); - } - } } diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java similarity index 87% rename from modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java index 7942804d434..c3d7391579e 100644 --- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java @@ -1,8 +1,8 @@ -package com.wordnik.swagger.codegen.cmd; +package io.swagger.codegen.cmd; import ch.lambdaj.collection.LambdaIterable; -import com.wordnik.swagger.codegen.CodegenConfig; import io.airlift.airline.Command; +import io.swagger.codegen.CodegenConfig; import static ch.lambdaj.Lambda.on; import static ch.lambdaj.collection.LambdaCollections.with; diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java similarity index 93% rename from modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java index 47843de39ad..c75181c51cd 100644 --- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java @@ -1,13 +1,13 @@ -package com.wordnik.swagger.codegen.cmd; +package io.swagger.codegen.cmd; import ch.lambdaj.function.convert.Converter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache; -import com.wordnik.swagger.codegen.DefaultGenerator; -import com.wordnik.swagger.codegen.SupportingFile; import io.airlift.airline.Command; import io.airlift.airline.Option; +import io.swagger.codegen.DefaultGenerator; +import io.swagger.codegen.SupportingFile; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -47,8 +47,8 @@ public class Meta implements Runnable { private String name = "default"; @Option(name = {"-p", "--package"}, title = "package", - description = "the package to put the main class into (defaults to com.wordnik.swagger.codegen)") - private String targetPackage = "com.wordnik.swagger.codegen"; + description = "the package to put the main class into (defaults to io.swagger.codegen)") + private String targetPackage = "io.swagger.codegen"; @Override public void run() { @@ -65,7 +65,7 @@ public void run() { new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"), new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"), new SupportingFile("services.mustache", - "src/main/resources/META-INF/services", "com.wordnik.swagger.codegen.CodegenConfig") + "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig") ); Map data = new ImmutableMap.Builder() @@ -81,8 +81,9 @@ public void run() { /** * Converter method to process supporting files: execute with mustache, * or simply copy to destination directory + * * @param targetDir - destination directory - * @param data - map with additional params needed to process templates + * @param data - map with additional params needed to process templates * @return converter object to pass to lambdaj */ private Converter processFiles(final File targetDir, final Map data) { @@ -121,6 +122,7 @@ public File convert(SupportingFile support) { /** * Creates mustache loader for template using classpath loader + * * @param generator - class with reader getter * @return loader for template */ @@ -135,6 +137,7 @@ public Reader getTemplate(String name) { /** * Converts package name to path on file system + * * @param packageName - package name to convert * @return relative path */ diff --git a/modules/swagger-codegen-cli/src/main/resources/logback.xml b/modules/swagger-codegen-cli/src/main/resources/logback.xml index 4e86443d8d3..3bd0c92d369 100644 --- a/modules/swagger-codegen-cli/src/main/resources/logback.xml +++ b/modules/swagger-codegen-cli/src/main/resources/logback.xml @@ -1,12 +1,12 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml index 2db20e67a2d..1b6712ba32f 100644 --- a/modules/swagger-codegen/pom.xml +++ b/modules/swagger-codegen/pom.xml @@ -1,347 +1,357 @@ - - - com.wordnik - swagger-codegen-project - 2.1.1-M2-SNAPSHOT - ../.. - - 4.0.0 - swagger-codegen - jar - swagger-codegen (core library) - - src/main/java - install - - - src/main/resources - - logback.xml - - - - - - org.jvnet.wagon-svn - wagon-svn - 1.8 - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-6 - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-1 - - - target - ${project.artifactId}-${project.version} - - - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - - java - - - - - com.wordnik.swagger.codegen.Codegen - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - net.alchim31.maven - scala-maven-plugin - - - - add-source - compile - testCompile - - - - - - incremental - - - -Xmx384m - - - -target:jvm-1.6 - -deprecation - - - - run-scalatest - org.scalatest.tools.Runner - - -p - ${project.build.testOutputDirectory} - - - -Xmx512m - - - - - - - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - development - ${project.url} - ${project.version} - com.wordnik - - - - - - org.apache.maven.plugins - maven-site-plugin - 2.1 - - - org.apache.maven.plugins - maven-release-plugin - 2.1 - - - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - org.apache.maven.plugins - maven-gpg-plugin - - release - sign - - - - - - - - release-profile - - true - - + + + io.swagger + swagger-codegen-project + 2.1.1 + ../.. + + 4.0.0 + swagger-codegen + jar + swagger-codegen (core library) + + src/main/java + install + + + src/main/resources + + logback.xml + + + + + + org.jvnet.wagon-svn + wagon-svn + 1.8 + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-alpha-6 + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-1 + + + target + ${project.artifactId}-${project.version} - - net.alchim31.maven - scala-maven-plugin - - - - compile - testCompile - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - prepare-package - - add-source - + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + + java + + + - - src/main/scala - + io.swagger.codegen.Codegen - - - + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + net.alchim31.maven + scala-maven-plugin + + + + add-source + compile + testCompile + + + + + + incremental + + + -Xmx384m + + + -target:jvm-1.6 + -deprecation + + + + run-scalatest + org.scalatest.tools.Runner + + -p + ${project.build.testOutputDirectory} + + + -Xmx512m + + + + + + + maven-compiler-plugin + 3.0 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + development + ${project.url} + ${project.version} + io.swagger + + + + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + - - - - release-sign-artifacts - - - performRelease - true - - - + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin-version} + + + org.apache.maven.plugins + maven-gpg-plugin + + release + sign + + + + + + + + release-profile + + true + + + + + net.alchim31.maven + scala-maven-plugin + + + + compile + testCompile + + + + + ${scala-version} + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + prepare-package + + add-source + + + + src/main/scala + + + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + target/site - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + true + true + + http://java.sun.com/javaee/5/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + + + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin-version} + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + true + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + + + project-team + + + + - - - - - target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - true - true - - http://java.sun.com/javaee/5/docs/api - http://java.sun.com/j2se/1.5.0/docs/api - - - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - true - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - - - project-team - - - - - - - - - io.swagger - swagger-parser - ${swagger-parser-version} - - - io.swagger - swagger-compat-spec-parser - ${swagger-parser-version} - - - ${project.groupId} - swagger-core - ${swagger-core-version} - - - com.samskivert - jmustache - ${jmustache-version} - - - commons-io - commons-io - ${commons-io-version} - - - org.apache.maven - maven-plugin-tools-api - 2.0 - - - org.apache.felix - maven-bundle-plugin - ${felix-version} - - - org.slf4j - slf4j-ext - ${slf4j-version} - - - org.slf4j - slf4j-api - ${slf4j-version} - - - commons-lang - commons-lang - ${commons-lang-version} - - - commons-cli - commons-cli - ${commons-cli-version} - - - org.scalatest - scalatest_2.11 - ${scala-test-version} - test - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - + + + + io.swagger + swagger-parser + ${swagger-parser-version} + compile + + + io.swagger + swagger-compat-spec-parser + ${swagger-parser-version} + + + ${project.groupId} + swagger-core + ${swagger-core-version} + + + com.samskivert + jmustache + ${jmustache-version} + + + commons-io + commons-io + ${commons-io-version} + + + org.apache.maven + maven-plugin-tools-api + 2.0 + + + org.apache.felix + maven-bundle-plugin + ${felix-version} + + + org.slf4j + slf4j-ext + ${slf4j-version} + + + org.slf4j + slf4j-api + ${slf4j-version} + + + commons-lang + commons-lang + ${commons-lang-version} + + + commons-cli + commons-cli + ${commons-cli-version} + + + org.scalatest + scalatest_2.11 + ${scala-test-version} + test + + + org.scala-lang + scala-library + ${scala-version} + test + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/AbstractGenerator.java deleted file mode 100644 index fa5131dbdc2..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/AbstractGenerator.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.samskivert.mustache.*; - -import java.util.regex.Pattern; -import java.io.*; - -public abstract class AbstractGenerator { - - public File writeToFile(String filename, String contents) throws IOException { - System.out.println("writing file " + filename); - File output = new File(filename); - - if(output.getParent() != null && !new File(output.getParent()).exists()) { - File parent = new File(output.getParent()); - parent.mkdirs(); - } - Writer out = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(output), "UTF-8")); - - out.write(contents); - out.close(); - return output; - } - - public String readTemplate(String name) { - try{ - Reader reader = getTemplateReader(name); - if(reader == null) - throw new RuntimeException("no file found"); - java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A"); - return s.hasNext() ? s.next() : ""; - } - catch(Exception e) { - e.printStackTrace(); - } - throw new RuntimeException("can't load template " + name); - } - - public Reader getTemplateReader(String name) { - try{ - InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name)); - if(is == null) - is = new FileInputStream(new File(name)); - if(is == null) - throw new RuntimeException("no file found"); - return new InputStreamReader(is); - } - catch(Exception e) { - e.printStackTrace(); - } - throw new RuntimeException("can't load template " + name); - } - - private String getCPResourcePath(String name) { - if (!"/".equals(File.separator)) - return name.replaceAll(Pattern.quote(File.separator), "/"); - return name; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CliOption.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CliOption.java deleted file mode 100644 index 8ea0b60db26..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CliOption.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.wordnik.swagger.codegen; - -public class CliOption { - private final String opt; - private String description; - - public CliOption(String opt, String description) { - this.opt = opt; - this.description = description; - } - - public String getOpt() { - return opt; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java deleted file mode 100644 index 34d6000e303..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.codegen; - -import com.wordnik.swagger.codegen.ClientOpts; -import com.wordnik.swagger.annotations.*; -import com.wordnik.swagger.models.Swagger; -import com.wordnik.swagger.models.auth.AuthorizationValue; - -import java.util.*; -import java.net.URLEncoder; -import java.net.URLDecoder; - -public class ClientOptInput { - private ClientOpts opts; - private Swagger swagger; - private List auths; - protected CodegenConfig config; - - public ClientOptInput swagger(Swagger swagger) { - this.setSwagger(swagger); - return this; - } - public ClientOptInput opts(ClientOpts opts) { - this.setOpts(opts); - return this; - } - - public void setAuth(String urlEncodedAuthString) { - List auths = new ArrayList(); - if(urlEncodedAuthString != null && !"".equals(urlEncodedAuthString)) { - String[] parts = urlEncodedAuthString.split(","); - for(String part : parts) { - String[] kvPair = part.split(":"); - if(kvPair.length == 2) { - auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header")); - } - } - } - this.auths = auths; - } - public String getAuth() { - if(auths != null) { - StringBuilder b = new StringBuilder(); - for(AuthorizationValue v : auths) { - try { - if(b.toString().length() > 0) - b.append(","); - b.append(URLEncoder.encode(v.getKeyName(), "UTF-8")) - .append(":") - .append(URLEncoder.encode(v.getValue(), "UTF-8")); - } - catch (Exception e) { - // continue - e.printStackTrace(); - } - } - return b.toString(); - } - else - return null; - } - public List getAuthorizationValues() { - return auths; - } - - public CodegenConfig getConfig() { - return config; - } - public void setConfig(CodegenConfig config) { - this.config = config; - } - - public void setOpts(ClientOpts opts) { - this.opts = opts; - } - - public ClientOpts getOpts() { - return opts; - } - - public void setSwagger(Swagger swagger) { - this.swagger = swagger; - } - - @ApiModelProperty(dataType="Object") - public Swagger getSwagger() { - return swagger; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOpts.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOpts.java deleted file mode 100644 index b8d681cc307..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOpts.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.codegen.auth.*; - -import java.util.*; - -public class ClientOpts { - protected String uri; - protected String target; - protected AuthMethod auth; - protected Map properties = new HashMap(); - protected String outputDirectory; - - public String getUri() { - return uri; - } - public void setUri(String uri) { - this.uri = uri; - } - - public String getTarget() { - return target; - } - public void setTarget(String target) { - this.target = target; - } - - public Map getProperties() { - return properties; - } - public void setProperties(Map properties) { - this.properties = properties; - } - - public String getOutputDirectory() { - return outputDirectory; - } - public void setOutputDirectory(String outputDirectory) { - this.outputDirectory = outputDirectory; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("ClientOpts: {\n"); - sb.append(" uri: ").append(uri).append(","); - sb.append(" auth: ").append(auth).append(","); - sb.append(properties); - sb.append("}"); - return sb.toString(); - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java deleted file mode 100644 index c28031a9f27..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.codegen.languages.*; -import com.wordnik.swagger.models.Swagger; -import com.wordnik.swagger.models.auth.AuthorizationValue; -import com.wordnik.swagger.util.*; - -import io.swagger.parser.SwaggerParser; - -import org.apache.commons.cli.*; - -import java.io.File; -import java.util.*; - -/** - * @deprecated use instead {@link com.wordnik.swagger.codegen.DefaultGenerator} - * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547 - */ -@Deprecated -public class Codegen extends DefaultGenerator { - static Map configs = new HashMap(); - static String configString; - static { - List extensions = getExtensions(); - StringBuilder sb = new StringBuilder(); - - for(CodegenConfig config : extensions) { - if(sb.toString().length() != 0) - sb.append(", "); - sb.append(config.getName()); - configs.put(config.getName(), config); - configString = sb.toString(); - } - } - - static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" + - "\n -DdebugSwagger prints the swagger specification as interpreted by the codegen" + - "\n -DdebugModels prints models passed to the template engine" + - "\n -DdebugOperations prints operations passed to the template engine" + - "\n -DdebugSupportingFiles prints additional data passed to the template engine"; - public static void main(String[] args) { - - StringBuilder sb = new StringBuilder(); - - Options options = new Options(); - options.addOption("h", "help", false, "shows this message"); - options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]"); - options.addOption("o", "output", true, "where to write the generated files"); - options.addOption("i", "input-spec", true, "location of the swagger spec, as URL or file"); - options.addOption("t", "template-dir", true, "folder containing the template files"); - options.addOption("d", "debug-info", false, "prints additional info for debugging"); - options.addOption("a", "auth", true, "adds authorization headers when fetching the swagger definitions remotely. Pass in a URL-encoded string of name:header with a comma separating multiple values"); - - ClientOptInput clientOptInput = new ClientOptInput(); - ClientOpts clientOpts = new ClientOpts(); - Swagger swagger = null; - - CommandLine cmd = null; - try { - CommandLineParser parser = new BasicParser(); - CodegenConfig config = null; - - cmd = parser.parse(options, args); - if (cmd.hasOption("d")) { - usage(options); - System.out.println(debugInfoOptions); - return; - } - if (cmd.hasOption("a")) - clientOptInput.setAuth(cmd.getOptionValue("a")); - if (cmd.hasOption("l")) - clientOptInput.setConfig(getConfig(cmd.getOptionValue("l"))); - else { - usage(options); - return; - } - if (cmd.hasOption("o")) - clientOptInput.getConfig().setOutputDir(cmd.getOptionValue("o")); - if (cmd.hasOption("h")) { - if(cmd.hasOption("l")) { - config = getConfig(String.valueOf(cmd.getOptionValue("l"))); - if(config != null) { - options.addOption("h", "help", true, config.getHelp()); - usage(options); - return; - } - } - usage(options); - return; - } - if (cmd.hasOption("i")) - swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues(), true); - if (cmd.hasOption("t")) - clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t"))); - } - catch (Exception e) { - usage(options); - return; - } - try{ - clientOptInput - .opts(clientOpts) - .swagger(swagger); - new Codegen().opts(clientOptInput).generate(); - } - catch (Exception e) { - e.printStackTrace(); - } - } - - public static List getExtensions() { - ServiceLoader loader = ServiceLoader.load(CodegenConfig.class); - List output = new ArrayList(); - Iterator itr = loader.iterator(); - while(itr.hasNext()) { - output.add(itr.next()); - } - return output; - } - - static void usage(Options options) { - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp( "Codegen", options ); - } - - public static CodegenConfig getConfig(String name) { - if(configs.containsKey(name)) { - return configs.get(name); - } - else { - // see if it's a class - try { - System.out.println("loading class " + name); - Class customClass = Class.forName(name); - System.out.println("loaded"); - return (CodegenConfig)customClass.newInstance(); - } - catch (Exception e) { - throw new RuntimeException("can't load class " + name); - } - } - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java deleted file mode 100644 index b112923b6d7..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.models.*; -import com.wordnik.swagger.models.auth.SecuritySchemeDefinition; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; - -public interface CodegenConfig { - CodegenType getTag(); - String getName(); - String getHelp(); - Map additionalProperties(); - String apiPackage(); - String apiFileFolder(); - String fileSuffix(); - String outputFolder(); - String templateDir(); - String modelFileFolder(); - String modelPackage(); - String toApiName(String name); - String toApiVarName(String name); - String toModelName(String name); - String toParamName(String name); - String escapeText(String text); - String escapeReservedWord(String name); - String getTypeDeclaration(Property p); - String getTypeDeclaration(String name); - void processOpts(); - List cliOptions(); - String generateExamplePath(String path, Operation operation); - - Set reservedWords(); - - List supportingFiles(); - - void setOutputDir(String dir); - String getOutputDir(); - - CodegenModel fromModel(String name, Model model); - CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map definitions); - List fromSecurity(Map schemes); - - Set defaultIncludes(); - Map typeMapping(); - Map instantiationTypes(); - Map importMapping(); - Map apiTemplateFiles(); - Map modelTemplateFiles(); - void processSwagger(Swagger swagger); - - String toApiFilename(String name); - String toModelFilename(String name); - String toModelImport(String name); - String toApiImport(String name); - void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations); - Map postProcessModels(Map objs); - Map postProcessOperations(Map objs); - Map postProcessSupportingFileData(Map objs); - - String apiFilename(String templateName, String tag); - - boolean shouldOverwrite(String filename); -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModel.java deleted file mode 100644 index d1bfc90ba2a..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.models.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; - -public class CodegenModel { - public String parent; - public String name, classname, description, classVarName, modelJson; - public String defaultValue; - public List vars = new ArrayList(); - public Set imports = new HashSet(); - public Boolean hasVars, emptyVars, hasMoreModels, hasEnums; - public ExternalDocs externalDocs; -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelFactory.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelFactory.java deleted file mode 100644 index b369623f37c..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.wordnik.swagger.codegen; - -import java.util.HashMap; -import java.util.Map; - -public final class CodegenModelFactory { - - private static final Map> typeMapping = new HashMap>(); - - /** - * Configure a different implementation class. - * @param type the type that shall be replaced - * @param implementation the implementation class must extend the default class and must provide a public no-arg constructor - */ - public static void setTypeMapping(CodegenModelType type, Class implementation) { - if (!type.getDefaultImplementation().isAssignableFrom(implementation)) { - throw new IllegalArgumentException(implementation.getSimpleName() + " doesn't extend " + type.getDefaultImplementation().getSimpleName()); - } - try { - implementation.newInstance(); - } catch (Exception e) { - throw new IllegalArgumentException(e); - } - typeMapping.put(type, implementation); - } - - @SuppressWarnings("unchecked") - public static T newInstance(CodegenModelType type) { - Class classType = typeMapping.get(type); - try { - return (T) (classType != null ? classType : type.getDefaultImplementation()).newInstance(); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelType.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelType.java deleted file mode 100644 index 62f515b6c69..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelType.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.wordnik.swagger.codegen; - -public enum CodegenModelType { - - MODEL(CodegenModel.class), - OPERATION(CodegenOperation.class), - PARAMETER(CodegenParameter.class), - PROPERTY(CodegenProperty.class), - RESPONSE(CodegenResponse.class), - SECURITY(CodegenSecurity.class); - - private final Class defaultImplementation; - - private CodegenModelType(Class defaultImplementation) { - this.defaultImplementation = defaultImplementation; - } - - public Class getDefaultImplementation() { - return defaultImplementation; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java deleted file mode 100644 index 76055110b92..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.models.*; - -import java.util.*; - -public class CodegenOperation { - public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive, - returnSimpleType, subresourceOperation, isMapContainer, isListContainer, - hasMore = Boolean.TRUE, isMultipart; - public String path, operationId, returnType, httpMethod, returnBaseType, - returnContainer, summary, notes, baseName, defaultResponse; - - public List> consumes, produces; - public CodegenParameter bodyParam; - public List allParams = new ArrayList(); - public List bodyParams = new ArrayList(); - public List pathParams = new ArrayList(); - public List queryParams = new ArrayList(); - public List headerParams = new ArrayList(); - public List formParams = new ArrayList(); - public List authMethods; - public List tags; - public List responses = new ArrayList(); - public final List responseHeaders = new ArrayList(); - public Set imports = new HashSet(); - public List> examples; - public ExternalDocs externalDocs; - - // legacy support - public String nickname; -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java deleted file mode 100644 index 8dc9991daed..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.wordnik.swagger.codegen; - -public class CodegenParameter { - public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam, - isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam; - public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue; - public String jsonSchema; - - /** - * Determines whether this parameter is mandatory. If the parameter is in "path", - * this property is required and its value MUST be true. Otherwise, the property - * MAY be included and its default value is false. - */ - public Boolean required; - - public CodegenParameter copy() { - CodegenParameter output = new CodegenParameter(); - output.isFile = this.isFile; - output.notFile = this.notFile; - output.hasMore = this.hasMore; - output.isContainer = this.isContainer; - output.secondaryParam = this.secondaryParam; - output.baseName = this.baseName; - output.paramName = this.paramName; - output.dataType = this.dataType; - output.collectionFormat = this.collectionFormat; - output.description = this.description; - output.baseType = this.baseType; - output.isFormParam = this.isFormParam; - output.isQueryParam = this.isQueryParam; - output.isPathParam = this.isPathParam; - output.isHeaderParam = this.isHeaderParam; - output.isCookieParam = this.isCookieParam; - output.isBodyParam = this.isBodyParam; - output.required = this.required; - output.jsonSchema = this.jsonSchema; - output.defaultValue = this.defaultValue; - - return output; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java deleted file mode 100644 index 921ca90f189..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.wordnik.swagger.codegen; - -import java.util.*; - -public class CodegenProperty { - public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum, - name, min, max, defaultValue, baseType, containerType; - - /** maxLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.1 */ - public Integer maxLength; - /** minLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.2 */ - public Integer minLength; - /** pattern validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.3 */ - public String pattern; - /** A free-form property to include an example of an instance for this schema. */ - public String example; - - public String jsonSchema; - public Double minimum; - public Double maximum; - public Boolean exclusiveMinimum; - public Boolean exclusiveMaximum; - public Boolean hasMore = null, required = null, secondaryParam = null; - public Boolean isPrimitiveType, isContainer, isNotContainer; - public boolean isEnum; - public List _enum; - public Map allowableValues; -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenResponse.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenResponse.java deleted file mode 100644 index 02627eec1bd..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.wordnik.swagger.codegen; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class CodegenResponse { - public String code, message; - public Boolean hasMore; - public List> examples; - public final List headers = new ArrayList(); - public String dataType, baseType, containerType; - public Boolean isDefault; - public Boolean simpleType; - public Boolean primitiveType; - public Boolean isMapContainer; - public Boolean isListContainer; - public Object schema; - public String jsonSchema; - public boolean isWildcard() { return "0".equals(code) || "default".equals(code); } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java deleted file mode 100644 index 00d56ea213e..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.wordnik.swagger.codegen; - -public class CodegenSecurity { - public String name; - public String type; - public Boolean hasMore, isBasic, isOAuth, isApiKey; - // ApiKey specific - public String keyParamName; - public Boolean isKeyInQuery, isKeyInHeader; -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenType.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenType.java deleted file mode 100644 index 5a39a23fde1..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.fasterxml.jackson.annotation.*; - -import java.util.Map; -import java.util.HashMap; - -public enum CodegenType { - CLIENT, SERVER, DOCUMENTATION, OTHER; - - private static Map names = new HashMap(); - - static { - names.put("client", CLIENT); - names.put("server", SERVER); - names.put("documentation", DOCUMENTATION); - names.put("other", OTHER); - } - - @JsonCreator - public static CodegenType forValue(String value) { - return names.get(value.toLowerCase()); - } - - @JsonValue - public String toValue() { - for (Map.Entry entry : names.entrySet()) { - if (entry.getValue() == this) - return entry.getKey(); - } - - return null; // or fail - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java deleted file mode 100644 index d7788ef8865..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java +++ /dev/null @@ -1,1277 +0,0 @@ -package com.wordnik.swagger.codegen; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Nullable; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.wordnik.swagger.codegen.examples.ExampleGenerator; -import com.wordnik.swagger.models.ArrayModel; -import com.wordnik.swagger.models.ComposedModel; -import com.wordnik.swagger.models.Model; -import com.wordnik.swagger.models.ModelImpl; -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.models.RefModel; -import com.wordnik.swagger.models.Response; -import com.wordnik.swagger.models.Swagger; -import com.wordnik.swagger.models.auth.ApiKeyAuthDefinition; -import com.wordnik.swagger.models.auth.BasicAuthDefinition; -import com.wordnik.swagger.models.auth.In; -import com.wordnik.swagger.models.auth.SecuritySchemeDefinition; -import com.wordnik.swagger.models.parameters.BodyParameter; -import com.wordnik.swagger.models.parameters.CookieParameter; -import com.wordnik.swagger.models.parameters.FormParameter; -import com.wordnik.swagger.models.parameters.HeaderParameter; -import com.wordnik.swagger.models.parameters.Parameter; -import com.wordnik.swagger.models.parameters.PathParameter; -import com.wordnik.swagger.models.parameters.QueryParameter; -import com.wordnik.swagger.models.parameters.SerializableParameter; -import com.wordnik.swagger.models.properties.AbstractNumericProperty; -import com.wordnik.swagger.models.properties.ArrayProperty; -import com.wordnik.swagger.models.properties.BooleanProperty; -import com.wordnik.swagger.models.properties.DateProperty; -import com.wordnik.swagger.models.properties.DateTimeProperty; -import com.wordnik.swagger.models.properties.DecimalProperty; -import com.wordnik.swagger.models.properties.DoubleProperty; -import com.wordnik.swagger.models.properties.FloatProperty; -import com.wordnik.swagger.models.properties.IntegerProperty; -import com.wordnik.swagger.models.properties.LongProperty; -import com.wordnik.swagger.models.properties.MapProperty; -import com.wordnik.swagger.models.properties.Property; -import com.wordnik.swagger.models.properties.PropertyBuilder; -import com.wordnik.swagger.models.properties.RefProperty; -import com.wordnik.swagger.models.properties.StringProperty; -import com.wordnik.swagger.util.Json; - - -public class DefaultCodegen { - private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); - - protected String outputFolder = ""; - protected Set defaultIncludes = new HashSet(); - protected Map typeMapping = new HashMap(); - protected Map instantiationTypes = new HashMap(); - protected Set reservedWords = new HashSet(); - protected Set languageSpecificPrimitives = new HashSet(); - protected Map importMapping = new HashMap(); - protected String modelPackage = "", apiPackage = "", fileSuffix; - protected Map apiTemplateFiles = new HashMap(); - protected Map modelTemplateFiles = new HashMap(); - protected String templateDir; - protected Map additionalProperties = new HashMap(); - protected List supportingFiles = new ArrayList(); - protected List cliOptions = new ArrayList(); - - public List cliOptions() { - return cliOptions; - } - - public void processOpts(){ - if(additionalProperties.containsKey("templateDir")) { - this.setTemplateDir((String)additionalProperties.get("templateDir")); - } - - if(additionalProperties.containsKey("modelPackage")) { - this.setModelPackage((String)additionalProperties.get("modelPackage")); - } - - if(additionalProperties.containsKey("apiPackage")) { - this.setApiPackage((String)additionalProperties.get("apiPackage")); - } - } - - // override with any special post-processing - public Map postProcessModels(Map objs) { - return objs; - } - - // override with any special post-processing - public Map postProcessOperations(Map objs) { - return objs; - } - - // override with any special post-processing - public Map postProcessSupportingFileData(Map objs) { - return objs; - } - - // override with any special handling of the entire swagger spec - public void processSwagger(Swagger swagger) {} - - // override with any special text escaping logic - public String escapeText(String input) { - if(input != null) { - String output = input.replaceAll("\n", "\\\\n"); - output = output.replace("\"", "\\\""); - return output; - } - return input; - } - - public Set defaultIncludes() { - return defaultIncludes; - } - public Map typeMapping() { - return typeMapping; - } - public Map instantiationTypes() { - return instantiationTypes; - } - public Set reservedWords() { - return reservedWords; - } - public Set languageSpecificPrimitives() { - return languageSpecificPrimitives; - } - public Map importMapping() { - return importMapping; - } - public String modelPackage() { - return modelPackage; - } - public String apiPackage() { - return apiPackage; - } - public String fileSuffix() { - return fileSuffix; - } - public String templateDir() { - return templateDir; - } - public Map apiTemplateFiles() { - return apiTemplateFiles; - } - public Map modelTemplateFiles() { - return modelTemplateFiles; - } - - public String apiFileFolder() { - return outputFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - public Map additionalProperties() { - return additionalProperties; - } - public List supportingFiles() { - return supportingFiles; - } - public String outputFolder() { - return outputFolder; - } - - public void setOutputDir(String dir) { - this.outputFolder = dir; - } - public String getOutputDir() { - return outputFolder(); - } - - public void setTemplateDir(String templateDir) { - this.templateDir = templateDir; - } - - public void setModelPackage(String modelPackage) { - this.modelPackage = modelPackage; - } - - public void setApiPackage(String apiPackage) { - this.apiPackage = apiPackage; - } - - public String toApiFilename(String name) { - return toApiName(name); - } - - public String toApiVarName(String name) { - return snakeCase(name); - } - - public String toModelFilename(String name) { - return initialCaps(name); - } - - public String toOperationId(String operationId) { return operationId; } - - public String toVarName(String name) { - if(reservedWords.contains(name)) - return escapeReservedWord(name); - else - return name; - } - - public String toParamName(String name) { - name = removeNonNameElementToCamelCase(name); - if(reservedWords.contains(name)) { - return escapeReservedWord(name); - } - return name; - } - - public String toEnumName(CodegenProperty property) { - return StringUtils.capitalize(property.name) + "Enum"; - } - - public String escapeReservedWord(String name) { - throw new RuntimeException("reserved word " + name + " not allowed"); - } - - public String toModelImport(String name) { - if("".equals(modelPackage())) - return name; - else - return modelPackage() + "." + name; - } - - public String toApiImport(String name) { - return apiPackage() + "." + name; - } - - public DefaultCodegen() { - defaultIncludes = new HashSet( - Arrays.asList("double", - "int", - "long", - "short", - "char", - "float", - "String", - "boolean", - "Boolean", - "Double", - "Void", - "Integer", - "Long", - "Float") - ); - - typeMapping = new HashMap(); - typeMapping.put("array", "List"); - typeMapping.put("map", "Map"); - typeMapping.put("List", "List"); - typeMapping.put("boolean", "Boolean"); - typeMapping.put("string", "String"); - typeMapping.put("int", "Integer"); - typeMapping.put("float", "Float"); - typeMapping.put("number", "BigDecimal"); - typeMapping.put("DateTime", "Date"); - typeMapping.put("long", "Long"); - typeMapping.put("short", "Short"); - typeMapping.put("char", "String"); - typeMapping.put("double", "Double"); - typeMapping.put("object", "Object"); - typeMapping.put("integer", "Integer"); - - instantiationTypes = new HashMap(); - - reservedWords = new HashSet(); - - importMapping = new HashMap(); - importMapping.put("BigDecimal", "java.math.BigDecimal"); - importMapping.put("UUID", "java.util.UUID"); - importMapping.put("File", "java.io.File"); - importMapping.put("Date", "java.util.Date"); - importMapping.put("Timestamp", "java.sql.Timestamp"); - importMapping.put("Map", "java.util.Map"); - importMapping.put("HashMap", "java.util.HashMap"); - importMapping.put("Array", "java.util.List"); - importMapping.put("ArrayList", "java.util.ArrayList"); - importMapping.put("List", "java.util.*"); - importMapping.put("Set", "java.util.*"); - importMapping.put("DateTime", "org.joda.time.*"); - importMapping.put("LocalDateTime", "org.joda.time.*"); - importMapping.put("LocalDate", "org.joda.time.*"); - importMapping.put("LocalTime", "org.joda.time.*"); - - cliOptions.add(new CliOption("modelPackage", "package for generated models")); - cliOptions.add(new CliOption("apiPackage", "package for generated api classes")); - } - - - public String generateExamplePath(String path, Operation operation) { - StringBuilder sb = new StringBuilder(); - sb.append(path); - - if(operation.getParameters() != null) { - int count = 0; - - for(Parameter param : operation.getParameters()) { - if(param instanceof QueryParameter) { - StringBuilder paramPart = new StringBuilder(); - QueryParameter qp = (QueryParameter) param; - - if(count == 0) - paramPart.append("?"); - else - paramPart.append(","); - count += 1; - if(!param.getRequired()) - paramPart.append("["); - paramPart.append(param.getName()).append("="); - paramPart.append("{"); - if(qp.getCollectionFormat() != null) { - paramPart.append(param.getName() + "1"); - if("csv".equals(qp.getCollectionFormat())) - paramPart.append(","); - else if("pipes".equals(qp.getCollectionFormat())) - paramPart.append("|"); - else if("tsv".equals(qp.getCollectionFormat())) - paramPart.append("\t"); - else if("multi".equals(qp.getCollectionFormat())) { - paramPart.append("&").append(param.getName()).append("="); - paramPart.append(param.getName() + "2"); - } - } - else { - paramPart.append(param.getName()); - } - paramPart.append("}"); - if(!param.getRequired()) - paramPart.append("]"); - sb.append(paramPart.toString()); - } - } - } - - return sb.toString(); - } - - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return instantiationTypes.get("map") + ""; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return instantiationTypes.get("array") + "<" + inner + ">"; - } - else - return null; - } - - public String toDefaultValue(Property p) { - if(p instanceof StringProperty) - return "null"; - else if (p instanceof BooleanProperty) - return "null"; - else if(p instanceof DateProperty) - return "null"; - else if(p instanceof DateTimeProperty) - return "null"; - else if (p instanceof DoubleProperty) { - DoubleProperty dp = (DoubleProperty) p; - if(dp.getDefault() != null) { - return dp.getDefault().toString(); - } - return "null"; - } - else if (p instanceof FloatProperty) { - FloatProperty dp = (FloatProperty) p; - if(dp.getDefault() != null) { - return dp.getDefault().toString(); - } - return "null"; - } - 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(); - } - return "null"; - } - else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "new HashMap() "; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return "new ArrayList<" + inner + ">() "; - } - else - return "null"; - } - - /** - * returns the swagger type for the property - **/ - public String getSwaggerType(Property p) { - String datatype = null; - if(p instanceof StringProperty) - datatype = "string"; - else if (p instanceof BooleanProperty) - datatype = "boolean"; - else if(p instanceof DateProperty) - datatype = "date"; - else if(p instanceof DateTimeProperty) - datatype = "DateTime"; - else if (p instanceof DoubleProperty) - datatype = "double"; - else if (p instanceof FloatProperty) - datatype = "float"; - else if (p instanceof IntegerProperty) - datatype = "integer"; - else if (p instanceof LongProperty) - datatype = "long"; - else if (p instanceof MapProperty) - datatype = "map"; - else if (p instanceof DecimalProperty) - datatype = "number"; - else if (p instanceof RefProperty) { - RefProperty r = (RefProperty)p; - datatype = r.get$ref(); - if(datatype.indexOf("#/definitions/") == 0) - datatype = datatype.substring("#/definitions/".length()); - } - else { - if(p != null) datatype = p.getType(); - } - return datatype; - } - - public String snakeCase(String name) { - return (name.length() > 0) ? (Character.toLowerCase(name.charAt(0)) + name.substring(1)) : ""; - } - - public String initialCaps(String name) { - return StringUtils.capitalize(name); - } - - public String getTypeDeclaration(String name) { - return name; - } - - public String getTypeDeclaration(Property p) { - String swaggerType = getSwaggerType(p); - if(typeMapping.containsKey(swaggerType)) - return typeMapping.get(swaggerType); - return swaggerType; - } - - public String toApiName(String name) { - if(name.length() == 0) - return "DefaultApi"; - return initialCaps(name) + "Api"; - } - - public String toModelName(String name) { - return initialCaps(name); - } - - public CodegenModel fromModel(String name, Model model) { - CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL); - if(reservedWords.contains(name)) - m.name = escapeReservedWord(name); - else - m.name = name; - m.description = escapeText(model.getDescription()); - m.classname = toModelName(name); - m.classVarName = toVarName(name); - m.modelJson = Json.pretty(model); - m.externalDocs = model.getExternalDocs(); - if(model instanceof ArrayModel) { - ArrayModel am = (ArrayModel) model; - ArrayProperty arrayProperty = new ArrayProperty(am.getItems()); - addParentContainer(m, name, arrayProperty); - } - else if (model instanceof RefModel) { - // TODO - } else if (model instanceof ComposedModel) { - final ComposedModel composed = (ComposedModel) model; - final RefModel parent = (RefModel) composed.getParent(); - final String parentModel = toModelName(parent.getSimpleRef()); - m.parent = parentModel; - addImport(m, parentModel); - final ModelImpl child = (ModelImpl) composed.getChild(); - addVars(m, child.getProperties(), child.getRequired()); - } else { - ModelImpl impl = (ModelImpl) model; - if(impl.getAdditionalProperties() != null) { - MapProperty mapProperty = new MapProperty(impl.getAdditionalProperties()); - addParentContainer(m, name, mapProperty); - } - addVars(m, impl.getProperties(), impl.getRequired()); - } - return m; - } - - public String getterAndSetterCapitalize(String name) { - if (name == null || name.length() == 0) { - return name; - } - - return camelize(toVarName(name)); - - } - - public CodegenProperty fromProperty(String name, Property p) { - if(p == null) { - LOGGER.error("unexpected missing property for name " + null); - return null; - } - CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY); - - property.name = toVarName(name); - property.baseName = name; - property.description = escapeText(p.getDescription()); - property.getter = "get" + getterAndSetterCapitalize(name); - property.setter = "set" + getterAndSetterCapitalize(name); - property.example = p.getExample(); - property.defaultValue = toDefaultValue(p); - property.jsonSchema = Json.pretty(p); - - String type = getSwaggerType(p); - if(p instanceof AbstractNumericProperty) { - AbstractNumericProperty np = (AbstractNumericProperty) p; - property.minimum = np.getMinimum(); - property.maximum = np.getMaximum(); - property.exclusiveMinimum = np.getExclusiveMinimum(); - property.exclusiveMaximum = np.getExclusiveMaximum(); - - // legacy support - Map allowableValues = new HashMap(); - if(np.getMinimum() != null) - allowableValues.put("min", np.getMinimum()); - if(np.getMaximum() != null) - allowableValues.put("max", np.getMaximum()); - property.allowableValues = allowableValues; - } - - if(p instanceof StringProperty) { - StringProperty sp = (StringProperty) p; - property.maxLength = sp.getMaxLength(); - property.minLength = sp.getMinLength(); - property.pattern = sp.getPattern(); - if(sp.getEnum() != null) { - List _enum = sp.getEnum(); - property._enum = _enum; - property.isEnum = true; - - // legacy support - Map allowableValues = new HashMap(); - allowableValues.put("values", _enum); - property.allowableValues = allowableValues; - } - } - - property.datatype = getTypeDeclaration(p); - - // this can cause issues for clients which don't support enums - if(property.isEnum) - property.datatypeWithEnum = toEnumName(property); - else - property.datatypeWithEnum = property.datatype; - - property.baseType = getSwaggerType(p); - - if(p instanceof ArrayProperty) { - property.isContainer = true; - property.containerType = "array"; - ArrayProperty ap = (ArrayProperty) p; - CodegenProperty cp = fromProperty("inner", ap.getItems()); - if(cp == null) { - LOGGER.warn("skipping invalid property " + Json.pretty(p)); - } - else { - property.baseType = getSwaggerType(p); - if(!languageSpecificPrimitives.contains(cp.baseType)) - property.complexType = cp.baseType; - else - property.isPrimitiveType = true; - } - } - else if(p instanceof MapProperty) { - property.isContainer = true; - property.containerType = "map"; - MapProperty ap = (MapProperty) p; - CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties()); - - property.baseType = getSwaggerType(p); - if(!languageSpecificPrimitives.contains(cp.baseType)) - property.complexType = cp.baseType; - else - property.isPrimitiveType = true; - } - else { - setNonArrayMapProperty(property, type); - } - return property; - } - - protected void setNonArrayMapProperty(CodegenProperty property, String type) { - property.isNotContainer = true; - if(languageSpecificPrimitives().contains(type)) - property.isPrimitiveType = true; - else - property.complexType = property.baseType; - } - - private Response findMethodResponse(Map responses) { - - String code = null; - for(String responseCode : responses.keySet()) { - if (responseCode.startsWith("2") || responseCode.equals("default")) { - if (code == null || code.compareTo(responseCode) > 0) { - code = responseCode; - } - } - } - if (code == null) - return null; - return responses.get(code); - } - - public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map definitions) { - CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION); - Set imports = new HashSet(); - - String operationId = operation.getOperationId(); - if(operationId == null) { - String tmpPath = path; - tmpPath = tmpPath.replaceAll("\\{", ""); - tmpPath = tmpPath.replaceAll("\\}", ""); - String[] parts = (tmpPath + "/" + httpMethod).split("/"); - StringBuilder builder = new StringBuilder(); - if("/".equals(tmpPath)) { - // must be root tmpPath - builder.append("root"); - } - for(int i = 0; i < parts.length; i++) { - String part = parts[i]; - if(part.length() > 0) { - if(builder.toString().length() == 0) - part = Character.toLowerCase(part.charAt(0)) + part.substring(1); - else - part = initialCaps(part); - builder.append(part); - } - } - operationId = builder.toString(); - LOGGER.warn("generated operationId " + operationId); - } - operationId = removeNonNameElementToCamelCase(operationId); - op.path = path; - op.operationId = toOperationId(operationId); - op.summary = escapeText(operation.getSummary()); - op.notes = escapeText(operation.getDescription()); - op.tags = operation.getTags(); - - if(operation.getConsumes() != null && operation.getConsumes().size() > 0) { - List> c = new ArrayList>(); - int count = 0; - for(String key: operation.getConsumes()) { - Map mediaType = new HashMap(); - mediaType.put("mediaType", key); - count += 1; - if (count < operation.getConsumes().size()) - mediaType.put("hasMore", "true"); - else - mediaType.put("hasMore", null); - c.add(mediaType); - } - op.consumes = c; - op.hasConsumes = true; - } - - if(operation.getProduces() != null && operation.getProduces().size() > 0) { - List> c = new ArrayList>(); - int count = 0; - for(String key: operation.getProduces()) { - Map mediaType = new HashMap(); - mediaType.put("mediaType", key); - count += 1; - if (count < operation.getProduces().size()) - mediaType.put("hasMore", "true"); - else - mediaType.put("hasMore", null); - c.add(mediaType); - } - op.produces = c; - op.hasProduces = true; - } - - if (operation.getResponses() != null && !operation.getResponses().isEmpty()) { - Response methodResponse = findMethodResponse(operation.getResponses()); - - for (Map.Entry entry : operation.getResponses().entrySet()) { - Response response = entry.getValue(); - CodegenResponse r = fromResponse(entry.getKey(), response); - r.hasMore = true; - if(r.baseType != null && - !defaultIncludes.contains(r.baseType) && - !languageSpecificPrimitives.contains(r.baseType)) - imports.add(r.baseType); - r.isDefault = response == methodResponse; - op.responses.add(r); - } - op.responses.get(op.responses.size() - 1).hasMore = false; - - if(methodResponse != null) { - if (methodResponse.getSchema() != null) { - CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); - - Property responseProperty = methodResponse.getSchema(); - - if(responseProperty instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) responseProperty; - CodegenProperty innerProperty = fromProperty("response", ap.getItems()); - op.returnBaseType = innerProperty.baseType; - } - else { - if(cm.complexType != null) - op.returnBaseType = cm.complexType; - else - op.returnBaseType = cm.baseType; - } - op.examples = new ExampleGenerator(definitions).generate(methodResponse.getExamples(), operation.getProduces(), responseProperty); - op.defaultResponse = toDefaultValue(responseProperty); - op.returnType = cm.datatype; - if(cm.isContainer != null) { - op.returnContainer = cm.containerType; - if("map".equals(cm.containerType)) - op.isMapContainer = Boolean.TRUE; - else if ("list".equalsIgnoreCase(cm.containerType)) - op.isListContainer = Boolean.TRUE; - else if ("array".equalsIgnoreCase(cm.containerType)) - op.isListContainer = Boolean.TRUE; - } - else - op.returnSimpleType = true; - if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null) - op.returnTypeIsPrimitive = true; - } - addHeaders(methodResponse, op.responseHeaders); - } - } - - List parameters = operation.getParameters(); - CodegenParameter bodyParam = null; - List allParams = new ArrayList(); - List bodyParams = new ArrayList(); - List pathParams = new ArrayList(); - List queryParams = new ArrayList(); - List headerParams = new ArrayList(); - List cookieParams = new ArrayList(); - List formParams = new ArrayList(); - - if(parameters != null) { - for(Parameter param : parameters) { - CodegenParameter p = fromParameter(param, imports); - allParams.add(p); - if(param instanceof QueryParameter) { - p.isQueryParam = new Boolean(true); - queryParams.add(p.copy()); - } - else if(param instanceof PathParameter) { - p.required = true; - p.isPathParam = new Boolean(true); - pathParams.add(p.copy()); - } - else if(param instanceof HeaderParameter) { - p.isHeaderParam = new Boolean(true); - headerParams.add(p.copy()); - } - else if(param instanceof CookieParameter) { - p.isCookieParam = new Boolean(true); - cookieParams.add(p.copy()); - } - else if(param instanceof BodyParameter) { - p.isBodyParam = new Boolean(true); - bodyParam = p; - bodyParams.add(p.copy()); - } - else if(param instanceof FormParameter) { - if("file".equalsIgnoreCase(((FormParameter)param).getType())) - p.isFile = true; - else - p.notFile = true; - p.isFormParam = new Boolean(true); - formParams.add(p.copy()); - } - } - } - for(String i: imports) { - if(!defaultIncludes.contains(i) && !languageSpecificPrimitives.contains(i)){ - op.imports.add(i); - } - } - op.bodyParam = bodyParam; - op.httpMethod = httpMethod.toUpperCase(); - op.allParams = addHasMore(allParams); - op.bodyParams = addHasMore(bodyParams); - op.pathParams = addHasMore(pathParams); - op.queryParams = addHasMore(queryParams); - op.headerParams = addHasMore(headerParams); - // op.cookieParams = cookieParams; - op.formParams = addHasMore(formParams); - // legacy support - op.nickname = op.operationId; - - - if(op.allParams.size() > 0) - op.hasParams = true; - op.externalDocs = operation.getExternalDocs(); - - return op; - } - - public CodegenResponse fromResponse(String responseCode, Response response) { - CodegenResponse r = CodegenModelFactory.newInstance(CodegenModelType.RESPONSE); - if("default".equals(responseCode)) - r.code = "0"; - else - r.code = responseCode; - r.message = response.getDescription(); - r.schema = response.getSchema(); - r.examples = toExamples(response.getExamples()); - r.jsonSchema = Json.pretty(response); - addHeaders(response, r.headers); - - if (r.schema != null) { - Property responseProperty = response.getSchema(); - responseProperty.setRequired(true); - CodegenProperty cm = fromProperty("response", responseProperty); - - if(responseProperty instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) responseProperty; - CodegenProperty innerProperty = fromProperty("response", ap.getItems()); - r.baseType = innerProperty.baseType; - } - else { - if(cm.complexType != null) - r.baseType = cm.complexType; - else - r.baseType = cm.baseType; - } - r.dataType = cm.datatype; - if(cm.isContainer != null) { - r.simpleType = false; - r.containerType = cm.containerType; - r.isMapContainer = "map".equals(cm.containerType); - r.isListContainer = "list".equals(cm.containerType); - } - else - r.simpleType = true; - r.primitiveType = (r.baseType == null ||languageSpecificPrimitives().contains(r.baseType)); - } - if (r.baseType == null) { - r.isMapContainer = false; - r.isListContainer = false; - r.primitiveType = true; - r.simpleType = true; - } - return r; - } - - public CodegenParameter fromParameter(Parameter param, Set imports) { - CodegenParameter p = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER); - p.baseName = param.getName(); - p.description = escapeText(param.getDescription()); - if(param.getRequired()) - p.required = param.getRequired(); - p.jsonSchema = Json.pretty(param); - - // move the defaultValue for headers, forms and params - if(param instanceof QueryParameter) { - p.defaultValue = ((QueryParameter)param).getDefaultValue(); - } else if(param instanceof HeaderParameter) { - p.defaultValue = ((HeaderParameter)param).getDefaultValue(); - } else if(param instanceof FormParameter) { - p.defaultValue = ((FormParameter)param).getDefaultValue(); - } - - if(param instanceof SerializableParameter) { - SerializableParameter qp = (SerializableParameter) param; - Property property = null; - String collectionFormat = null; - if("array".equals(qp.getType())) { - Property inner = qp.getItems(); - if(inner == null) { - LOGGER.warn("warning! No inner type supplied for array parameter \"" + qp.getName() + "\", using String"); - inner = new StringProperty().description("//TODO automatically added by swagger-codegen"); - } - property = new ArrayProperty(inner); - collectionFormat = qp.getCollectionFormat(); - CodegenProperty pr = fromProperty("inner", inner); - p.baseType = pr.datatype; - p.isContainer = true; - imports.add(pr.baseType); - } - else if("object".equals(qp.getType())) { - Property inner = qp.getItems(); - if(inner == null) { - LOGGER.warn("warning! No inner type supplied for map parameter \"" + qp.getName() + "\", using String"); - inner = new StringProperty().description("//TODO automatically added by swagger-codegen"); - } - property = new MapProperty(inner); - collectionFormat = qp.getCollectionFormat(); - CodegenProperty pr = fromProperty("inner", inner); - p.baseType = pr.datatype; - imports.add(pr.baseType); - } - else - property = PropertyBuilder.build(qp.getType(), qp.getFormat(), null); - if(property == null) { - LOGGER.warn("warning! Property type \"" + qp.getType() + "\" not found for parameter \"" + param.getName() + "\", using String"); - property = new StringProperty().description("//TODO automatically added by swagger-codegen. Type was " + qp.getType() + " but not supported"); - } - property.setRequired(param.getRequired()); - CodegenProperty model = fromProperty(qp.getName(), property); - p.collectionFormat = collectionFormat; - p.dataType = model.datatype; - p.paramName = toParamName(qp.getName()); - - if(model.complexType != null) { - imports.add(model.complexType); - } - } - else { - BodyParameter bp = (BodyParameter) param; - Model model = bp.getSchema(); - - if(model instanceof ModelImpl) { - ModelImpl impl = (ModelImpl) model; - CodegenModel cm = fromModel(bp.getName(), impl); - if(cm.emptyVars != null && cm.emptyVars == false) { - p.dataType = getTypeDeclaration(cm.classname); - imports.add(p.dataType); - } - else { - // TODO: missing format, so this will not always work - Property prop = PropertyBuilder.build(impl.getType(), null, null); - prop.setRequired(bp.getRequired()); - CodegenProperty cp = fromProperty("property", prop); - if(cp != null) { - p.dataType = cp.datatype; - } - } - } - else if(model instanceof ArrayModel) { - // to use the built-in model parsing, we unwrap the ArrayModel - // and get a single property from it - ArrayModel impl = (ArrayModel) model; - CodegenModel cm = fromModel(bp.getName(), impl); - // get the single property - ArrayProperty ap = new ArrayProperty().items(impl.getItems()); - ap.setRequired(param.getRequired()); - CodegenProperty cp = fromProperty("inner", ap); - if(cp.complexType != null) { - imports.add(cp.complexType); - } - imports.add(cp.baseType); - p.dataType = cp.datatype; - p.isContainer = true; - } - else{ - Model sub = bp.getSchema(); - if(sub instanceof RefModel) { - String name = ((RefModel)sub).getSimpleRef(); - if(typeMapping.containsKey(name)) - name = typeMapping.get(name); - else { - name = toModelName(name); - if(defaultIncludes.contains(name)) { - imports.add(name); - } - imports.add(name); - name = getTypeDeclaration(name); - } - p.dataType = name; - } - } - p.paramName = toParamName(bp.getName()); - } - return p; - } - - public List fromSecurity(Map schemes) { - if(schemes == null) - return null; - - List secs = new ArrayList(schemes.size()); - for (Iterator> it = schemes.entrySet().iterator(); it.hasNext();) { - final Map.Entry entry = it.next(); - final SecuritySchemeDefinition schemeDefinition = entry.getValue(); - - CodegenSecurity sec = CodegenModelFactory.newInstance(CodegenModelType.SECURITY); - sec.name = entry.getKey(); - sec.type = schemeDefinition.getType(); - - if (schemeDefinition instanceof ApiKeyAuthDefinition) { - final ApiKeyAuthDefinition apiKeyDefinition = (ApiKeyAuthDefinition) schemeDefinition; - sec.isBasic = sec.isOAuth = false; - sec.isApiKey = true; - sec.keyParamName = apiKeyDefinition.getName(); - sec.isKeyInHeader = apiKeyDefinition.getIn() == In.HEADER; - sec.isKeyInQuery = !sec.isKeyInHeader; - } else { - sec.isKeyInHeader = sec.isKeyInQuery = sec.isApiKey = false; - sec.isBasic = schemeDefinition instanceof BasicAuthDefinition; - sec.isOAuth = !sec.isBasic; - } - - sec.hasMore = it.hasNext(); - secs.add(sec); - } - return secs; - } - - protected List> toExamples(Map examples) { - if(examples == null) - return null; - - final List> output = new ArrayList>(examples.size()); - for(Map.Entry entry : examples.entrySet()) { - final Map kv = new HashMap(); - kv.put("contentType", entry.getKey()); - kv.put("example", entry.getValue()); - output.add(kv); - } - return output; - } - - private void addHeaders(Response response, List target) { - if (response.getHeaders() != null) { - for (Map.Entry headers : response.getHeaders().entrySet()) { - target.add(fromProperty(headers.getKey(), headers.getValue())); - } - } - } - - private List addHasMore(List objs) { - if(objs != null) { - for(int i = 0; i < objs.size(); i++) { - if(i > 0) - objs.get(i).secondaryParam = new Boolean(true); - if(i < objs.size() - 1) - objs.get(i).hasMore = new Boolean(true); - } - } - return objs; - } - - private Map addHasMore(Map objs) { - if(objs != null) { - for(int i = 0; i < objs.size() - 1; i++) { - if(i > 0) - objs.put("secondaryParam", new Boolean(true)); - if(i < objs.size() - 1) - objs.put("hasMore", true); - } - } - return objs; - } - - - public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { - List opList = operations.get(tag); - if(opList == null) { - opList = new ArrayList(); - operations.put(tag, opList); - } - opList.add(co); - co.baseName = tag; - } - - private void addParentContainer(CodegenModel m, String name, Property property) { - final CodegenProperty tmp = fromProperty(name, property); - addImport(m, tmp.complexType); - m.parent = toInstantiationType(property); - final String containerType = tmp.containerType; - final String instantiationType = instantiationTypes.get(containerType); - if (instantiationType != null) { - addImport(m, instantiationType); - } - final String mappedType = typeMapping.get(containerType); - if (mappedType != null) { - addImport(m, mappedType); - } - } - - private void addImport(CodegenModel m, String type) { - if (type != null && !languageSpecificPrimitives.contains(type) && !defaultIncludes.contains(type)) { - m.imports.add(type); - } - } - - private void addVars(CodegenModel m, Map properties, Collection required) { - if (properties != null && properties.size() > 0) { - m.hasVars = true; - m.hasEnums = false; - final int totalCount = properties.size(); - final Set mandatory = required == null ? Collections. emptySet() : new HashSet(required); - int count = 0; - for (Map.Entry entry : properties.entrySet()) { - final String key = entry.getKey(); - final Property prop = entry.getValue(); - - if (prop == null) { - LOGGER.warn("null property for " + key); - } else { - final CodegenProperty cp = fromProperty(key, prop); - cp.required = mandatory.contains(key) ? true : null; - if (cp.isEnum) { - m.hasEnums = true; - } - count += 1; - if (count != totalCount) - cp.hasMore = true; - if (cp.isContainer != null) { - addImport(m, typeMapping.get("array")); - } - addImport(m, cp.baseType); - addImport(m, cp.complexType); - m.vars.add(cp); - } - } - } else { - m.emptyVars = true; - } - } - - /* underscore and camelize are copied from Twitter elephant bird - * https://github.com/twitter/elephant-bird/blob/master/core/src/main/java/com/twitter/elephantbird/util/Strings.java - */ - - /** - * Underscore the given word. - * @param word The word - * @return The underscored version of the word - */ - public static String underscore(String word) { - String firstPattern = "([A-Z]+)([A-Z][a-z])"; - String secondPattern = "([a-z\\d])([A-Z])"; - String replacementPattern = "$1_$2"; - // Replace package separator with slash. - word = word.replaceAll("\\.", "/"); - // Replace $ with two underscores for inner classes. - word = word.replaceAll("\\$", "__"); - // Replace capital letter with _ plus lowercase letter. - word = word.replaceAll(firstPattern, replacementPattern); - word = word.replaceAll(secondPattern, replacementPattern); - word = word.replace('-', '_'); - word = word.toLowerCase(); - return word; - } - - /** - * Remove characters not suitable for variable or method name from the input and camelize it - * @param name - * @return - */ - public String removeNonNameElementToCamelCase(String name) { - String nonNameElementPattern = "[-_:;#]"; - name = StringUtils.join(Lists.transform(Lists.newArrayList(name.split(nonNameElementPattern)), new Function() { - @Nullable - @Override - public String apply(String input) { - return StringUtils.capitalize(input); - } - }), ""); - if (name.length() > 0) { - name = name.substring(0, 1).toLowerCase() + name.substring(1); - } - return name; - } - - public static String camelize(String word) { - return camelize(word, false); - } - - public static String camelize(String word, boolean lowercaseFirstLetter) { - // Replace all slashes with dots (package separator) - Pattern p = Pattern.compile("\\/(.?)"); - Matcher m = p.matcher(word); - while (m.find()) { - word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/); - m = p.matcher(word); - } - - // case out dots - String[] parts = word.split("\\."); - StringBuilder f = new StringBuilder(); - for(String z : parts) { - if(z.length() > 0) - f.append(Character.toUpperCase(z.charAt(0))).append(z.substring(1)); - } - word = f.toString(); - - m = p.matcher(word); - while (m.find()) { - word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase()*/); - m = p.matcher(word); - } - - // Uppercase the class name. - p = Pattern.compile("(\\.?)(\\w)([^\\.]*)$"); - m = p.matcher(word); - if (m.find()) { - String rep = m.group(1) + m.group(2).toUpperCase() + m.group(3); - rep = rep.replaceAll("\\$", "\\\\\\$"); - word = m.replaceAll(rep); - } - - // Replace two underscores with $ to support inner classes. - p = Pattern.compile("(__)(.)"); - m = p.matcher(word); - while (m.find()) { - word = m.replaceFirst("\\$" + m.group(2).toUpperCase()); - m = p.matcher(word); - } - - // Remove all underscores - p = Pattern.compile("(_)(.)"); - m = p.matcher(word); - while (m.find()) { - word = m.replaceFirst(m.group(2).toUpperCase()); - m = p.matcher(word); - } - - if (lowercaseFirstLetter) { - word = word.substring(0, 1).toLowerCase() + word.substring(1); - } - - return word; - } - - - public String apiFilename(String templateName, String tag) - { - String suffix = apiTemplateFiles().get(templateName); - return apiFileFolder() + File.separator + toApiFilename(tag) + suffix; - } - - public boolean shouldOverwrite( String filename ){ - return true; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java deleted file mode 100644 index d57926b7e3c..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java +++ /dev/null @@ -1,487 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; -import com.wordnik.swagger.models.Contact; -import com.wordnik.swagger.models.Info; -import com.wordnik.swagger.models.License; -import com.wordnik.swagger.models.Model; -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.models.Path; -import com.wordnik.swagger.models.Swagger; -import com.wordnik.swagger.models.auth.SecuritySchemeDefinition; -import com.wordnik.swagger.util.Json; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; - -import java.io.File; -import java.io.Reader; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.apache.commons.lang3.StringUtils.capitalize; -import static org.apache.commons.lang3.StringUtils.isNotEmpty; - -public class DefaultGenerator extends AbstractGenerator implements Generator { - protected CodegenConfig config; - protected ClientOptInput opts = null; - protected Swagger swagger = null; - - public Generator opts(ClientOptInput opts) { - this.opts = opts; - - this.swagger = opts.getSwagger(); - this.config = opts.getConfig(); - this.config.additionalProperties().putAll(opts.getOpts().getProperties()); - - return this; - } - - public List generate() { - if (swagger == null || config == null) { - throw new RuntimeException("missing swagger input or config!"); - } - if (System.getProperty("debugSwagger") != null) { - Json.prettyPrint(swagger); - } - List files = new ArrayList(); - try { - config.processOpts(); - if (swagger.getInfo() != null) { - Info info = swagger.getInfo(); - if (info.getTitle() != null) { - config.additionalProperties().put("appName", info.getTitle()); - } - if (info.getVersion() != null) { - config.additionalProperties().put("appVersion", info.getVersion()); - } - if (info.getDescription() != null) { - config.additionalProperties().put("appDescription", - config.escapeText(info.getDescription())); - } - if (info.getContact() != null) { - Contact contact = info.getContact(); - config.additionalProperties().put("infoUrl", contact.getUrl()); - if (contact.getEmail() != null) { - config.additionalProperties().put("infoEmail", contact.getEmail()); - } - } - if (info.getLicense() != null) { - License license = info.getLicense(); - if (license.getName() != null) { - config.additionalProperties().put("licenseInfo", license.getName()); - } - if (license.getUrl() != null) { - config.additionalProperties().put("licenseUrl", license.getUrl()); - } - } - if (info.getVersion() != null) { - config.additionalProperties().put("version", info.getVersion()); - } - } - - StringBuilder hostBuilder = new StringBuilder(); - String scheme; - if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) { - scheme = swagger.getSchemes().get(0).toValue(); - } else { - scheme = "https"; - } - hostBuilder.append(scheme); - hostBuilder.append("://"); - if (swagger.getHost() != null) { - hostBuilder.append(swagger.getHost()); - } else { - hostBuilder.append("localhost"); - } - if (swagger.getBasePath() != null) { - hostBuilder.append(swagger.getBasePath()); - } else { - hostBuilder.append("/"); - } - String contextPath = swagger.getBasePath() == null ? "/" : swagger.getBasePath(); - String basePath = hostBuilder.toString(); - - - List allOperations = new ArrayList(); - List allModels = new ArrayList(); - - // models - Map definitions = swagger.getDefinitions(); - if (definitions != null) { - for (String name : definitions.keySet()) { - Model model = definitions.get(name); - Map modelMap = new HashMap(); - modelMap.put(name, model); - Map models = processModels(config, modelMap); - models.putAll(config.additionalProperties()); - - allModels.add(((List) models.get("models")).get(0)); - - for (String templateName : config.modelTemplateFiles().keySet()) { - String suffix = config.modelTemplateFiles().get(templateName); - String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix; - String template = readTemplate(config.templateDir() + File.separator + templateName); - Template tmpl = Mustache.compiler() - .withLoader(new Mustache.TemplateLoader() { - public Reader getTemplate(String name) { - return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); - } - }) - .defaultValue("") - .compile(template); - writeToFile(filename, tmpl.execute(models)); - files.add(new File(filename)); - } - } - } - if (System.getProperty("debugModels") != null) { - System.out.println("############ Model info ############"); - Json.prettyPrint(allModels); - } - - // apis - Map> paths = processPaths(swagger.getPaths()); - for (String tag : paths.keySet()) { - List ops = paths.get(tag); - Map operation = processOperations(config, tag, ops); - - operation.put("basePath", basePath); - operation.put("contextPath", contextPath); - operation.put("baseName", tag); - operation.put("modelPackage", config.modelPackage()); - operation.putAll(config.additionalProperties()); - operation.put("classname", config.toApiName(tag)); - operation.put("classVarName", config.toApiVarName(tag)); - operation.put("importPath", config.toApiImport(tag)); - - processMimeTypes(swagger.getConsumes(), operation, "consumes"); - processMimeTypes(swagger.getProduces(), operation, "produces"); - - allOperations.add(new HashMap(operation)); - for (int i = 0; i < allOperations.size(); i++) { - Map oo = (Map) allOperations.get(i); - if (i < (allOperations.size() - 1)) { - oo.put("hasMore", "true"); - } - } - - for (String templateName : config.apiTemplateFiles().keySet()) { - - String filename = config.apiFilename( templateName, tag ); - if( new File( filename ).exists() && !config.shouldOverwrite( filename )){ - continue; - } - - String template = readTemplate(config.templateDir() + File.separator + templateName); - Template tmpl = Mustache.compiler() - .withLoader(new Mustache.TemplateLoader() { - public Reader getTemplate(String name) { - return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); - } - }) - .defaultValue("") - .compile(template); - - writeToFile(filename, tmpl.execute(operation)); - files.add(new File(filename)); - } - } - if (System.getProperty("debugOperations") != null) { - System.out.println("############ Operation info ############"); - Json.prettyPrint(allOperations); - } - - // supporting files - Map bundle = new HashMap(); - bundle.putAll(config.additionalProperties()); - bundle.put("apiPackage", config.apiPackage()); - - Map apis = new HashMap(); - apis.put("apis", allOperations); - if (swagger.getHost() != null) { - bundle.put("host", swagger.getHost()); - } - bundle.put("basePath", basePath); - bundle.put("scheme", scheme); - bundle.put("contextPath", contextPath); - bundle.put("apiInfo", apis); - bundle.put("models", allModels); - bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar)); - bundle.put("modelPackage", config.modelPackage()); - bundle.put("authMethods", config.fromSecurity(swagger.getSecurityDefinitions())); - if (swagger.getExternalDocs() != null) { - bundle.put("externalDocs", swagger.getExternalDocs()); - } - for (int i = 0; i < allModels.size() - 1; i++) { - HashMap cm = (HashMap) allModels.get(i); - CodegenModel m = cm.get("model"); - m.hasMoreModels = true; - } - - config.postProcessSupportingFileData(bundle); - - if (System.getProperty("debugSupportingFiles") != null) { - System.out.println("############ Supporting file info ############"); - Json.prettyPrint(bundle); - } - - for (SupportingFile support : config.supportingFiles()) { - String outputFolder = config.outputFolder(); - if (isNotEmpty(support.folder)) { - outputFolder += File.separator + support.folder; - } - File of = new File(outputFolder); - if (!of.isDirectory()) { - of.mkdirs(); - } - String outputFilename = outputFolder + File.separator + support.destinationFilename; - - if (support.templateFile.endsWith("mustache")) { - String template = readTemplate(config.templateDir() + File.separator + support.templateFile); - Template tmpl = Mustache.compiler() - .withLoader(new Mustache.TemplateLoader() { - public Reader getTemplate(String name) { - return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); - } - }) - .defaultValue("") - .compile(template); - - writeToFile(outputFilename, tmpl.execute(bundle)); - files.add(new File(outputFilename)); - } else { - InputStream in = null; - - try { - in = new FileInputStream(config.templateDir() + File.separator + support.templateFile); - } - catch (Exception e) { - // continue - } - if(in == null) { - in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile); - } - File outputFile = new File(outputFilename); - OutputStream out = new FileOutputStream(outputFile, false); - if(in != null && out != null) - IOUtils.copy(in,out); - else { - if(in == null) - System.out.println("can't open " + config.templateDir() + File.separator + support.templateFile + " for input"); - if(out == null) - System.out.println("can't open " + outputFile + " for output"); - } - - files.add(outputFile); - } - } - - config.processSwagger(swagger); - } catch (Exception e) { - e.printStackTrace(); - } - return files; - } - - private void processMimeTypes(List mimeTypeList, Map operation, String source) { - if(mimeTypeList != null && mimeTypeList.size() > 0) { - List> c = new ArrayList>(); - int count = 0; - for(String key: mimeTypeList) { - Map mediaType = new HashMap(); - mediaType.put("mediaType", key); - count += 1; - if (count < mimeTypeList.size()) { - mediaType.put("hasMore", "true"); - } - else { - mediaType.put("hasMore", null); - } - c.add(mediaType); - } - operation.put(source, c); - String flagFieldName = "has" + source.substring(0, 1).toUpperCase() + source.substring(1); - operation.put(flagFieldName, true); - } - } - - public Map> processPaths(Map paths) { - Map> ops = new HashMap>(); - - for (String resourcePath : paths.keySet()) { - Path path = paths.get(resourcePath); - processOperation(resourcePath, "get", path.getGet(), ops); - processOperation(resourcePath, "put", path.getPut(), ops); - processOperation(resourcePath, "post", path.getPost(), ops); - processOperation(resourcePath, "delete", path.getDelete(), ops); - processOperation(resourcePath, "patch", path.getPatch(), ops); - processOperation(resourcePath, "options", path.getOptions(), ops); - } - return ops; - } - - public SecuritySchemeDefinition fromSecurity(String name) { - Map map = swagger.getSecurityDefinitions(); - if (map == null) { - return null; - } - return map.get(name); - } - - - public void processOperation(String resourcePath, String httpMethod, Operation operation, Map> operations) { - if (operation != null) { - List tags = operation.getTags(); - if (tags == null) { - tags = new ArrayList(); - tags.add("default"); - } - - for (String tag : tags) { - CodegenOperation co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions()); - co.tags = new ArrayList(); - co.tags.add(sanitizeTag(tag)); - config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations); - - List>> securities = operation.getSecurity(); - if (securities == null) { - continue; - } - Map authMethods = new HashMap(); - for (Map> security : securities) { - if (security.size() != 1) { - //Not sure what to do - continue; - } - String securityName = security.keySet().iterator().next(); - SecuritySchemeDefinition securityDefinition = fromSecurity(securityName); - if (securityDefinition != null) { - authMethods.put(securityName, securityDefinition); - } - } - if (!authMethods.isEmpty()) { - co.authMethods = config.fromSecurity(authMethods); - } - } - } - } - - protected String sanitizeTag(String tag) { - // remove spaces and make strong case - String[] parts = tag.split(" "); - StringBuilder buf = new StringBuilder(); - for (String part : parts) { - if (isNotEmpty(part)) { - buf.append(capitalize(part)); - } - } - return buf.toString().replaceAll("[^a-zA-Z ]", ""); - } - - public Map processOperations(CodegenConfig config, String tag, List ops) { - Map operations = new HashMap(); - Map objs = new HashMap(); - objs.put("classname", config.toApiName(tag)); - - // check for operationId uniqueness - Set opIds = new HashSet(); - int counter = 0; - for(CodegenOperation op : ops) { - String opId = op.nickname; - if(opIds.contains(opId)) { - counter ++; - op.nickname += "_" + counter; - } - opIds.add(opId); - } - objs.put("operation", ops); - - operations.put("operations", objs); - operations.put("package", config.apiPackage()); - - - Set allImports = new LinkedHashSet(); - for (CodegenOperation op : ops) { - allImports.addAll(op.imports); - } - - List> imports = new ArrayList>(); - for (String nextImport : allImports) { - Map im = new LinkedHashMap(); - String mapping = config.importMapping().get(nextImport); - if (mapping == null) { - mapping = config.toModelImport(nextImport); - } - if (mapping != null) { - im.put("import", mapping); - imports.add(im); - } - } - - operations.put("imports", imports); - config.postProcessOperations(operations); - if (objs.size() > 0) { - List os = (List) objs.get("operation"); - - if (os != null && os.size() > 0) { - CodegenOperation op = os.get(os.size() - 1); - op.hasMore = null; - } - } - return operations; - } - - public Map processModels(CodegenConfig config, Map definitions) { - Map objs = new HashMap(); - objs.put("package", config.modelPackage()); - List models = new ArrayList(); - Set allImports = new LinkedHashSet(); - for (String key : definitions.keySet()) { - Model mm = definitions.get(key); - CodegenModel cm = config.fromModel(key, mm); - Map mo = new HashMap(); - mo.put("model", cm); - mo.put("importPath", config.toModelImport(key)); - models.add(mo); - allImports.addAll(cm.imports); - } - objs.put("models", models); - - List> imports = new ArrayList>(); - for (String nextImport : allImports) { - Map im = new LinkedHashMap(); - String mapping = config.importMapping().get(nextImport); - if (mapping == null) { - mapping = config.toModelImport(nextImport); - } - if (mapping != null && !config.defaultIncludes().contains(mapping)) { - im.put("import", mapping); - imports.add(im); - } - // add instantiation types - mapping = config.instantiationTypes().get(nextImport); - if (mapping != null && !config.defaultIncludes().contains(mapping)) { - im.put("import", mapping); - imports.add(im); - } - } - - objs.put("imports", imports); - config.postProcessModels(objs); - - return objs; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Generator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Generator.java deleted file mode 100644 index 0dfbab86a0a..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Generator.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.models.Swagger; - -import java.io.File; -import java.util.List; - -public interface Generator { - Generator opts(ClientOptInput opts); - List generate(); -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java deleted file mode 100644 index fc5f2d020a1..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.wordnik.swagger.codegen; - -import com.wordnik.swagger.codegen.languages.*; -import com.wordnik.swagger.models.Swagger; -import com.wordnik.swagger.models.auth.AuthorizationValue; -import com.wordnik.swagger.util.*; - -import io.swagger.parser.SwaggerParser; - -import com.samskivert.mustache.*; - -import org.apache.commons.cli.*; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.Reader; -import java.util.*; - -/** - * @deprecated use instead {@link com.wordnik.swagger.codegen.DefaultGenerator} - * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547 - */ -@Deprecated -public class MetaGenerator extends AbstractGenerator { - static Map configs = new HashMap(); - static String configString; - static { - List extensions = getExtensions(); - StringBuilder sb = new StringBuilder(); - - for(CodegenConfig config : extensions) { - if(sb.toString().length() != 0) - sb.append(", "); - sb.append(config.getName()); - configs.put(config.getName(), config); - configString = sb.toString(); - } - } - - public static void main(String[] args) { - new MetaGenerator().generate(args); - } - - protected void generate(String[] args) { - StringBuilder sb = new StringBuilder(); - String targetLanguage = null; - String outputFolder = null; - String name = null; - String targetPackage = "com.wordnik.swagger.codegen"; - final String templateDir = "codegen"; - - Options options = new Options(); - options.addOption("h", "help", false, "shows this message"); - options.addOption("l", "lang", false, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]"); - options.addOption("o", "output", true, "where to write the generated files"); - options.addOption("n", "name", true, "the human-readable name of the generator"); - options.addOption("p", "package", true, "the package to put the main class into (defaults to com.wordnik.swagger.codegen"); - - ClientOptInput clientOptInput = new ClientOptInput(); - Swagger swagger = null; - CommandLine cmd = null; - try { - CommandLineParser parser = new BasicParser(); - - cmd = parser.parse(options, args); - if (cmd.hasOption("h")) { - usage(options); - return; - } - if (cmd.hasOption("n")) - name = cmd.getOptionValue("n"); - else { - System.out.println("name is required"); - usage(options); - return; - } - if (cmd.hasOption("l")) - targetLanguage = cmd.getOptionValue("l"); - if (cmd.hasOption("p")) - targetPackage = cmd.getOptionValue("p"); - if (cmd.hasOption("o")) - outputFolder = cmd.getOptionValue("o"); - else { - System.out.println("output folder is required"); - usage(options); - return; - } - } - catch (Exception e) { - usage(options); - return; - } - System.out.println("writing to folder " + outputFolder); - File outputFolderLocation = new File(outputFolder); - if(!outputFolderLocation.exists()) - outputFolderLocation.mkdirs(); - File sourceFolder = new File(outputFolder + File.separator + "src/main/java/" + targetPackage.replace('.', File.separatorChar)); - if(!sourceFolder.exists()) - sourceFolder.mkdirs(); - File resourcesFolder = new File(outputFolder + File.separator + "src/main/resources/META-INF/services"); - if(!resourcesFolder.exists()) - resourcesFolder.mkdirs(); - - String mainClass = Character.toUpperCase(name.charAt(0)) + name.substring(1) + "Generator"; - - List supportingFiles = new ArrayList(); - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - supportingFiles.add(new SupportingFile("generatorClass.mustache", - "src/main/java/" + File.separator + targetPackage.replace('.', File.separatorChar), - mainClass + ".java")); - supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - supportingFiles.add(new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache")); - supportingFiles.add(new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache")); - - supportingFiles.add(new SupportingFile("services.mustache", "src/main/resources/META-INF/services", "com.wordnik.swagger.codegen.CodegenConfig")); - - List files = new ArrayList(); - - Map data = new HashMap(); - data.put("generatorPackage", targetPackage); - data.put("generatorClass", mainClass); - data.put("name", name); - data.put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass); - - for(SupportingFile support : supportingFiles) { - try { - String destinationFolder = outputFolder; - if(support.folder != null && !"".equals(support.folder)) - destinationFolder += File.separator + support.folder; - File of = new File(destinationFolder); - if(!of.isDirectory()) - of.mkdirs(); - String outputFilename = destinationFolder + File.separator + support.destinationFilename; - - if(support.templateFile.endsWith("mustache")) { - String template = readTemplate(templateDir + File.separator + support.templateFile); - Template tmpl = Mustache.compiler() - .withLoader(new Mustache.TemplateLoader() { - public Reader getTemplate (String name) { - return getTemplateReader(templateDir + File.separator + name + ".mustache"); - }; - }) - .defaultValue("") - .compile(template); - - writeToFile(outputFilename, tmpl.execute(data)); - files.add(new File(outputFilename)); - } - else { - String template = readTemplate(templateDir + File.separator + support.templateFile); - FileUtils.writeStringToFile(new File(outputFilename), template); - System.out.println("copying file to " + outputFilename); - files.add(new File(outputFilename)); - } - } - catch (java.io.IOException e) { - e.printStackTrace(); - } - } - } - - public static List getExtensions() { - ServiceLoader loader = ServiceLoader.load(CodegenConfig.class); - List output = new ArrayList(); - Iterator itr = loader.iterator(); - while(itr.hasNext()) { - output.add(itr.next()); - } - return output; - } - - static void usage(Options options) { - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp( "MetaGenerator. Generator for creating a new template set " + - "and configuration for Codegen. The output will be based on the language you " + - "specify, and includes default templates to include.", options ); - } - - public static CodegenConfig getConfig(String name) { - if(configs.containsKey(name)) { - return configs.get(name); - } - return null; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/SupportingFile.java deleted file mode 100644 index 85f08bfa70c..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/SupportingFile.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wordnik.swagger.codegen; - -public class SupportingFile { - public String templateFile; - public String folder; - public String destinationFilename; - - public SupportingFile(String templateFile, String folder, String destinationFilename) { - this.templateFile = templateFile; - this.folder = folder; - this.destinationFilename = destinationFilename; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/auth/AuthMethod.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/auth/AuthMethod.java deleted file mode 100644 index 7de102ec350..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/auth/AuthMethod.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.wordnik.swagger.codegen.auth; - -public interface AuthMethod { - String getType(); - void setType(String type); -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java deleted file mode 100644 index 51d10f7e8a6..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.wordnik.swagger.codegen.examples; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.wordnik.swagger.models.Model; -import com.wordnik.swagger.models.ModelImpl; -import com.wordnik.swagger.models.properties.ArrayProperty; -import com.wordnik.swagger.models.properties.BooleanProperty; -import com.wordnik.swagger.models.properties.DateProperty; -import com.wordnik.swagger.models.properties.DateTimeProperty; -import com.wordnik.swagger.models.properties.DecimalProperty; -import com.wordnik.swagger.models.properties.DoubleProperty; -import com.wordnik.swagger.models.properties.FileProperty; -import com.wordnik.swagger.models.properties.FloatProperty; -import com.wordnik.swagger.models.properties.IntegerProperty; -import com.wordnik.swagger.models.properties.LongProperty; -import com.wordnik.swagger.models.properties.MapProperty; -import com.wordnik.swagger.models.properties.ObjectProperty; -import com.wordnik.swagger.models.properties.Property; -import com.wordnik.swagger.models.properties.RefProperty; -import com.wordnik.swagger.models.properties.StringProperty; -import com.wordnik.swagger.models.properties.UUIDProperty; -import com.wordnik.swagger.util.Json; - -public class ExampleGenerator { - protected Map examples; - - public ExampleGenerator(Map examples) { - this.examples = examples; - } - - public List> generate(Map examples, List mediaTypes, Property property) { - List> output = new ArrayList>(); - Set processedModels = new HashSet(); - if(examples == null ) { - if(mediaTypes == null) { - // assume application/json for this - mediaTypes = Arrays.asList("application/json"); - } - for(String mediaType : mediaTypes) { - Map kv = new HashMap(); - kv.put("contentType", mediaType); - if(property != null && mediaType.startsWith("application/json")) { - String example = Json.pretty(resolvePropertyToExample(mediaType, property, processedModels)); - - if(example != null) { - kv.put("example", example); - output.add(kv); - } - } - else if(property != null && mediaType.startsWith("application/xml")) { - String example = new XmlExampleGenerator(this.examples).toXml(property); - if(example != null) { - kv.put("example", example); - output.add(kv); - } - } - } - } - else { - for(Map.Entry entry: examples.entrySet()) { - final Map kv = new HashMap(); - kv.put("contentType", entry.getKey()); - kv.put("example", Json.pretty(entry.getValue())); - output.add(kv); - } - } - if(output.size() == 0) { - Map kv = new HashMap(); - kv.put("output", "none"); - output.add(kv); - } - return output; - } - - protected Object resolvePropertyToExample(String mediaType, Property property, Set processedModels) { - if(property.getExample() != null) { - return property.getExample(); - } - else if(property instanceof StringProperty) { - return "aeiou"; - } - else if(property instanceof BooleanProperty) { - return Boolean.TRUE; - } - else if(property instanceof ArrayProperty) { - Property innerType = ((ArrayProperty)property).getItems(); - if(innerType != null) { - Object[] output = new Object[]{ - resolvePropertyToExample(mediaType, innerType, processedModels) - }; - return output; - } - } - else if(property instanceof DateProperty) { - return new java.util.Date(System.currentTimeMillis()); - } - else if(property instanceof DateTimeProperty) { - return new java.util.Date(System.currentTimeMillis()); - } - else if(property instanceof DecimalProperty) { - return new BigDecimal(1.3579); - } - else if(property instanceof DoubleProperty) { - return new Double(3.149); - } - else if(property instanceof FileProperty) { - return ""; // TODO - } - else if(property instanceof FloatProperty) { - return new Float(1.23); - } - else if(property instanceof IntegerProperty) { - return new Integer(123); - } - else if(property instanceof LongProperty) { - return new Long(123456789); - } - else if(property instanceof MapProperty) { - Map mp = new HashMap(); - if(property.getName() != null) { - mp.put(property.getName(), - resolvePropertyToExample(mediaType, ((MapProperty)property).getAdditionalProperties(), processedModels)); - } - else { - mp.put("key", - resolvePropertyToExample(mediaType, ((MapProperty)property).getAdditionalProperties(), processedModels)); - } - return mp; - } - else if(property instanceof ObjectProperty) { - return "{}"; - } - else if(property instanceof RefProperty) { - String simpleName = ((RefProperty)property).getSimpleRef(); - Model model = examples.get(simpleName); - if(model != null) - return resolveModelToExample(simpleName, mediaType, model, processedModels); - } - else if(property instanceof UUIDProperty) { - return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; - } - - return ""; - } - - public Object resolveModelToExample(String name, String mediaType, Model model, Set processedModels) { - if(processedModels.contains(name)) { - return ""; - } - if(model instanceof ModelImpl) { - processedModels.add(name); - ModelImpl impl = (ModelImpl) model; - Map values = new HashMap(); - - if(impl != null && impl.getProperties() != null) { - for(String propertyName : impl.getProperties().keySet()) { - Property property = impl.getProperties().get(propertyName); - values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels)); - } - } - - return values; - } - - return ""; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/XmlExampleGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/XmlExampleGenerator.java deleted file mode 100644 index b1896605cdf..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/XmlExampleGenerator.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.wordnik.swagger.codegen.examples; - - -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.models.*; -import com.wordnik.swagger.models.properties.*; - -import java.text.SimpleDateFormat; -import java.util.*; - -import org.codehaus.plexus.util.StringUtils; - -public class XmlExampleGenerator { - public static String NEWLINE = "\n"; - public static String TAG_START = "<"; - public static String CLOSE_TAG = ">"; - public static String TAG_END = " examples; - protected SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - private static String EMPTY = ""; - - public XmlExampleGenerator(Map examples) { - this.examples = examples; - if(examples == null) - examples = new HashMap(); - } - - public String toXml(Property property) { - return toXml(null, property, 0, Collections.emptySet()); - } - - protected String toXml(Model model, int indent, Collection path) { - if(model instanceof RefModel) { - RefModel ref = (RefModel) model; - Model actualModel = examples.get(ref.getSimpleRef()); - if(actualModel instanceof ModelImpl) - return modelImplToXml((ModelImpl) actualModel, indent, path); - } - else if(model instanceof ModelImpl) { - return modelImplToXml((ModelImpl) model, indent, path); - } - return null; - } - - protected String modelImplToXml(ModelImpl model, int indent, Collection path) { - final String modelName = model.getName(); - if (path.contains(modelName)) { - return EMPTY; - } - final Set selfPath = new HashSet(path); - selfPath.add(modelName); - - StringBuilder sb = new StringBuilder(); - // attributes - Map attributes = new LinkedHashMap(); - Map elements = new LinkedHashMap(); - - String name = modelName; - String namespace; - String prefix; - Boolean wrapped; - - Xml xml = model.getXml(); - if(xml != null) { - if(xml.getName() != null) - name = xml.getName(); - } - for(String pName : model.getProperties().keySet()) { - Property p = model.getProperties().get(pName); - if(p != null && p.getXml() != null && p.getXml().getAttribute() != null && p.getXml().getAttribute()) - attributes.put(pName, p); - else - elements.put(pName, p); - } - sb.append(indent(indent)).append(TAG_START); - sb.append(name); - for(String pName : attributes.keySet()) { - Property p = attributes.get(pName); - sb.append(" ").append(pName).append("=").append(quote(toXml(null, p, 0, selfPath))); - } - sb.append(CLOSE_TAG); - sb.append(NEWLINE); - for(String pName : elements.keySet()) { - Property p = elements.get(pName); - final String asXml = toXml(pName, p, indent + 1, selfPath); - if (StringUtils.isEmpty(asXml)) { - continue; - } - sb.append(asXml); - sb.append(NEWLINE); - } - sb.append(indent(indent)).append(TAG_END).append(name).append(CLOSE_TAG); - - return sb.toString(); - } - - protected String quote(String string) { - return "\"" + string + "\""; - } - - protected String toXml(String name, Property property, int indent, Collection path) { - if(property == null) { - return ""; - } - StringBuilder sb = new StringBuilder(); - - if(property instanceof ArrayProperty) { - ArrayProperty p = (ArrayProperty) property; - Property inner = p.getItems(); - boolean wrapped = false; - if(property.getXml() != null && property.getXml().getWrapped()) - wrapped = true; - if(wrapped) { - String prefix = EMPTY; - if(name != null) { - sb.append(indent(indent)); - sb.append(openTag(name)); - prefix = NEWLINE; - } - final String asXml = toXml(name, inner, indent + 1, path); - if (StringUtils.isNotEmpty(asXml)) { - sb.append(prefix).append(asXml); - } - if(name != null) { - sb.append(NEWLINE); - sb.append(indent(indent)); - sb.append(closeTag(name)); - } - } - else - sb.append(toXml(name, inner, indent, path)); - } - else if(property instanceof RefProperty) { - RefProperty ref = (RefProperty) property; - Model actualModel = examples.get(ref.getSimpleRef()); - sb.append(toXml(actualModel, indent, path)); - } - else { - if(name != null) { - sb.append(indent(indent)); - sb.append(openTag(name)); - } - sb.append(getExample(property)); - if(name != null) - sb.append(closeTag(name)); - } - return sb.toString(); - } - - protected String getExample(Property property) { - if(property instanceof DateTimeProperty) { - if(property.getExample() != null) - return property.getExample(); - else - return dtFormat.format(new Date()); - } - else if(property instanceof StringProperty) { - if(property.getExample() != null) - return property.getExample(); - else - return "string"; - } - else if(property instanceof DateProperty) { - if(property.getExample() != null) - return property.getExample(); - else - return dateFormat.format(new Date()); - } - else if(property instanceof IntegerProperty) { - if(property.getExample() != null) - return property.getExample(); - else - return "0"; - } - else if(property instanceof BooleanProperty) { - if(property.getExample() != null) - return property.getExample(); - else - return "true"; - } - else if(property instanceof LongProperty) { - if(property.getExample() != null) - return property.getExample(); - else - return "123456"; - } - return "not implemented " + property; - } - - protected String openTag(String name) { - return "<" + name + ">"; - } - - protected String closeTag(String name) { - return ""; - } - - protected String indent(int indent) { - StringBuffer sb = new StringBuffer(); - for(int i = 0; i < indent; i++) { - sb.append(" "); - } - return sb.toString(); - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AkkaScalaClientCodegen.java deleted file mode 100644 index fff8deb99f4..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AkkaScalaClientCodegen.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.google.common.base.CaseFormat; -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.auth.SecuritySchemeDefinition; -import com.wordnik.swagger.models.properties.*; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.*; - -public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenConfig { - Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class); - - protected String mainPackage = "io.swagger.client"; - - protected String invokerPackage = mainPackage + ".core"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/scala"; - protected String resourcesFolder = "src/main/resources"; - protected String configKey = "apiRequest"; - protected int defaultTimeoutInMs = 5000; - protected String configKeyPath = mainPackage; - - protected boolean registerNonStandardStatusCodes = true; - protected boolean renderJavadoc = true; - protected boolean removeOAuthSecurities = true; - /** - * If set to true, only the default response (the one with le lowest 2XX code) will be considered as a success, and all - * others as ApiErrors. - * If set to false, all responses defined in the model will be considered as a success upon reception. Only http errors, - * unmarshalling problems and any other RuntimeException will be considered as ApiErrors. - */ - protected boolean onlyOneSuccess = true; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "akka-scala"; - } - - public String getHelp() { - return "Generates a Scala client library base on Akka/Spray."; - } - - public AkkaScalaClientCodegen() { - super(); - outputFolder = "generated-code/scala"; - modelTemplateFiles.put("model.mustache", ".scala"); - apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "akka-scala"; - apiPackage = mainPackage + ".api"; - modelPackage = mainPackage + ".model"; - - reservedWords = new HashSet( - Arrays.asList( - "abstract", "case", "catch", "class", "def", "do", "else", "extends", - "false", "final", "finally", "for", "forSome", "if", "implicit", - "import", "lazy", "match", "new", "null", "object", "override", "package", - "private", "protected", "return", "sealed", "super", "this", "throw", - "trait", "try", "true", "type", "val", "var", "while", "with", "yield") - ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - additionalProperties.put("configKey", configKey); - additionalProperties.put("configKeyPath", configKeyPath); - additionalProperties.put("defaultTimeout", defaultTimeoutInMs); - if (renderJavadoc) - additionalProperties.put("javadocRenderer", new JavadocLambda()); - additionalProperties.put("fnCapitalize", new CapitalizeLambda()); - additionalProperties.put("fnCamelize", new CamelizeLambda(false)); - additionalProperties.put("fnEnumEntry", new EnumEntryLambda()); - additionalProperties.put("onlyOneSuccess", onlyOneSuccess); - - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf")); - final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator); - supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala")); - supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala")); - supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala")); - supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala")); - final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); - supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala")); - - importMapping.remove("Seq"); - importMapping.remove("List"); - importMapping.remove("Set"); - importMapping.remove("Map"); - - importMapping.put("DateTime", "org.joda.time.DateTime"); - - typeMapping = new HashMap(); - typeMapping.put("array", "Seq"); - typeMapping.put("set", "Set"); - typeMapping.put("boolean", "Boolean"); - typeMapping.put("string", "String"); - typeMapping.put("int", "Int"); - typeMapping.put("integer", "Int"); - typeMapping.put("long", "Long"); - typeMapping.put("float", "Float"); - typeMapping.put("byte", "Byte"); - typeMapping.put("short", "Short"); - typeMapping.put("char", "Char"); - typeMapping.put("long", "Long"); - typeMapping.put("double", "Double"); - typeMapping.put("object", "Any"); - typeMapping.put("file", "File"); - typeMapping.put("number", "Double"); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Int", - "Long", - "Float", - "Object", - "List", - "Seq", - "Map") - ); - instantiationTypes.put("array", "ListBuffer"); - instantiationTypes.put("map", "Map"); - } - - @Override - public String escapeReservedWord(String name) { - return "`" + name + "`"; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public Map postProcessOperations(Map objs) { - if (registerNonStandardStatusCodes) { - try { - @SuppressWarnings("unchecked") - Map> opsMap = (Map>) objs.get("operations"); - HashSet unknownCodes = new HashSet(); - for (CodegenOperation operation : opsMap.get("operation")) { - for (CodegenResponse response : operation.responses) { - if ("default".equals(response.code)) - continue; - try { - int code = Integer.parseInt(response.code); - if (code >= 600) { - unknownCodes.add(code); - } - } catch (NumberFormatException e) { - LOGGER.error("Status code is not an integer : response.code", e); - } - } - } - if (!unknownCodes.isEmpty()) { - additionalProperties.put("unknownStatusCodes", unknownCodes); - } - } catch (Exception e) { - LOGGER.error("Unable to find operations List", e); - } - } - return super.postProcessOperations(objs); - } - - @Override - public String getTypeDeclaration(Property p) { - if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public List fromSecurity(Map schemes) { - final List codegenSecurities = super.fromSecurity(schemes); - if (!removeOAuthSecurities) - return codegenSecurities; - - // Remove OAuth securities - Iterator it = codegenSecurities.iterator(); - while (it.hasNext()) { - final CodegenSecurity security = it.next(); - if (security.isOAuth) - it.remove(); - } - // Adapt 'hasMore' - it = codegenSecurities.iterator(); - while (it.hasNext()) { - final CodegenSecurity security = it.next(); - security.hasMore = it.hasNext(); - } - - if (codegenSecurities.isEmpty()) - return null; - return codegenSecurities; - } - - @Override - public String toOperationId(String operationId) { - return super.toOperationId(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, operationId)); - } - - private String formatIdentifier(String name, boolean capitalized) { - String identifier = camelize(name, true); - if (capitalized) - identifier = StringUtils.capitalize(identifier); - if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !reservedWords.contains(identifier)) - return identifier; - return escapeReservedWord(identifier); - } - - @Override - public String toParamName(String name) { return formatIdentifier(name, false); } - - @Override - public String toVarName(String name) { - return formatIdentifier(name, false); - } - - @Override - public String toEnumName(CodegenProperty property) - { - return formatIdentifier(property.baseName, true); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type; - if (typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if (languageSpecificPrimitives.contains(type)) - return toModelName(type); - } else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return instantiationTypes.get("map") + "[String, " + inner + "]"; - } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return instantiationTypes.get("array") + "[" + inner + "]"; - } else - return null; - } - - public String toDefaultValue(Property p) { - if (!p.getRequired()) - return "None"; - if (p instanceof StringProperty) - return "null"; - else if (p instanceof BooleanProperty) - return "null"; - else if (p instanceof DateProperty) - return "null"; - else if (p instanceof DateTimeProperty) - return "null"; - else if (p instanceof DoubleProperty) - return "null"; - else if (p instanceof FloatProperty) - return "null"; - else if (p instanceof IntegerProperty) - return "null"; - else if (p instanceof LongProperty) - return "null"; - else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "Map[String, " + inner + "].empty "; - } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return "Seq[" + inner + "].empty "; - } else - return "null"; - } - - private static abstract class CustomLambda implements Mustache.Lambda { - @Override - public void execute(Template.Fragment frag, Writer out) throws IOException { - final StringWriter tempWriter = new StringWriter(); - frag.execute(tempWriter); - out.write(formatFragment(tempWriter.toString())); - } - public abstract String formatFragment(String fragment); - } - - - private static class JavadocLambda extends CustomLambda { - @Override - public String formatFragment(String fragment) { - final String[] lines = fragment.split("\\r?\\n"); - final StringBuilder sb = new StringBuilder(); - sb.append(" /**\n"); - for (String line : lines) { - sb.append(" * ").append(line).append("\n"); - } - sb.append(" */\n"); - return sb.toString(); - } - } - - private static class CapitalizeLambda extends CustomLambda { - @Override - public String formatFragment(String fragment) { - return StringUtils.capitalize(fragment); - } - } - - private static class CamelizeLambda extends CustomLambda { - private final boolean capitalizeFirst; - - public CamelizeLambda(boolean capitalizeFirst) { - this.capitalizeFirst = capitalizeFirst; - } - - @Override - public String formatFragment(String fragment) { - return camelize(fragment, !capitalizeFirst); - } - } - - private class EnumEntryLambda extends CustomLambda { - @Override - public String formatFragment(String fragment) { - return formatIdentifier(fragment, true); - } - } - -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java deleted file mode 100644 index 377c8de24d9..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java +++ /dev/null @@ -1,259 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-android-client"; - protected String artifactVersion = "1.0.0"; - protected String projectFolder = "src/main"; - protected String sourceFolder = projectFolder + "/java"; - protected Boolean useAndroidMavenGradlePlugin = true; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "android"; - } - - public String getHelp() { - return "Generates an Android client library."; - } - - public AndroidClientCodegen() { - super(); - outputFolder = "generated-code/android"; - modelTemplateFiles.put("model.mustache", ".java"); - apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "android-java"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "continue", "for", "new", "switch", "assert", - "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while") - ); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "Object") - ); - instantiationTypes.put("array", "ArrayList"); - instantiationTypes.put("map", "HashMap"); - - cliOptions.add(new CliOption("invokerPackage", "root package to use for the generated code")); - cliOptions.add(new CliOption("groupId", "groupId for use in the generated build.gradle and pom.xml")); - cliOptions.add(new CliOption("artifactId", "artifactId for use in the generated build.gradle and pom.xml")); - cliOptions.add(new CliOption("artifactVersion", "artifact version for use in the generated build.gradle and pom.xml")); - cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); - cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true.")); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + ""; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, do nothing - if (name.matches("^[A-Z_]*$")) - return name; - - // camelize (lower first character) the variable name - // pet_id => petId - name = camelize(name, true); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return camelize(operationId, true); - } - - @Override - public void processOpts() { - super.processOpts(); - - if(additionalProperties.containsKey("invokerPackage")) { - this.setInvokerPackage((String)additionalProperties.get("invokerPackage")); - } - else{ - //not set, use default to be passed to template - additionalProperties.put("invokerPackage", invokerPackage); - } - - if(additionalProperties.containsKey("groupId")) { - this.setGroupId((String)additionalProperties.get("groupId")); - } - else{ - //not set, use to be passed to template - additionalProperties.put("groupId", groupId); - } - - if(additionalProperties.containsKey("artifactId")) { - this.setArtifactId((String)additionalProperties.get("artifactId")); - } - else{ - //not set, use to be passed to template - additionalProperties.put("artifactId", artifactId); - } - - if(additionalProperties.containsKey("artifactVersion")) { - this.setArtifactVersion((String)additionalProperties.get("artifactVersion")); - } - else{ - //not set, use to be passed to template - additionalProperties.put("artifactVersion", artifactVersion); - } - - if(additionalProperties.containsKey("sourceFolder")) { - this.setSourceFolder((String)additionalProperties.get("sourceFolder")); - } - - if(additionalProperties.containsKey("useAndroidMavenGradlePlugin")) { - this.setUseAndroidMavenGradlePlugin((Boolean)additionalProperties.get("useAndroidMavenGradlePlugin")); - } - else{ - additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin); - } - - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin); - - supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); - supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle")); - supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml")); - supportingFiles.add(new SupportingFile("apiInvoker.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java")); - supportingFiles.add(new SupportingFile("httpPatch.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java")); - supportingFiles.add(new SupportingFile("jsonUtil.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java")); - supportingFiles.add(new SupportingFile("apiException.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java")); - } - - public Boolean getUseAndroidMavenGradlePlugin() { - return useAndroidMavenGradlePlugin; - } - - public void setUseAndroidMavenGradlePlugin(Boolean useAndroidMavenGradlePlugin) { - this.useAndroidMavenGradlePlugin = useAndroidMavenGradlePlugin; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java deleted file mode 100644 index d85fdc8f695..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "io.swagger.client"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-async-scala-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/scala"; - protected String clientName = "SwaggerClient"; - protected String authScheme = ""; - protected boolean authPreemptive = false; - protected boolean asyncHttpClient = !authScheme.isEmpty(); - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "async-scala"; - } - - public String getHelp() { - return "Generates an Asynchronous Scala client library."; - } - - public AsyncScalaClientCodegen() { - super(); - outputFolder = "generated-code/async-scala"; - modelTemplateFiles.put("model.mustache", ".scala"); - apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "asyncscala"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "case", "catch", "class", "def", "do", "else", "extends", - "false", "final", "finally", "for", "forSome", "if", "implicit", - "import", "lazy", "match", "new", "null", "object", "override", "package", - "private", "protected", "return", "sealed", "super", "this", "throw", - "trait", "try", "true", "type", "val", "var", "while", "with", "yield") - ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - additionalProperties.put("asyncHttpClient", asyncHttpClient); - additionalProperties.put("authScheme", authScheme); - additionalProperties.put("authPreemptive", authPreemptive); - additionalProperties.put("clientName", clientName); - - supportingFiles.add(new SupportingFile("sbt.mustache", "", "build.sbt")); - supportingFiles.add(new SupportingFile("client.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), clientName + ".scala")); - - importMapping.remove("List"); - importMapping.remove("Set"); - importMapping.remove("Map"); - - importMapping.put("DateTime", "org.joda.time.DateTime"); - importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer"); - - typeMapping = new HashMap(); - typeMapping.put("enum", "NSString"); - typeMapping.put("array", "List"); - typeMapping.put("set", "Set"); - typeMapping.put("boolean", "Boolean"); - typeMapping.put("string", "String"); - typeMapping.put("int", "Int"); - typeMapping.put("long", "Long"); - typeMapping.put("float", "Float"); - typeMapping.put("byte", "Byte"); - typeMapping.put("short", "Short"); - typeMapping.put("char", "Char"); - typeMapping.put("long", "Long"); - typeMapping.put("double", "Double"); - typeMapping.put("object", "Any"); - typeMapping.put("file", "File"); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Int", - "Long", - "Float", - "Object", - "List", - "Map") - ); - instantiationTypes.put("array", "ListBuffer"); - instantiationTypes.put("map", "HashMap"); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return instantiationTypes.get("map") + "[String, " + inner + "]"; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return instantiationTypes.get("array") + "[" + inner + "]"; - } - else - return null; - } - - public String toDefaultValue(Property p) { - if(p instanceof StringProperty) - return "null"; - else if (p instanceof BooleanProperty) - return "null"; - else if(p instanceof DateProperty) - return "null"; - else if(p instanceof DateTimeProperty) - return "null"; - else if (p instanceof DoubleProperty) - return "null"; - else if (p instanceof FloatProperty) - return "null"; - else if (p instanceof IntegerProperty) - return "null"; - else if (p instanceof LongProperty) - return "null"; - else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "new HashMap[String, " + inner + "]() "; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return "new ListBuffer[" + inner + "]() "; - } - else - return "null"; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java deleted file mode 100644 index abac0db5d9f..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "IO.Swagger.Client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-csharp-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/csharp"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "csharp"; - } - - public String getHelp() { - return "Generates a CSharp client library."; - } - - public CSharpClientCodegen() { - super(); - outputFolder = "generated-code/csharp"; - modelTemplateFiles.put("model.mustache", ".cs"); - apiTemplateFiles.put("api.mustache", ".cs"); - templateDir = "csharp"; - apiPackage = "IO.Swagger.Api"; - modelPackage = "IO.Swagger.Model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while") - ); - - additionalProperties.put("invokerPackage", invokerPackage); - - supportingFiles.add(new SupportingFile("Configuration.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Configuration.cs")); - supportingFiles.add(new SupportingFile("ApiClient.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiClient.cs")); - supportingFiles.add(new SupportingFile("ApiException.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs")); - supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll")); - supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll")); - supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat")); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "string", - "bool?", - "double?", - "int?", - "long?", - "float?", - "byte[]", - "List", - "Dictionary", - "DateTime?", - "String", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "Object") - ); - instantiationTypes.put("array", "List"); - instantiationTypes.put("map", "Dictionary"); - - typeMapping = new HashMap(); - typeMapping.put("string", "string"); - typeMapping.put("boolean", "bool?"); - typeMapping.put("integer", "int?"); - typeMapping.put("float", "float?"); - typeMapping.put("long", "long?"); - typeMapping.put("double", "double?"); - typeMapping.put("number", "double?"); - typeMapping.put("datetime", "DateTime?"); - typeMapping.put("date", "DateTime?"); - typeMapping.put("file", "string"); // path to file - typeMapping.put("array", "List"); - typeMapping.put("list", "List"); - typeMapping.put("map", "Dictionary"); - typeMapping.put("object", "Object"); - - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar); - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, do nothing - if (name.matches("^[A-Z_]*$")) - return name; - - // camelize the variable name - // pet_id => PetId - name = camelize(name); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + ""; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType.toLowerCase())) { - type = typeMapping.get(swaggerType.toLowerCase()); - if(languageSpecificPrimitives.contains(type)) - return type; - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return camelize(operationId); - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java deleted file mode 100644 index 6d9966c7fe4..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-java-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/java"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "java"; - } - - public String getHelp() { - return "Generates a Java client library."; - } - - public JavaClientCodegen() { - super(); - outputFolder = "generated-code/java"; - modelTemplateFiles.put("model.mustache", ".java"); - apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "Java"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "continue", "for", "new", "switch", "assert", - "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while") - ); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "Object") - ); - instantiationTypes.put("array", "ArrayList"); - instantiationTypes.put("map", "HashMap"); - - cliOptions.add(new CliOption("invokerPackage", "root package for generated code")); - cliOptions.add(new CliOption("groupId", "groupId in generated pom.xml")); - cliOptions.add(new CliOption("artifactId", "artifactId in generated pom.xml")); - cliOptions.add(new CliOption("artifactVersion", "artifact version in generated pom.xml")); - cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); - } - - @Override - public void processOpts() { - super.processOpts(); - - if(additionalProperties.containsKey("invokerPackage")) { - this.setInvokerPackage((String)additionalProperties.get("invokerPackage")); - } - else{ - //not set, use default to be passed to template - additionalProperties.put("invokerPackage", invokerPackage); - } - - if(additionalProperties.containsKey("groupId")) { - this.setGroupId((String)additionalProperties.get("groupId")); - } - else{ - //not set, use to be passed to template - additionalProperties.put("groupId", groupId); - } - - if(additionalProperties.containsKey("artifactId")) { - this.setArtifactId((String)additionalProperties.get("artifactId")); - } - else{ - //not set, use to be passed to template - additionalProperties.put("artifactId", artifactId); - } - - if(additionalProperties.containsKey("artifactVersion")) { - this.setArtifactVersion((String)additionalProperties.get("artifactVersion")); - } - else{ - //not set, use to be passed to template - additionalProperties.put("artifactVersion", artifactVersion); - } - - if(additionalProperties.containsKey("sourceFolder")) { - this.setSourceFolder((String)additionalProperties.get("sourceFolder")); - } - - final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator); - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java")); - supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java")); - supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java")); - supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java")); - supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java")); - - final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator); - supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java")); - 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")); - } - - - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, do nothing - if (name.matches("^[A-Z_]*$")) - return name; - - // camelize (lower first character) the variable name - // pet_id => petId - name = camelize(name, true); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + ""; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return camelize(operationId, true); - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java deleted file mode 100644 index 4631a804fc7..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig { - protected String invokerPackage = "io.swagger.api"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-jaxrs-server"; - protected String artifactVersion = "1.0.0"; - protected String title = "Swagger Server"; - - public CodegenType getTag() { - return CodegenType.SERVER; - } - - public String getName() { - return "jaxrs"; - } - - public String getHelp() { - return "Generates a Java JAXRS Server application."; - } - - public JaxRSServerCodegen() { - super.processOpts(); - - sourceFolder = "src/gen/java"; - - outputFolder = System.getProperty( "swagger.codegen.jaxrs.genfolder", "generated-code/javaJaxRS" ); - modelTemplateFiles.put("model.mustache", ".java"); - apiTemplateFiles.put("api.mustache", ".java"); - apiTemplateFiles.put("apiService.mustache", ".java"); - apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); - apiTemplateFiles.put("apiServiceFactory.mustache", ".java"); - templateDir = "JavaJaxRS"; - apiPackage = System.getProperty( "swagger.codegen.jaxrs.apipackage", "io.swagger.api") ; - modelPackage = System.getProperty( "swagger.codegen.jaxrs.modelpackage", "io.swagger.model" ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - additionalProperties.put("title", title); - - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float") - ); - } - - - @Override - public void processOpts() { - super.processOpts(); - - supportingFiles.clear(); - 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")); - supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java")); - supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java")); - supportingFiles.add(new SupportingFile("NotFoundException.mustache", - (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java")); - supportingFiles.add(new SupportingFile("web.mustache", - ("src/main/webapp/WEB-INF"), "web.xml")); - - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getTypeDeclaration(inner); - } - return super.getTypeDeclaration(p); - } - - @Override - public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { - String basePath = resourcePath; - if(basePath.startsWith("/")) - basePath = basePath.substring(1); - int pos = basePath.indexOf("/"); - if(pos > 0) - basePath = basePath.substring(0, pos); - - if(basePath == "") - basePath = "default"; - else { - if(co.path.startsWith("/" + basePath)) - co.path = co.path.substring(("/" + basePath).length()); - co.subresourceOperation = !co.path.isEmpty(); - } - List opList = operations.get(basePath); - if(opList == null) { - opList = new ArrayList(); - operations.put(basePath, opList); - } - opList.add(co); - co.baseName = basePath; - } - - public Map postProcessOperations(Map objs) { - Map operations = (Map)objs.get("operations"); - if(operations != null) { - List ops = (List) operations.get("operation"); - for(CodegenOperation operation : ops) { - if(operation.returnType == null) - operation.returnType = "Void"; - else if(operation.returnType.startsWith("List")) { - String rt = operation.returnType; - int end = rt.lastIndexOf(">"); - if(end > 0) { - operation.returnType = rt.substring("List<".length(), end); - operation.returnContainer = "List"; - } - } - else if(operation.returnType.startsWith("Map")) { - String rt = operation.returnType; - int end = rt.lastIndexOf(">"); - if(end > 0) { - operation.returnType = rt.substring("Map<".length(), end); - operation.returnContainer = "Map"; - } - } - else if(operation.returnType.startsWith("Set")) { - String rt = operation.returnType; - int end = rt.lastIndexOf(">"); - if(end > 0) { - operation.returnType = rt.substring("Set<".length(), end); - operation.returnContainer = "Set"; - } - } - } - } - return objs; - } - - @Override - public String apiFilename(String templateName, String tag) { - - String result = super.apiFilename(templateName, tag); - - if( templateName.endsWith( "Impl.mustache")){ - int ix = result.lastIndexOf( '/' ); - 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)); - } - } - else if( templateName.endsWith( "Factory.mustache")){ - int ix = result.lastIndexOf( '/' ); - result = result.substring( 0, ix ) + "/factories" + result.substring( ix, result.length()-5 ) + "ServiceFactory.java"; - - String output = System.getProperty( "swagger.codegen.jaxrs.impl.source" ); - if( output != null ){ - result = result.replace( apiFileFolder(), implFileFolder(output)); - } - } - else if( templateName.endsWith( "Service.mustache")) { - int ix = result.lastIndexOf('.'); - result = result.substring(0, ix) + "Service.java"; - } - - return result; - } - - private String implFileFolder(String output) { - return outputFolder + "/" + output + "/" + apiPackage().replace('.', File.separatorChar); - } - - public boolean shouldOverwrite( String filename ){ - - return !filename.endsWith( "ServiceImpl.java") && !filename.endsWith( "ServiceFactory.java"); - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/NodeJSServerCodegen.java deleted file mode 100644 index 9d516c398f6..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/NodeJSServerCodegen.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import java.io.File; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import com.wordnik.swagger.codegen.CodegenConfig; -import com.wordnik.swagger.codegen.CodegenOperation; -import com.wordnik.swagger.codegen.CodegenParameter; -import com.wordnik.swagger.codegen.CodegenResponse; -import com.wordnik.swagger.codegen.CodegenType; -import com.wordnik.swagger.codegen.DefaultCodegen; -import com.wordnik.swagger.codegen.SupportingFile; - -public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig { - protected String apiVersion = "1.0.0"; - protected int serverPort = 8080; - protected String projectName = "swagger-server"; - - public String apiPackage() { - return "controllers"; - } - - /** - * Configures the type of generator. - * - * @return the CodegenType for this generator - * @see com.wordnik.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 "nodejs"; - } - - /** - * 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 nodejs server library using the swagger-tools project. By default, " + - "it will also generate service classes--which you can disable with the `-Dnoservice` environment variable."; - } - - public NodeJSServerCodegen() { - super(); - - // set the output folder here - outputFolder = "generated-code/nodejs"; - - /** - * 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 - ".js"); // 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. - */ - templateDir = "nodejs"; - - /** - * Reserved words. Override this with reserved words specific to your language - */ - reservedWords = new HashSet ( - Arrays.asList( - "break", "case", "class", "catch", "const", "continue", "debugger", - "default", "delete", "do", "else", "export", "extends", "finally", - "for", "function", "if", "import", "in", "instanceof", "let", "new", - "return", "super", "switch", "this", "throw", "try", "typeof", "var", - "void", "while", "with", "yield") - ); - - /** - * 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("controller.mustache", - // "controllers", - // "controller.js") - // ); - supportingFiles.add(new SupportingFile("swagger.mustache", - "api", - "swagger.json") - ); - supportingFiles.add(new SupportingFile("index.mustache", - "", - "index.js") - ); - supportingFiles.add(new SupportingFile("package.mustache", - "", - "package.json") - ); - if(System.getProperty("noservice") == null) { - apiTemplateFiles.put( - "service.mustache", // the template to use - "Service.js"); // the extension for each file to write - } - } - - @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 Map postProcessOperations(Map objs) { - @SuppressWarnings("unchecked") - Map objectMap = (Map) objs.get("operations"); - @SuppressWarnings("unchecked") - List operations = (List) objectMap.get("operation"); - for(CodegenOperation operation : operations) { - operation.httpMethod = operation.httpMethod.toLowerCase(); - List params = operation.allParams; - if(params != null && params.size() == 0) - operation.allParams = null; - List responses = operation.responses; - if(responses != null) { - for(CodegenResponse resp : responses) { - if("0".equals(resp.code)) - resp.code = "default"; - } - } - if(operation.examples != null && !operation.examples.isEmpty()) { - // Leave application/json* items only - for (Iterator> it = operation.examples.iterator(); it.hasNext();) { - final Map example = it.next(); - final String contentType = example.get("contentType"); - if (contentType == null || !contentType.startsWith("application/json")) { - it.remove(); - } - } - } - } - return objs; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java deleted file mode 100644 index ab1cf2ec8d7..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { - protected Set foundationClasses = new HashSet(); - protected String sourceFolder = "client"; - protected String classPrefix = "SWG"; - protected String projectName = "swaggerClient"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "objc"; - } - - public String getHelp() { - return "Generates an Objective-C client library."; - } - - public ObjcClientCodegen() { - super(); - outputFolder = "generated-code" + File.separator + "objc"; - modelTemplateFiles.put("model-header.mustache", ".h"); - modelTemplateFiles.put("model-body.mustache", ".m"); - apiTemplateFiles.put("api-header.mustache", ".h"); - apiTemplateFiles.put("api-body.mustache", ".m"); - templateDir = "objc"; - modelPackage = ""; - - defaultIncludes = new HashSet( - Arrays.asList( - "bool", - "BOOL", - "int", - "NSString", - "NSObject", - "NSArray", - "NSNumber", - "NSDate", - "NSDictionary", - "NSMutableArray", - "NSMutableDictionary") - ); - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "NSNumber", - "NSString", - "NSObject", - "NSDate", - "bool", - "BOOL") - ); - - // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm - reservedWords = new HashSet( - Arrays.asList( - "auto", "else", "long", "switch", - "break", "enum", "register", "typedef", - "case", "extern", "return", "union", - "char", "float", "short", "unsigned", - "const", "for", "signed", "void", - "continue", "goto", "sizeof", "volatile", - "default", "if", "id", "static", "while", - "do", "int", "struct", "_Packed", - "double", "protocol", "interface", "implementation", - "NSObject", "NSInteger", "NSNumber", "CGFloat", - "property", "nonatomic", "retain", "strong", - "weak", "unsafe_unretained", "readwrite", "readonly" - )); - - typeMapping = new HashMap(); - typeMapping.put("enum", "NSString"); - typeMapping.put("Date", "NSDate"); - typeMapping.put("DateTime", "NSDate"); - typeMapping.put("boolean", "BOOL"); - typeMapping.put("string", "NSString"); - typeMapping.put("integer", "NSNumber"); - typeMapping.put("int", "NSNumber"); - typeMapping.put("float", "NSNumber"); - typeMapping.put("long", "NSNumber"); - typeMapping.put("double", "NSNumber"); - typeMapping.put("array", "NSArray"); - typeMapping.put("map", "NSDictionary"); - typeMapping.put("number", "NSNumber"); - typeMapping.put("List", "NSArray"); - typeMapping.put("object", "NSObject"); - - importMapping = new HashMap (); - - foundationClasses = new HashSet ( - Arrays.asList( - "NSNumber", - "NSObject", - "NSString", - "NSDate", - "NSDictionary") - ); - - instantiationTypes.put("array", "NSMutableArray"); - instantiationTypes.put("map", "NSMutableDictionary"); - - cliOptions.add(new CliOption("classPrefix", "prefix for generated classes")); - cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); - cliOptions.add(new CliOption("projectName", "name of the Xcode project in generated Podfile")); - } - - @Override - public void processOpts() { - super.processOpts(); - - if(additionalProperties.containsKey("sourceFolder")) { - this.setSourceFolder((String)additionalProperties.get("sourceFolder")); - } - - if(additionalProperties.containsKey("classPrefix")) { - this.setClassPrefix((String)additionalProperties.get("classPrefix")); - } - - if(additionalProperties.containsKey("projectName")) { - this.setProjectName((String)additionalProperties.get("projectName")); - } - else{ - additionalProperties.put("projectName", projectName); - } - - supportingFiles.add(new SupportingFile("SWGObject.h", sourceFolder, "SWGObject.h")); - supportingFiles.add(new SupportingFile("SWGObject.m", sourceFolder, "SWGObject.m")); - supportingFiles.add(new SupportingFile("SWGQueryParamCollection.h", sourceFolder, "SWGQueryParamCollection.h")); - supportingFiles.add(new SupportingFile("SWGQueryParamCollection.m", sourceFolder, "SWGQueryParamCollection.m")); - supportingFiles.add(new SupportingFile("SWGApiClient.h", sourceFolder, "SWGApiClient.h")); - supportingFiles.add(new SupportingFile("SWGApiClient.m", sourceFolder, "SWGApiClient.m")); - supportingFiles.add(new SupportingFile("SWGFile.h", sourceFolder, "SWGFile.h")); - supportingFiles.add(new SupportingFile("SWGFile.m", sourceFolder, "SWGFile.m")); - supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m", sourceFolder, "JSONValueTransformer+ISO8601.m")); - supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", sourceFolder, "JSONValueTransformer+ISO8601.h")); - supportingFiles.add(new SupportingFile("SWGConfiguration-body.mustache", sourceFolder, "SWGConfiguration.m")); - supportingFiles.add(new SupportingFile("SWGConfiguration-header.mustache", sourceFolder, "SWGConfiguration.h")); - supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile")); - } - - @Override - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return instantiationTypes.get("map"); - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return instantiationTypes.get("array"); - } - else - return null; - } - - @Override - public String getTypeDeclaration(String name) { - if(languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name)) - return name; - else - return name + "*"; - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String getTypeDeclaration(Property p) { - if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - String innerType = getSwaggerType(inner); - - // In this codition, type of property p is array of primitive, - // return container type with pointer, e.g. `NSArray*' - if (languageSpecificPrimitives.contains(innerType)) - return getSwaggerType(p) + "*"; - - // In this codition, type of property p is array of model, - // return container type combine inner type with pointer, e.g. `NSArray*' - String innerTypeDeclaration = getTypeDeclaration(inner); - - if (innerTypeDeclaration.endsWith("*")) - innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1); - - return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*"; - } - else { - String swaggerType = getSwaggerType(p); - - // In this codition, type of p is objective-c primitive type, e.g. `NSSNumber', - // return type of p with pointer, e.g. `NSNumber*' - if (languageSpecificPrimitives.contains(swaggerType) && - foundationClasses.contains(swaggerType)) { - return swaggerType + "*"; - } - // In this codition, type of p is c primitive type, e.g. `bool', - // return type of p, e.g. `bool' - else if (languageSpecificPrimitives.contains(swaggerType)) { - return swaggerType; - } - // In this codition, type of p is objective-c object type, e.g. `SWGPet', - // return type of p with pointer, e.g. `SWGPet*' - else { - return swaggerType + "*"; - } - } - } - - @Override - public String toModelName(String type) { - type = type.replaceAll("[^0-9a-zA-Z_]", "_"); - - // language build-in classes - if(typeMapping.keySet().contains(type) || - foundationClasses.contains(type) || - importMapping.values().contains(type) || - defaultIncludes.contains(type) || - languageSpecificPrimitives.contains(type)) { - return camelize(type); - } - // custom classes - else { - return classPrefix + camelize(type); - } - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - @Override - protected void setNonArrayMapProperty(CodegenProperty property, String type) { - super.setNonArrayMapProperty(property, type); - if("NSDictionary".equals(type)) { - property.setter = "initWithDictionary"; - } - else { - property.setter = "initWithValues"; - } - } - - @Override - public String toModelImport(String name) { - if("".equals(modelPackage())) - return name; - else - return modelPackage() + "." + name; - } - - @Override - public String toDefaultValue(Property p) { - return null; - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separator + sourceFolder; - } - - @Override - public String modelFileFolder() { - return outputFolder + File.separator + sourceFolder; - } - - @Override - public String toApiName(String name) { - return classPrefix + camelize(name) + "Api"; - } - - public String toApiFilename(String name) { - return classPrefix + camelize(name) + "Api"; - } - - @Override - public String toVarName(String name) { - // replace non-word characters to `_` - // e.g. `created-at` to `created_at` - name = name.replaceAll("[^a-zA-Z0-9_]","_"); - - // if it's all upper case, do noting - if (name.matches("^[A-Z_]$")) - return name; - - // camelize (lower first character) the variable name - // e.g. `pet_id` to `petId` - name = camelize(name, true); - - // for reserved word or word starting with number, prepend `_` - if (reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return camelize(operationId, true); - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setClassPrefix(String classPrefix) { - this.classPrefix = classPrefix; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java deleted file mode 100644 index b96b012abba..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "SwaggerClient"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; - protected String artifactVersion = "1.0.0"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "perl"; - } - - public String getHelp() { - return "Generates a Perl client library."; - } - - public PerlClientCodegen() { - super(); - modelPackage = File.separatorChar + "Object"; - outputFolder = "generated-code" + File.separatorChar + "perl"; - modelTemplateFiles.put("object.mustache", ".pm"); - apiTemplateFiles.put("api.mustache", ".pm"); - templateDir = "perl"; - - typeMapping.clear(); - languageSpecificPrimitives.clear(); - - reservedWords = new HashSet ( - Arrays.asList( - "else", "lock", "qw", - "__END__", "elsif", "lt", "qx", - "__FILE__", "eq", "m", "s", - "__LINE__", "exp", "ne", "sub", - "__PACKAGE__", "for", "no", "tr", - "and", "foreach", "or", "unless", - "cmp", "ge", "package", "until", - "continue", "gt", "q", "while", - "CORE", "if", "qq", "xor", - "do", "le", "qr", "y" - ) - ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - - languageSpecificPrimitives.add("int"); - languageSpecificPrimitives.add("double"); - languageSpecificPrimitives.add("string"); - languageSpecificPrimitives.add("boolean"); - languageSpecificPrimitives.add("DateTime"); - languageSpecificPrimitives.add("ARRAY"); - languageSpecificPrimitives.add("HASH"); - languageSpecificPrimitives.add("object"); - - typeMapping.put("integer", "int"); - typeMapping.put("long", "int"); - typeMapping.put("float", "double"); - typeMapping.put("double", "double"); - typeMapping.put("boolean", "boolean"); - typeMapping.put("string", "string"); - typeMapping.put("date", "DateTime"); - typeMapping.put("dateTime", "DateTime"); - typeMapping.put("password", "string"); - typeMapping.put("array", "ARRAY"); - typeMapping.put("map", "HASH"); - typeMapping.put("object", "object"); - - supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "ApiClient.pm")); - supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Configuration.pm")); - supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Object/BaseObject.pm")); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return (outputFolder + "/lib/WWW/" + invokerPackage + apiPackage()).replace('/', File.separatorChar); - } - - public String modelFileFolder() { - return (outputFolder + "/lib/WWW/" + invokerPackage + modelPackage()).replace('/', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) { - return type; - } - } - else - type = swaggerType; - if(type == null) - return null; - return type; - } - - public String toDefaultValue(Property p) { - return "null"; - } - - - @Override - public String toVarName(String name) { - // parameter name starting with number won't compile - // need to escape it by appending _ at the beginning - if (name.matches("^[0-9]")) { - name = "_" + name; - } - - // return the name in underscore style - // PhoneNumber => phone_number - return underscore(name); - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // model name cannot use reserved keyword - if(reservedWords.contains(name)) - escapeReservedWord(name); // e.g. return => _return - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - @Override - public String toApiFilename(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // e.g. phone_number_api.rb => PhoneNumberApi.rb - return camelize(name) + "Api"; - } - - @Override - public String toApiName(String name) { - if(name.length() == 0) - return "DefaultApi"; - // e.g. phone_number_api => PhoneNumberApi - return camelize(name) + "Api"; - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return underscore(operationId); - } - - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java deleted file mode 100644 index 2f643724b14..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "com.wordnik.client"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; - protected String artifactVersion = "1.0.0"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "php"; - } - - public String getHelp() { - return "Generates a PHP client library."; - } - - public PhpClientCodegen() { - super(); - - invokerPackage = camelize("SwaggerClient"); - - String packagePath = invokerPackage + "-php"; - - modelPackage = packagePath + "/lib/models"; - apiPackage = packagePath + "/lib"; - outputFolder = "generated-code/php"; - modelTemplateFiles.put("model.mustache", ".php"); - apiTemplateFiles.put("api.mustache", ".php"); - templateDir = "php"; - - reservedWords = new HashSet ( - Arrays.asList( - "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor") - ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - - // ref: http://php.net/manual/en/language.types.intro.php - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "boolean", - "int", - "integer", - "double", - "float", - "string", - "object", - "DateTime", - "mixed", - "number") - ); - - instantiationTypes.put("array", "array"); - instantiationTypes.put("map", "map"); - - // ref: https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#data-types - typeMapping = new HashMap(); - typeMapping.put("integer", "int"); - typeMapping.put("long", "int"); - typeMapping.put("float", "float"); - typeMapping.put("double", "double"); - typeMapping.put("string", "string"); - typeMapping.put("byte", "int"); - typeMapping.put("boolean", "boolean"); - typeMapping.put("date", "DateTime"); - typeMapping.put("datetime", "DateTime"); - typeMapping.put("file", "string"); - typeMapping.put("map", "map"); - typeMapping.put("array", "array"); - typeMapping.put("list", "array"); - typeMapping.put("object", "object"); - - supportingFiles.add(new SupportingFile("composer.mustache", packagePath.replace('/', File.separatorChar), "composer.json")); - supportingFiles.add(new SupportingFile("configuration.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "Configuration.php")); - supportingFiles.add(new SupportingFile("ApiClient.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiClient.php")); - supportingFiles.add(new SupportingFile("ApiException.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiException.php")); - supportingFiles.add(new SupportingFile("require.mustache", packagePath.replace('/', File.separatorChar), invokerPackage + ".php")); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return (outputFolder + "/" + apiPackage()).replace('/', File.separatorChar); - } - - public String modelFileFolder() { - return (outputFolder + "/" + modelPackage()).replace('/', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) { - return type; - } - else if (instantiationTypes.containsKey(type)) { - return type; - } - } - else - type = swaggerType; - if(type == null) - return null; - return toModelName(type); - } - - public String toDefaultValue(Property p) { - return "null"; - } - - - @Override - public String toVarName(String name) { - // parameter name starting with number won't compile - // need to escape it by appending _ at the beginning - if (name.matches("^[0-9]")) { - name = "_" + name; - } - - // return the name in underscore style - // PhoneNumber => phone_number - return underscore(name); - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // model name cannot use reserved keyword - if(reservedWords.contains(name)) - escapeReservedWord(name); // e.g. return => _return - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java deleted file mode 100755 index 81ba21ebe72..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.io.File; -import java.util.*; - -public class Python3ClientCodegen extends DefaultCodegen implements CodegenConfig { - String module = "client"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "python3"; - } - - public String getHelp() { - return "Generates a Python3 client library."; - } - - public Python3ClientCodegen() { - super(); - outputFolder = "generated-code/python3"; - modelTemplateFiles.put("model.mustache", ".py"); - apiTemplateFiles.put("api.mustache", ".py"); - templateDir = "python3"; - - apiPackage = module; - modelPackage = module + ".models"; - - languageSpecificPrimitives.clear(); - languageSpecificPrimitives.add("int"); - languageSpecificPrimitives.add("float"); - //languageSpecificPrimitives.add("long"); - languageSpecificPrimitives.add("list"); - languageSpecificPrimitives.add("bool"); - languageSpecificPrimitives.add("str"); - languageSpecificPrimitives.add("datetime"); - - typeMapping.clear(); - typeMapping.put("integer", "int"); - typeMapping.put("float", "float"); - typeMapping.put("long", "int"); - typeMapping.put("double", "float"); - typeMapping.put("array", "list"); - typeMapping.put("map", "map"); - typeMapping.put("boolean", "bool"); - typeMapping.put("string", "str"); - typeMapping.put("date", "datetime"); - - // 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")); - - //supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py")); - supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py")); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) { - return type; - } - } - else - type = swaggerType; - return type; - } - - public String toDefaultValue(Property p) { - // TODO: Support Python def value - return "null"; - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, convert to lower case - if (name.matches("^[A-Z_]*$")) - name = name.toLowerCase(); - - // camelize (lower first character) the variable name - // petId => pet_id - name = underscore(name); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // 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"); - - // underscore the model file name - // PhoneNumber.rb => phone_number.rb - return underscore(name); - } - - @Override - public String toApiFilename(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // e.g. PhoneNumberApi.rb => phone_number_api.rb - return underscore(name) + "_api"; - } - - @Override - public String toApiName(String name) { - if(name.length() == 0) - return "DefaultApi"; - // e.g. phone_number_api => PhoneNumberApi - return camelize(name) + "Api"; - } - - @Override - public String toApiVarName(String name) { - if(name.length() == 0) - return "default_api"; - return underscore(name) + "_api"; - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return underscore(operationId); - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java deleted file mode 100755 index 7f9a77d3132..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.io.File; -import java.util.*; - -public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String module = "SwaggerPetstore"; - protected String invokerPackage; - protected String eggPackage; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "python"; - } - - public String getHelp() { - return "Generates a Python client library."; - } - - public PythonClientCodegen() { - super(); - - eggPackage = module + "-python"; - - invokerPackage = eggPackage + File.separatorChar + module; - - outputFolder = "generated-code" + File.separatorChar + "python"; - modelTemplateFiles.put("model.mustache", ".py"); - apiTemplateFiles.put("api.mustache", ".py"); - templateDir = "python"; - - apiPackage = invokerPackage + File.separatorChar + "apis"; - modelPackage = invokerPackage + File.separatorChar + "models"; - - languageSpecificPrimitives.clear(); - languageSpecificPrimitives.add("int"); - languageSpecificPrimitives.add("float"); - languageSpecificPrimitives.add("list"); - languageSpecificPrimitives.add("bool"); - languageSpecificPrimitives.add("str"); - languageSpecificPrimitives.add("datetime"); - - typeMapping.clear(); - typeMapping.put("integer", "int"); - typeMapping.put("float", "float"); - typeMapping.put("long", "int"); - typeMapping.put("double", "float"); - typeMapping.put("array", "list"); - typeMapping.put("map", "map"); - typeMapping.put("boolean", "bool"); - typeMapping.put("string", "str"); - typeMapping.put("date", "datetime"); - - // 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")); - - additionalProperties.put("module", module); - - supportingFiles.add(new SupportingFile("README.mustache", eggPackage, "README.md")); - supportingFiles.add(new SupportingFile("setup.mustache", eggPackage, "setup.py")); - supportingFiles.add(new SupportingFile("api_client.mustache", invokerPackage, "api_client.py")); - supportingFiles.add(new SupportingFile("rest.mustache", invokerPackage, "rest.py")); - supportingFiles.add(new SupportingFile("configuration.mustache", invokerPackage, "configuration.py")); - supportingFiles.add(new SupportingFile("__init__package.mustache", invokerPackage, "__init__.py")); - supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage, "__init__.py")); - supportingFiles.add(new SupportingFile("__init__api.mustache", apiPackage, "__init__.py")); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separatorChar + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + File.separatorChar + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) { - return type; - } - } else { - type = toModelName(swaggerType); - } - return type; - } - - public String toDefaultValue(Property p) { - // TODO: Support Python def value - return "null"; - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, convert to lower case - if (name.matches("^[A-Z_]*$")) - name = name.toLowerCase(); - - // underscore the variable name - // petId => pet_id - name = underscore(dropDots(name)); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - private static String dropDots(String str) { - return str.replaceAll("\\.", "_"); - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // 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"); - - // underscore the model file name - // PhoneNumber => phone_number - return underscore(dropDots(name)); - } - - @Override - public String toApiFilename(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // e.g. PhoneNumberApi.rb => phone_number_api.rb - return underscore(name) + "_api"; - } - - @Override - public String toApiName(String name) { - if(name.length() == 0) - return "DefaultApi"; - // e.g. phone_number_api => PhoneNumberApi - return camelize(name) + "Api"; - } - - @Override - public String toApiVarName(String name) { - if(name.length() == 0) - return "default_api"; - return underscore(name) + "_api"; - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return underscore(operationId); - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Qt5CPPGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Qt5CPPGenerator.java deleted file mode 100644 index 35d9bf58bbb..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Qt5CPPGenerator.java +++ /dev/null @@ -1,308 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { - protected Set foundationClasses = new HashSet(); - - // source folder where to write the files - protected String sourceFolder = "client"; - protected String apiVersion = "1.0.0"; - protected final String PREFIX = "SWG"; - protected Map namespaces = new HashMap(); - protected Set systemIncludes = new HashSet(); - - /** - * Configures the type of generator. - * - * @return the CodegenType for this generator - * @see com.wordnik.swagger.codegen.CodegenType - */ - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - /** - * 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 "qt5cpp"; - } - - /** - * 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 qt5 C++ client library."; - } - - public Qt5CPPGenerator() { - super(); - - // set the output folder here - outputFolder = "generated-code/qt5cpp"; - - /** - * 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.put( - "model-header.mustache", - ".h"); - - modelTemplateFiles.put( - "model-body.mustache", - ".cpp"); - - /** - * 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( - "api-header.mustache", // the template to use - ".h"); // the extension for each file to write - - apiTemplateFiles.put( - "api-body.mustache", // the template to use - ".cpp"); // 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. - */ - templateDir = "qt5cpp"; - - /** - * Reserved words. Override this with reserved words specific to your language - */ - reservedWords = new HashSet ( - Arrays.asList( - "sample1", // replace with static values - "sample2") - ); - - /** - * 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("prefix", PREFIX); - - /** - * Language Specific Primitives. These types will not trigger imports by - * the client generator - */ - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "bool", - "qint32", - "qint64") - ); - - supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h")); - supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp")); - supportingFiles.add(new SupportingFile("HttpRequest.h", sourceFolder, PREFIX + "HttpRequest.h")); - supportingFiles.add(new SupportingFile("HttpRequest.cpp", sourceFolder, PREFIX + "HttpRequest.cpp")); - supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h")); - supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h")); - - super.typeMapping = new HashMap(); - - typeMapping.put("Date", "QDate"); - typeMapping.put("DateTime", "QDateTime"); - typeMapping.put("string", "QString"); - typeMapping.put("integer", "qint32"); - typeMapping.put("long", "qint64"); - typeMapping.put("boolean", "bool"); - typeMapping.put("array", "QList"); - typeMapping.put("map", "QMap"); - typeMapping.put("file", "SWGHttpRequestInputFileElement"); - typeMapping.put("object", PREFIX + "Object"); - - importMapping = new HashMap(); - - importMapping.put("SWGHttpRequestInputFileElement", "#include \"" + PREFIX + "HttpRequest.h\""); - - namespaces = new HashMap (); - - foundationClasses.add("QString"); - - systemIncludes.add("QString"); - systemIncludes.add("QList"); - } - - @Override - public String toModelImport(String name) { - if(namespaces.containsKey(name)) { - return "using " + namespaces.get(name) + ";"; - } - else if(systemIncludes.contains(name)) { - return "#include <" + name + ">"; - } - return "#include \"" + name + ".h\""; - } - - /** - * 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 model files. You can use the modelPackage() as defined when the class is - * instantiated - */ - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - /** - * Location to write api files. You can use the apiPackage() as defined when the class is - * instantiated - */ - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - @Override - public String toModelFilename(String name) { - return PREFIX + initialCaps(name); - } - - @Override - public String toApiFilename(String name) { - return PREFIX + initialCaps(name) + "Api"; - } - - /** - * Optional - type declaration. This is a String which is used by the templates to instantiate your - * types. There is typically special handling for different property types - * - * @return a string value used as the `dataType` field for model templates, `returnType` for api templates - */ - @Override - public String getTypeDeclaration(Property p) { - String swaggerType = getSwaggerType(p); - - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">*"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - return getSwaggerType(p) + "*"; - } - if(foundationClasses.contains(swaggerType)) - return swaggerType + "*"; - else if(languageSpecificPrimitives.contains(swaggerType)) - return toModelName(swaggerType); - else - return swaggerType + "*"; - } - - @Override - public String toDefaultValue(Property p) { - if(p instanceof StringProperty) - return "new QString(\"\")"; - else if (p instanceof BooleanProperty) - return "false"; - else if(p instanceof DateProperty) - return "NULL"; - else if(p instanceof DateTimeProperty) - return "NULL"; - else if (p instanceof DoubleProperty) - return "0.0"; - else if (p instanceof FloatProperty) - return "0.0f"; - else if (p instanceof IntegerProperty) - return "0"; - else if (p instanceof LongProperty) - return "0L"; - else if (p instanceof DecimalProperty) - return "0.0"; - else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "new QMap()"; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - if(!languageSpecificPrimitives.contains(inner)) { - inner += "*"; - } - return "new QList<" + inner + ">()"; - } - // else - if(p instanceof RefProperty) { - RefProperty rp = (RefProperty) p; - return "new " + toModelName(rp.getSimpleRef()) + "()"; - } - return "NULL"; - } - - - /** - * Optional - swagger type conversion. This is used to map swagger types in a `Property` into - * either language specific types via `typeMapping` or into complex models if there is not a mapping. - * - * @return a string value of the type or complex model for this property - * @see com.wordnik.swagger.models.properties.Property - */ - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - if(foundationClasses.contains(type)) - return type; - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toModelName(String type) { - if(typeMapping.keySet().contains(type) || - typeMapping.values().contains(type) || - importMapping.values().contains(type) || - defaultIncludes.contains(type) || - languageSpecificPrimitives.contains(type)) { - return type; - } - else { - return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1); - } - } - - @Override - public String toApiName(String type) { - return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1) + "Api"; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RetrofitClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RetrofitClientCodegen.java deleted file mode 100644 index 6f80f8a5c5e..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RetrofitClientCodegen.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class RetrofitClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-java-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/java"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "retrofit"; - } - - public String getHelp() { - return "Generates a Retrofit client library."; - } - - public RetrofitClientCodegen() { - super(); - outputFolder = "generated-code/java"; - modelTemplateFiles.put("model.mustache", ".java"); - apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "retrofit"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "continue", "for", "new", "switch", "assert", - "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while") - ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - supportingFiles.add(new SupportingFile("service.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ServiceGenerator.java")); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "Object") - ); - instantiationTypes.put("array", "ArrayList"); - instantiationTypes.put("map", "HashMap"); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, do nothing - if (name.matches("^[A-Z_]*$")) - return name; - - // camelize (lower first character) the variable name - // pet_id => petId - name = camelize(name, true); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + ""; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return camelize(operationId, true); - } - - public Map postProcessOperations(Map objs) { - Map operations = (Map)objs.get("operations"); - if(operations != null) { - List ops = (List) operations.get("operation"); - for(CodegenOperation operation : ops) { - if (operation.hasConsumes == Boolean.TRUE) { - Map firstType = operation.consumes.get(0); - if (firstType != null) { - if ("multipart/form-data".equals(firstType.get("mediaType"))) { - operation.isMultipart = Boolean.TRUE; - } - } - } - if(operation.returnType == null) { - operation.returnType = "Void"; - } - } - } - return objs; - } -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java deleted file mode 100644 index 3ca7758b1a3..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String gemName = "swagger_client"; - protected String moduleName = null; - protected String libFolder = "lib"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "ruby"; - } - - public String getHelp() { - return "Generates a Ruby client library."; - } - - /** - * Generate Ruby module name from the gem name, e.g. use "SwaggerClient" for "swagger_client". - */ - public String generateModuleName() { - return camelize(gemName.replaceAll("[^\\w]+", "_")); - } - - public RubyClientCodegen() { - super(); - moduleName = generateModuleName(); - modelPackage = gemName + "/models"; - apiPackage = gemName + "/api"; - outputFolder = "generated-code" + File.separatorChar + "ruby"; - modelTemplateFiles.put("model.mustache", ".rb"); - apiTemplateFiles.put("api.mustache", ".rb"); - templateDir = "ruby"; - - typeMapping.clear(); - languageSpecificPrimitives.clear(); - - reservedWords = new HashSet ( - Arrays.asList( - "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__", - "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN", - "break", "do", "false", "next", "rescue", "then", "when", "END", "case", - "else", "for", "nil", "retry", "true", "while", "alias", "class", "elsif", - "if", "not", "return", "undef", "yield") - ); - - additionalProperties.put("gemName", gemName); - additionalProperties.put("moduleName", moduleName); - - languageSpecificPrimitives.add("int"); - languageSpecificPrimitives.add("array"); - languageSpecificPrimitives.add("map"); - languageSpecificPrimitives.add("string"); - languageSpecificPrimitives.add("DateTime"); - - typeMapping.put("long", "int"); - typeMapping.put("integer", "int"); - typeMapping.put("Array", "array"); - typeMapping.put("String", "string"); - typeMapping.put("List", "array"); - typeMapping.put("map", "map"); - - String baseFolder = "lib" + File.separatorChar + gemName; - String swaggerFolder = baseFolder + File.separatorChar + "swagger"; - String modelFolder = baseFolder + File.separatorChar + "models"; - supportingFiles.add(new SupportingFile("swagger_client.gemspec.mustache", "", gemName + ".gemspec")); - supportingFiles.add(new SupportingFile("swagger_client.mustache", "lib", gemName + ".rb")); - supportingFiles.add(new SupportingFile("monkey.mustache", baseFolder, "monkey.rb")); - supportingFiles.add(new SupportingFile("swagger.mustache", baseFolder, "swagger.rb")); - supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "request.mustache", swaggerFolder, "request.rb")); - supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "response.mustache", swaggerFolder, "response.rb")); - supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "version.mustache", swaggerFolder, "version.rb")); - supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "configuration.mustache", swaggerFolder, "configuration.rb")); - supportingFiles.add(new SupportingFile("base_object.mustache", modelFolder, "base_object.rb")); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "api"; - } - - public String modelFileFolder() { - return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "models"; - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) { - return type; - } - } - else - type = swaggerType; - if(type == null) - return null; - return type; - } - - public String toDefaultValue(Property p) { - return "null"; - } - - @Override - public String toVarName(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // if it's all uppper case, convert to lower case - if (name.matches("^[A-Z_]*$")) - name = name.toLowerCase(); - - // camelize (lower first character) the variable name - // petId => pet_id - name = underscore(name); - - // for reserved word or word starting with number, append _ - if(reservedWords.contains(name) || name.matches("^\\d.*")) - name = escapeReservedWord(name); - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelName(String name) { - // 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"); - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - - @Override - public String toModelFilename(String name) { - // 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"); - - // underscore the model file name - // PhoneNumber.rb => phone_number.rb - return underscore(name); - } - - @Override - public String toApiFilename(String name) { - // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - - // e.g. PhoneNumberApi.rb => phone_number_api.rb - return underscore(name) + "_api"; - } - - @Override - public String toApiName(String name) { - if(name.length() == 0) - return "DefaultApi"; - // e.g. phone_number_api => PhoneNumberApi - return camelize(name) + "Api"; - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return underscore(operationId); - } - - @Override - public String toModelImport(String name) { - return modelPackage() + "/" + toModelFilename(name); - } - - @Override - public String toApiImport(String name) { - return apiPackage() + "/" + toApiFilename(name); - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java deleted file mode 100644 index 4695cc3d065..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "io.swagger.client"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-scala-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/scala"; - protected String authScheme = ""; - protected boolean authPreemptive = false; - protected boolean asyncHttpClient = !authScheme.isEmpty(); - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "scala"; - } - - public String getHelp() { - return "Generates a Scala client library."; - } - - public ScalaClientCodegen() { - super(); - outputFolder = "generated-code/scala"; - modelTemplateFiles.put("model.mustache", ".scala"); - apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "scala"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "case", "catch", "class", "def", "do", "else", "extends", - "false", "final", "finally", "for", "forSome", "if", "implicit", - "import", "lazy", "match", "new", "null", "object", "override", "package", - "private", "protected", "return", "sealed", "super", "this", "throw", - "trait", "try", "true", "type", "val", "var", "while", "with", "yield") - ); - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - additionalProperties.put("asyncHttpClient", asyncHttpClient); - additionalProperties.put("authScheme", authScheme); - additionalProperties.put("authPreemptive", authPreemptive); - - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); - supportingFiles.add(new SupportingFile("apiInvoker.mustache", - (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala")); - - importMapping.remove("List"); - importMapping.remove("Set"); - importMapping.remove("Map"); - - importMapping.put("DateTime", "org.joda.time.DateTime"); - importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer"); - - typeMapping = new HashMap(); - typeMapping.put("enum", "NSString"); - typeMapping.put("array", "List"); - typeMapping.put("set", "Set"); - typeMapping.put("boolean", "Boolean"); - typeMapping.put("string", "String"); - typeMapping.put("int", "Int"); - typeMapping.put("long", "Long"); - typeMapping.put("float", "Float"); - typeMapping.put("byte", "Byte"); - typeMapping.put("short", "Short"); - typeMapping.put("char", "Char"); - typeMapping.put("long", "Long"); - typeMapping.put("double", "Double"); - typeMapping.put("object", "Any"); - typeMapping.put("file", "File"); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Int", - "Long", - "Float", - "Object", - "List", - "Map") - ); - instantiationTypes.put("array", "ListBuffer"); - instantiationTypes.put("map", "HashMap"); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return instantiationTypes.get("map") + "[String, " + inner + "]"; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return instantiationTypes.get("array") + "[" + inner + "]"; - } - else - return null; - } - - public String toDefaultValue(Property p) { - if(p instanceof StringProperty) - return "null"; - else if (p instanceof BooleanProperty) - return "null"; - else if(p instanceof DateProperty) - return "null"; - else if(p instanceof DateTimeProperty) - return "null"; - else if (p instanceof DoubleProperty) - return "null"; - else if (p instanceof FloatProperty) - return "null"; - else if (p instanceof IntegerProperty) - return "null"; - else if (p instanceof LongProperty) - return "null"; - else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "new HashMap[String, " + inner + "]() "; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return "new ListBuffer[" + inner + "]() "; - } - else - return "null"; - } - - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - return camelize(operationId, true); - } - -} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java deleted file mode 100644 index 2434ca10ee1..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; -import com.wordnik.swagger.util.Json; - -import java.util.*; -import java.io.File; - -public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "com.wordnik.client"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/scala"; - - public CodegenType getTag() { - return CodegenType.SERVER; - } - - public String getName() { - return "scalatra"; - } - - public String getHelp() { - return "Generates a Scala server application with Scalatra."; - } - - public ScalatraServerCodegen() { - super(); - outputFolder = "generated-code/scalatra"; - modelTemplateFiles.put("model.mustache", ".scala"); - apiTemplateFiles.put("api.mustache", ".scala"); - templateDir = "scalatra"; - apiPackage = "com.wordnik.client.api"; - modelPackage = "com.wordnik.client.model"; - - reservedWords = new HashSet ( - Arrays.asList( - "abstract", "continue", "for", "new", "switch", "assert", - "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while") - ); - - defaultIncludes = new HashSet( - Arrays.asList("double", - "Int", - "Long", - "Float", - "Double", - "char", - "float", - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "List", - "Set", - "Map") - ); - - typeMapping.put("integer", "Int"); - typeMapping.put("long", "Long"); - - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); - additionalProperties.put("infoUrl", "http://developers.helloreverb.com"); - additionalProperties.put("infoEmail", "hello@helloreverb.com"); - additionalProperties.put("licenseInfo", "All rights reserved"); - additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - - supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - supportingFiles.add(new SupportingFile("build.sbt", "", "build.sbt")); - supportingFiles.add(new SupportingFile("web.xml", "/src/main/webapp/WEB-INF", "web.xml")); - supportingFiles.add(new SupportingFile("JettyMain.scala", sourceFolder, "JettyMain.scala")); - supportingFiles.add(new SupportingFile("Bootstrap.mustache", sourceFolder, "ScalatraBootstrap.scala")); - supportingFiles.add(new SupportingFile("ServletApp.mustache", sourceFolder, "ServletApp.scala")); - supportingFiles.add(new SupportingFile("project/build.properties", "project", "build.properties")); - supportingFiles.add(new SupportingFile("project/plugins.sbt", "project", "plugins.sbt")); - supportingFiles.add(new SupportingFile("sbt", "", "sbt")); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "Object") - ); - instantiationTypes.put("array", "ArrayList"); - instantiationTypes.put("map", "HashMap"); - - importMapping = new HashMap (); - importMapping.put("BigDecimal", "java.math.BigDecimal"); - importMapping.put("UUID", "java.util.UUID"); - importMapping.put("File", "java.io.File"); - importMapping.put("Date", "java.util.Date"); - importMapping.put("Timestamp", "java.sql.Timestamp"); - importMapping.put("Map", "java.util.Map"); - importMapping.put("HashMap", "java.util.HashMap"); - importMapping.put("Array", "java.util.List"); - importMapping.put("ArrayList", "java.util.ArrayList"); - importMapping.put("DateTime", "org.joda.time.DateTime"); - importMapping.put("LocalDateTime", "org.joda.time.LocalDateTime"); - importMapping.put("LocalDate", "org.joda.time.LocalDate"); - importMapping.put("LocalTime", "org.joda.time.LocalTime"); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - @Override - public Map postProcessOperations(Map objs) { - Map operations = (Map) objs.get("operations"); - List operationList = (List) operations.get("operation"); - for(CodegenOperation op: operationList) { - op.httpMethod = op.httpMethod.toLowerCase(); - } - return objs; - } - - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticDocCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticDocCodegen.java deleted file mode 100644 index f6c24d381bd..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticDocCodegen.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig { - protected String invokerPackage = "com.wordnik.client"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "docs"; - - public CodegenType getTag() { - return CodegenType.DOCUMENTATION; - } - - public String getName() { - return "dynamic-html"; - } - - public String getHelp() { - return "Generates a dynamic HTML site."; - } - - public StaticDocCodegen() { - super(); - outputFolder = "docs"; - modelTemplateFiles.put("model.mustache", ".html"); - apiTemplateFiles.put("operation.mustache", ".html"); - templateDir = "swagger-static"; - - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - - supportingFiles.add(new SupportingFile("package.mustache", "", "package.json")); - supportingFiles.add(new SupportingFile("main.mustache", "", "main.js")); - supportingFiles.add(new SupportingFile("assets/css/bootstrap-responsive.css", - outputFolder + "/assets/css", "bootstrap-responsive.css")); - supportingFiles.add(new SupportingFile("assets/css/bootstrap.css", - outputFolder + "/assets/css", "bootstrap.css")); - supportingFiles.add(new SupportingFile("assets/css/style.css", - outputFolder + "/assets/css", "style.css")); - supportingFiles.add(new SupportingFile("assets/images/logo.png", - outputFolder + "/assets/images", "logo.png")); - supportingFiles.add(new SupportingFile("assets/js/bootstrap.js", - outputFolder + "/assets/js", "bootstrap.js")); - supportingFiles.add(new SupportingFile("assets/js/jquery-1.8.3.min.js", - 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", - outputFolder, "index.html")); - - instantiationTypes.put("array", "ArrayList"); - instantiationTypes.put("map", "HashMap"); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + "operations"; - } - - public String modelFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + "models"; - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java deleted file mode 100644 index 7186f24a0e0..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.models.properties.*; -import com.wordnik.swagger.util.Json; - -import java.util.*; -import java.io.File; - -public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig { - private static final String ALL_OPERATIONS = ""; - protected String invokerPackage = "com.wordnik.client"; - protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/scala"; - - public CodegenType getTag() { - return CodegenType.DOCUMENTATION; - } - - public String getName() { - return "html"; - } - - public String getHelp() { - return "Generates a static HTML file."; - } - - public StaticHtmlGenerator() { - super(); - outputFolder = "docs"; - templateDir = "htmlDocs"; - - defaultIncludes = new HashSet(); - - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); - additionalProperties.put("infoUrl", "https://helloreverb.com"); - additionalProperties.put("infoEmail", "hello@helloreverb.com"); - additionalProperties.put("licenseInfo", "All rights reserved"); - additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); - additionalProperties.put("invokerPackage", invokerPackage); - additionalProperties.put("groupId", groupId); - additionalProperties.put("artifactId", artifactId); - additionalProperties.put("artifactVersion", artifactVersion); - - supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); - reservedWords = new HashSet(); - - languageSpecificPrimitives = new HashSet(); - importMapping = new HashMap (); - } - - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - - return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public Map postProcessOperations(Map objs) { - Map operations = (Map) objs.get("operations"); - List operationList = (List) operations.get("operation"); - for(CodegenOperation op: operationList) { - op.httpMethod = op.httpMethod.toLowerCase(); - } - return objs; - } - - @Override - public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { - List opList = operations.get(ALL_OPERATIONS); - if(opList == null) { - opList = new ArrayList(); - operations.put(ALL_OPERATIONS, opList); - } - for (CodegenOperation addedOperation: opList){ - if (addedOperation.operationId.equals(co.operationId) && addedOperation.path.equals(co.path) && addedOperation.httpMethod.equals(co.httpMethod)) { - addedOperation.tags.addAll(co.tags); - return; - } - } - opList.add(co); - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerGenerator.java deleted file mode 100644 index c0560e2a1bc..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerGenerator.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.util.*; -import com.wordnik.swagger.models.Swagger; - -import org.apache.commons.io.FileUtils; - -import java.io.File; - -public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { - public CodegenType getTag() { - return CodegenType.DOCUMENTATION; - } - - public String getName() { - return "swagger"; - } - - public String getHelp() { - return "Creates a static swagger.json file."; - } - - public SwaggerGenerator() { - super(); - templateDir = "swagger"; - outputFolder = "generated-code/swagger"; - - supportingFiles.add(new SupportingFile("README.md", "", "README.md")); - } - - @Override - public void processSwagger(Swagger swagger) { - String swaggerString = Json.pretty(swagger); - - try{ - String outputFile = outputFolder + File.separator + "swagger.json"; - FileUtils.writeStringToFile(new File(outputFile), swaggerString); - System.out.println("wrote file to " + outputFile); - } - catch(Exception e) { - e.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerYamlGenerator.java deleted file mode 100644 index 7c65168546f..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerYamlGenerator.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.util.*; -import com.wordnik.swagger.models.Swagger; - -import org.apache.commons.io.FileUtils; - -import java.io.File; - -public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig { - public CodegenType getTag() { - return CodegenType.DOCUMENTATION; - } - - public String getName() { - return "swagger-yaml"; - } - - public String getHelp() { - return "Creates a static swagger.yaml file."; - } - - public SwaggerYamlGenerator() { - super(); - templateDir = "swagger"; - outputFolder = "generated-code/swagger"; - - supportingFiles.add(new SupportingFile("README.md", "", "README.md")); - } - - @Override - public void processSwagger(Swagger swagger) { - try{ - String swaggerString = Yaml.mapper().writeValueAsString(swagger); - String outputFile = outputFolder + File.separator + "swagger.yaml"; - FileUtils.writeStringToFile(new File(outputFile), swaggerString); - System.out.println("wrote file to " + outputFile); - } - catch(Exception e) { - e.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java deleted file mode 100644 index e763c51e1ac..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.Model; -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.models.parameters.HeaderParameter; -import com.wordnik.swagger.models.parameters.Parameter; -import com.wordnik.swagger.models.properties.*; -import org.apache.commons.lang.StringUtils; - -import javax.annotation.Nullable; -import java.util.*; -import java.io.File; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class SwiftGenerator extends DefaultCodegen implements CodegenConfig { - private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}"); - protected String sourceFolder = "Classes/Swaggers"; - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "swift"; - } - - public String getHelp() { - return "Generates a swift client library."; - } - - public SwiftGenerator() { - super(); - outputFolder = "generated-code/swift"; - modelTemplateFiles.put("model.mustache", ".swift"); - apiTemplateFiles.put("api.mustache", ".swift"); - templateDir = "swift"; - apiPackage = "/APIs"; - modelPackage = "/Models"; - - // Inject application name - String appName = System.getProperty("appName"); - if (appName == null) { - appName = "SwaggerClient"; - } - additionalProperties.put("projectName", appName); - - // Inject base url override - String basePathOverride = System.getProperty("basePathOverride"); - if (basePathOverride != null) { - additionalProperties.put("basePathOverride", basePathOverride); - } - - sourceFolder = appName + "/" + sourceFolder; - - supportingFiles.add(new SupportingFile("Cartfile.mustache", "", "Cartfile")); - supportingFiles.add(new SupportingFile("APIHelper.mustache", sourceFolder, "APIHelper.swift")); - supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", sourceFolder, "AlamofireImplementations.swift")); - supportingFiles.add(new SupportingFile("Extensions.mustache", sourceFolder, "Extensions.swift")); - supportingFiles.add(new SupportingFile("Models.mustache", sourceFolder, "Models.swift")); - supportingFiles.add(new SupportingFile("APIs.mustache", sourceFolder, "APIs.swift")); - - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "Int", - "Float", - "Double", - "Bool", - "Void", - "String", - "Character") - ); - defaultIncludes = new HashSet( - Arrays.asList( - "NSDate", - "Array", - "Dictionary", - "Set", - "Any", - "Empty", - "AnyObject") - ); - reservedWords = new HashSet( - Arrays.asList( - "class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue", - "false", "dynamic", "extension", "default", "is", "didSet", "func", "do", "nil", "final", "import", "else", - "self", "get", "init", "fallthrough", "Self", "infix", "internal", "for", "super", "inout", "let", "if", - "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol", - "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional", - "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol", - "required", "right", "set", "Type", "unowned", "weak") - ); - - typeMapping = new HashMap(); - typeMapping.put("array", "Array"); - typeMapping.put("List", "Array"); - typeMapping.put("map", "Dictionary"); - typeMapping.put("date", "NSDate"); - typeMapping.put("Date", "NSDate"); - typeMapping.put("DateTime", "NSDate"); - typeMapping.put("boolean", "Bool"); - typeMapping.put("string", "String"); - typeMapping.put("char", "Character"); - typeMapping.put("short", "Int"); - typeMapping.put("int", "Int"); - typeMapping.put("long", "Int"); - typeMapping.put("integer", "Int"); - typeMapping.put("Integer", "Int"); - typeMapping.put("float", "Float"); - typeMapping.put("number", "Double"); - typeMapping.put("double", "Double"); - typeMapping.put("object", "AnyObject"); - typeMapping.put("file", "NSData"); - - importMapping = new HashMap(); - } - - @Override - public String escapeReservedWord(String name) { - return "_" + name; // add an underscore to the name - } - - @Override - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + apiPackage().replace('.', File.separatorChar); - } - - @Override - public String getTypeDeclaration(Property p) { - if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return "[" + getTypeDeclaration(inner) + "]"; - } else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - return "[String:" + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if (typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if (languageSpecificPrimitives.contains(type)) - return toModelName(type); - } else - type = swaggerType; - return toModelName(type); - } - - @Override - public String toDefaultValue(Property p) { - // nil - return null; - } - - @Override - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "[String:" + inner + "]"; - } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return "[" + inner + "]"; - } - return null; - } - - @Override - public CodegenProperty fromProperty(String name, Property p) { - CodegenProperty codegenProperty = super.fromProperty(name, p); - if (codegenProperty.isEnum) { - List> swiftEnums = new ArrayList>(); - List values = (List) codegenProperty.allowableValues.get("values"); - for (String value : values) { - Map map = new HashMap(); - map.put("enum", StringUtils.capitalize(value)); - map.put("raw", value); - swiftEnums.add(map); - } - codegenProperty.allowableValues.put("values", swiftEnums); - codegenProperty.datatypeWithEnum = - StringUtils.left(codegenProperty.datatypeWithEnum, codegenProperty.datatypeWithEnum.length() - "Enum".length()); - } - return codegenProperty; - } - - @Override - public String toApiName(String name) { - if(name.length() == 0) - return "DefaultAPI"; - return initialCaps(name) + "API"; - } - - @Override - public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map definitions) { - path = normalizePath(path); - List parameters = operation.getParameters(); - parameters = Lists.newArrayList(Iterators.filter(parameters.iterator(), new Predicate() { - @Override - public boolean apply(@Nullable Parameter parameter) { - return !(parameter instanceof HeaderParameter); - } - })); - operation.setParameters(parameters); - return super.fromOperation(path, httpMethod, operation, definitions); - } - - private static String normalizePath(String path) { - StringBuilder builder = new StringBuilder(); - - int cursor = 0; - Matcher matcher = PATH_PARAM_PATTERN.matcher(path); - boolean found = matcher.find(); - while (found) { - String stringBeforeMatch = path.substring(cursor, matcher.start()); - builder.append(stringBeforeMatch); - - String group = matcher.group().substring(1, matcher.group().length() - 1); - group = camelize(group, true); - builder - .append("{") - .append(group) - .append("}"); - - cursor = matcher.end(); - found = matcher.find(); - } - - String stringAfterMatch = path.substring(cursor); - builder.append(stringAfterMatch); - - return builder.toString(); - } -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java deleted file mode 100644 index ab9fa033f1c..00000000000 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java +++ /dev/null @@ -1,258 +0,0 @@ -package com.wordnik.swagger.codegen.languages; - -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig { - protected Set foundationClasses = new HashSet(); - protected String sourceFolder = "client"; - protected static String PREFIX = "Sami"; - protected Map namespaces = new HashMap(); - - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - public String getName() { - return "tizen"; - } - - public String getHelp() { - return "Generates a Samsung Tizen C++ client library."; - } - - public TizenClientCodegen() { - super(); - outputFolder = "generated-code/tizen"; - modelTemplateFiles.put("model-header.mustache", ".h"); - modelTemplateFiles.put("model-body.mustache", ".cpp"); - apiTemplateFiles.put("api-header.mustache", ".h"); - apiTemplateFiles.put("api-body.mustache", ".cpp"); - templateDir = "tizen"; - modelPackage = ""; - - defaultIncludes = new HashSet( - Arrays.asList( - "bool", - "int", - "long") - ); - languageSpecificPrimitives = new HashSet(); - - additionalProperties().put("prefix", PREFIX); - - reservedWords = new HashSet( - // VERIFY - Arrays.asList( - "void", "char", "short", "int", "void", "char", "short", "int", - "long", "float", "double", "signed", "unsigned", "id", "const", - "volatile", "in", "out", "inout", "bycopy", "byref", "oneway", - "self", "super" - )); - - super.typeMapping = new HashMap(); - - typeMapping.put("Date", "DateTime"); - typeMapping.put("DateTime", "DateTime"); - typeMapping.put("string", "String"); - typeMapping.put("integer", "Integer"); - typeMapping.put("float", "Float"); - typeMapping.put("long", "Long"); - typeMapping.put("boolean", "Boolean"); - typeMapping.put("double", "Double"); - typeMapping.put("array", "IList"); - typeMapping.put("map", "HashMap"); - typeMapping.put("number", "Long"); - typeMapping.put("object", PREFIX + "Object"); - - importMapping = new HashMap(); - - namespaces = new HashMap (); - namespaces.put("DateTime", "Tizen::Base::DateTime"); - namespaces.put("Integer", "Tizen::Base::Integer"); - namespaces.put("Long", "Tizen::Base::Long"); - namespaces.put("Boolean", "Tizen::Base::Boolean"); - namespaces.put("Float", "Tizen::Base::Float"); - namespaces.put("String", "Tizen::Base::String"); - namespaces.put("Double", "Tizen::Base::Double"); - namespaces.put("IList", "Tizen::Base::Collection::IList"); - namespaces.put("HashMap", "Tizen::Base::Collection::HashMap"); - namespaces.put("ArrayList", "Tizen::Base::Collection::ArrayList"); - namespaces.put("JsonNumber", "Tizen::Web::Json"); - namespaces.put("JsonString", "Tizen::Web::Json"); - - foundationClasses = new HashSet ( - Arrays.asList( - "String", - "Integer", - "Float") - ); - supportingFiles.clear(); - supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h")); - supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h")); - supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp")); - supportingFiles.add(new SupportingFile("apiclient-header.mustache", sourceFolder, PREFIX + "ApiClient.h")); - supportingFiles.add(new SupportingFile("apiclient-body.mustache", sourceFolder, PREFIX + "ApiClient.cpp")); - supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h")); - supportingFiles.add(new SupportingFile("error-header.mustache", sourceFolder, PREFIX + "Error.h")); - supportingFiles.add(new SupportingFile("error-body.mustache", sourceFolder, PREFIX + "Error.cpp")); - } - - @Override - public String toInstantiationType(Property p) { - if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return instantiationTypes.get("map"); - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return instantiationTypes.get("array"); - } - else - return null; - } - - @Override - public String getTypeDeclaration(String name) { - if(languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name)) - return name; - else - return name + "*"; - } - - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) - return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } - - @Override - public String getTypeDeclaration(Property p) { - String swaggerType = getSwaggerType(p); - if(languageSpecificPrimitives.contains(swaggerType) && !foundationClasses.contains(swaggerType)) - return toModelName(swaggerType); - else - return swaggerType + "*"; - } - - @Override - public String toModelName(String type) { - if(typeMapping.keySet().contains(type) || - typeMapping.values().contains(type) || - foundationClasses.contains(type) || - importMapping.values().contains(type) || - defaultIncludes.contains(type) || - languageSpecificPrimitives.contains(type)) { - return type; - } - else { - return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1); - } - } - - @Override - public String toModelImport(String name) { - if(namespaces.containsKey(name)) { - return "using " + namespaces.get(name) + ";"; - } - return "#include \"" + name + ".h\""; - } - - @Override - public String toDefaultValue(Property p) { - if(p instanceof StringProperty) - return "new String()"; - else if (p instanceof BooleanProperty) - return "new Boolean(false)"; - else if(p instanceof DateProperty) - return "new DateTime()"; - else if(p instanceof DateTimeProperty) - return "new DateTime()"; - else if (p instanceof DoubleProperty) - return "new Double()"; - else if (p instanceof FloatProperty) - return "new Float()"; - else if (p instanceof IntegerProperty) - return "new Integer()"; - else if (p instanceof LongProperty) - return "new Long()"; - else if (p instanceof DecimalProperty) - return "new Long()"; - else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); - return "new HashMap()"; - } - else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); - return "new ArrayList()"; - } - // else - if(p instanceof RefProperty) { - RefProperty rp = (RefProperty) p; - return "new " + toModelName(rp.getSimpleRef()) + "()"; - } - return "null"; - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separator + sourceFolder; - } - - @Override - public String modelFileFolder() { - return outputFolder + File.separator + sourceFolder; - } - - @Override - public String toModelFilename(String name) { - return PREFIX + initialCaps(name); - } - - @Override - public String toApiName(String name) { - return PREFIX + initialCaps(name) + "Api"; - } - - public String toApiFilename(String name) { - return PREFIX + initialCaps(name) + "Api"; - } - - @Override - public String toVarName(String name) { - String paramName = name.replaceAll("[^a-zA-Z0-9_]",""); - paramName = Character.toUpperCase(paramName.charAt(0)) + paramName.substring(1); - return "p" + paramName; - } - - public String escapeReservedWord(String name) { - return "_" + name; - } - - @Override - public String toOperationId(String operationId) { - // method name cannot use reserved keyword, e.g. return$ - if(reservedWords.contains(operationId)) - throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); - - // add_pet_by_id => addPetById - return camelize(operationId, true); - } - -} diff --git a/modules/swagger-codegen/src/main/java/config/Config.java b/modules/swagger-codegen/src/main/java/config/Config.java index 9bc4bf58624..8b8f1b36a96 100644 --- a/modules/swagger-codegen/src/main/java/config/Config.java +++ b/modules/swagger-codegen/src/main/java/config/Config.java @@ -1,33 +1,34 @@ package config; import com.google.common.collect.ImmutableMap; + import java.util.HashMap; import java.util.Map; public class Config { - private Map options; - - public Config() { - this.options = new HashMap(); - } - - public Config(Map properties) { - this.options = properties; - } - - public Map getOptions() { - return ImmutableMap.copyOf(options); - } - - public boolean hasOption(String opt){ - return options.containsKey(opt); - } - - public String getOption(String opt){ - return options.get(opt); - } - - public void setOption(String opt, String value){ - options.put(opt, value); - } + private Map options; + + public Config() { + this.options = new HashMap(); + } + + public Config(Map properties) { + this.options = properties; + } + + public Map getOptions() { + return ImmutableMap.copyOf(options); + } + + public boolean hasOption(String opt) { + return options.containsKey(opt); + } + + public String getOption(String opt) { + return options.get(opt); + } + + public void setOption(String opt, String value) { + options.put(opt, value); + } } diff --git a/modules/swagger-codegen/src/main/java/config/ConfigParser.java b/modules/swagger-codegen/src/main/java/config/ConfigParser.java index cbb1b78f645..101fbb0d256 100644 --- a/modules/swagger-codegen/src/main/java/config/ConfigParser.java +++ b/modules/swagger-codegen/src/main/java/config/ConfigParser.java @@ -2,40 +2,39 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; + import java.io.File; import java.util.Iterator; import java.util.Map; public class ConfigParser { - public static Config read(String location) { - - System.out.println("reading config from " + location); - - ObjectMapper mapper = new ObjectMapper(); - - Config config = new Config(); - - try { - JsonNode rootNode = mapper.readTree(new File(location)); - Iterator> optionNodes = rootNode.fields(); - - while (optionNodes.hasNext()) { - Map.Entry optionNode = (Map.Entry) optionNodes.next(); - - if(optionNode.getValue().isValueNode()){ - config.setOption(optionNode.getKey(), optionNode.getValue().asText()); - } - else{ - System.out.println("omitting non-value node " + optionNode.getKey()); + public static Config read(String location) { + + System.out.println("reading config from " + location); + + ObjectMapper mapper = new ObjectMapper(); + + Config config = new Config(); + + try { + JsonNode rootNode = mapper.readTree(new File(location)); + Iterator> optionNodes = rootNode.fields(); + + while (optionNodes.hasNext()) { + Map.Entry optionNode = (Map.Entry) optionNodes.next(); + + if (optionNode.getValue().isValueNode()) { + config.setOption(optionNode.getKey(), optionNode.getValue().asText()); + } else { + System.out.println("omitting non-value node " + optionNode.getKey()); + } + } + } catch (Exception e) { + System.out.println(e.getMessage()); + return null; } - } - } - catch (Exception e) { - System.out.println(e.getMessage()); - return null; + + return config; } - - return config; - } } 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 new file mode 100644 index 00000000000..54a2f7efae0 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -0,0 +1,69 @@ +package io.swagger.codegen; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.regex.Pattern; + +public abstract class AbstractGenerator { + + public File writeToFile(String filename, String contents) throws IOException { + System.out.println("writing file " + filename); + File output = new File(filename); + + if (output.getParent() != null && !new File(output.getParent()).exists()) { + File parent = new File(output.getParent()); + parent.mkdirs(); + } + Writer out = new BufferedWriter(new OutputStreamWriter( + new FileOutputStream(output), "UTF-8")); + + out.write(contents); + out.close(); + return output; + } + + public String readTemplate(String name) { + try { + Reader reader = getTemplateReader(name); + if (reader == null) { + throw new RuntimeException("no file found"); + } + java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A"); + return s.hasNext() ? s.next() : ""; + } catch (Exception e) { + e.printStackTrace(); + } + throw new RuntimeException("can't load template " + name); + } + + public Reader getTemplateReader(String name) { + try { + InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name)); + if (is == null) { + is = new FileInputStream(new File(name)); + } + if (is == null) { + throw new RuntimeException("no file found"); + } + return new InputStreamReader(is); + } catch (Exception e) { + e.printStackTrace(); + } + throw new RuntimeException("can't load template " + name); + } + + private String getCPResourcePath(String name) { + if (!"/".equals(File.separator)) { + return name.replaceAll(Pattern.quote(File.separator), "/"); + } + return name; + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..1aa0937b31b --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java @@ -0,0 +1,23 @@ +package io.swagger.codegen; + +public class CliOption { + private final String opt; + private String description; + + public CliOption(String opt, String description) { + this.opt = opt; + this.description = description; + } + + public String getOpt() { + return opt; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java new file mode 100644 index 00000000000..da026c7f040 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java @@ -0,0 +1,92 @@ +package io.swagger.codegen; + +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.Swagger; +import io.swagger.models.auth.AuthorizationValue; + +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; + +public class ClientOptInput { + protected CodegenConfig config; + private ClientOpts opts; + private Swagger swagger; + private List auths; + + public ClientOptInput swagger(Swagger swagger) { + this.setSwagger(swagger); + return this; + } + + public ClientOptInput opts(ClientOpts opts) { + this.setOpts(opts); + return this; + } + + public String getAuth() { + if (auths != null) { + StringBuilder b = new StringBuilder(); + for (AuthorizationValue v : auths) { + try { + if (b.toString().length() > 0) { + b.append(","); + } + b.append(URLEncoder.encode(v.getKeyName(), "UTF-8")) + .append(":") + .append(URLEncoder.encode(v.getValue(), "UTF-8")); + } catch (Exception e) { + // continue + e.printStackTrace(); + } + } + return b.toString(); + } else { + return null; + } + } + + public void setAuth(String urlEncodedAuthString) { + List auths = new ArrayList(); + if (urlEncodedAuthString != null && !"".equals(urlEncodedAuthString)) { + String[] parts = urlEncodedAuthString.split(","); + for (String part : parts) { + String[] kvPair = part.split(":"); + if (kvPair.length == 2) { + auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header")); + } + } + } + this.auths = auths; + } + + public List getAuthorizationValues() { + return auths; + } + + public CodegenConfig getConfig() { + return config; + } + + public void setConfig(CodegenConfig config) { + this.config = config; + } + + public ClientOpts getOpts() { + return opts; + } + + public void setOpts(ClientOpts opts) { + this.opts = opts; + } + + @ApiModelProperty(dataType = "Object") + public Swagger getSwagger() { + return swagger; + } + + public void setSwagger(Swagger swagger) { + this.swagger = swagger; + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java new file mode 100644 index 00000000000..9c4d41f7bfd --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java @@ -0,0 +1,57 @@ +package io.swagger.codegen; + +import io.swagger.codegen.auth.AuthMethod; + +import java.util.HashMap; +import java.util.Map; + +public class ClientOpts { + protected String uri; + protected String target; + protected AuthMethod auth; + protected Map properties = new HashMap(); + protected String outputDirectory; + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public Map getProperties() { + return properties; + } + + public void setProperties(Map properties) { + this.properties = properties; + } + + public String getOutputDirectory() { + return outputDirectory; + } + + public void setOutputDirectory(String outputDirectory) { + this.outputDirectory = outputDirectory; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("ClientOpts: {\n"); + sb.append(" uri: ").append(uri).append(","); + sb.append(" auth: ").append(auth).append(","); + sb.append(properties); + sb.append("}"); + return sb.toString(); + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java new file mode 100644 index 00000000000..c99e04e5494 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java @@ -0,0 +1,148 @@ +package io.swagger.codegen; + +import io.swagger.models.Swagger; +import io.swagger.parser.SwaggerParser; +import org.apache.commons.cli.BasicParser; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; + +/** + * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator} + * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547 + */ +@Deprecated +public class Codegen extends DefaultGenerator { + static Map configs = new HashMap(); + static String configString; + static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" + + "\n -DdebugSwagger prints the swagger specification as interpreted by the codegen" + + "\n -DdebugModels prints models passed to the template engine" + + "\n -DdebugOperations prints operations passed to the template engine" + + "\n -DdebugSupportingFiles prints additional data passed to the template engine"; + + public static void main(String[] args) { + + StringBuilder sb = new StringBuilder(); + + Options options = new Options(); + options.addOption("h", "help", false, "shows this message"); + options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]"); + options.addOption("o", "output", true, "where to write the generated files"); + options.addOption("i", "input-spec", true, "location of the swagger spec, as URL or file"); + options.addOption("t", "template-dir", true, "folder containing the template files"); + options.addOption("d", "debug-info", false, "prints additional info for debugging"); + options.addOption("a", "auth", true, "adds authorization headers when fetching the swagger definitions remotely. Pass in a URL-encoded string of name:header with a comma separating multiple values"); + + ClientOptInput clientOptInput = new ClientOptInput(); + ClientOpts clientOpts = new ClientOpts(); + Swagger swagger = null; + + CommandLine cmd = null; + try { + CommandLineParser parser = new BasicParser(); + CodegenConfig config = null; + + cmd = parser.parse(options, args); + if (cmd.hasOption("d")) { + usage(options); + System.out.println(debugInfoOptions); + return; + } + if (cmd.hasOption("a")) { + clientOptInput.setAuth(cmd.getOptionValue("a")); + } + if (cmd.hasOption("l")) { + clientOptInput.setConfig(getConfig(cmd.getOptionValue("l"))); + } else { + usage(options); + return; + } + if (cmd.hasOption("o")) { + clientOptInput.getConfig().setOutputDir(cmd.getOptionValue("o")); + } + if (cmd.hasOption("h")) { + if (cmd.hasOption("l")) { + config = getConfig(String.valueOf(cmd.getOptionValue("l"))); + if (config != null) { + options.addOption("h", "help", true, config.getHelp()); + usage(options); + return; + } + } + usage(options); + return; + } + if (cmd.hasOption("i")) { + swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues(), true); + } + if (cmd.hasOption("t")) { + clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t"))); + } + } catch (Exception e) { + usage(options); + return; + } + try { + clientOptInput + .opts(clientOpts) + .swagger(swagger); + new Codegen().opts(clientOptInput).generate(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static List getExtensions() { + ServiceLoader loader = ServiceLoader.load(CodegenConfig.class); + List output = new ArrayList(); + Iterator itr = loader.iterator(); + while (itr.hasNext()) { + output.add(itr.next()); + } + return output; + } + + static void usage(Options options) { + HelpFormatter formatter = new HelpFormatter(); + formatter.printHelp("Codegen", options); + } + + public static CodegenConfig getConfig(String name) { + if (configs.containsKey(name)) { + return configs.get(name); + } else { + // see if it's a class + try { + System.out.println("loading class " + name); + Class customClass = Class.forName(name); + System.out.println("loaded"); + return (CodegenConfig) customClass.newInstance(); + } catch (Exception e) { + throw new RuntimeException("can't load class " + name); + } + } + } + + static { + List extensions = getExtensions(); + StringBuilder sb = new StringBuilder(); + + for (CodegenConfig config : extensions) { + if (sb.toString().length() != 0) { + sb.append(", "); + } + sb.append(config.getName()); + configs.put(config.getName(), config); + configString = sb.toString(); + } + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..6f96bd82b5d --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java @@ -0,0 +1,105 @@ +package io.swagger.codegen; + +import io.swagger.models.Model; +import io.swagger.models.Operation; +import io.swagger.models.Swagger; +import io.swagger.models.auth.SecuritySchemeDefinition; +import io.swagger.models.properties.Property; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public interface CodegenConfig { + CodegenType getTag(); + + String getName(); + + String getHelp(); + + Map additionalProperties(); + + String apiPackage(); + + String apiFileFolder(); + + String fileSuffix(); + + String outputFolder(); + + String templateDir(); + + String modelFileFolder(); + + String modelPackage(); + + String toApiName(String name); + + String toApiVarName(String name); + + String toModelName(String name); + + String toParamName(String name); + + String escapeText(String text); + + String escapeReservedWord(String name); + + String getTypeDeclaration(Property p); + + String getTypeDeclaration(String name); + + void processOpts(); + + List cliOptions(); + + String generateExamplePath(String path, Operation operation); + + Set reservedWords(); + + List supportingFiles(); + + String getOutputDir(); + + void setOutputDir(String dir); + + CodegenModel fromModel(String name, Model model); + + CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map definitions); + + List fromSecurity(Map schemes); + + Set defaultIncludes(); + + Map typeMapping(); + + Map instantiationTypes(); + + Map importMapping(); + + Map apiTemplateFiles(); + + Map modelTemplateFiles(); + + void processSwagger(Swagger swagger); + + String toApiFilename(String name); + + String toModelFilename(String name); + + String toModelImport(String name); + + String toApiImport(String name); + + void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations); + + Map postProcessModels(Map objs); + + Map postProcessOperations(Map objs); + + Map postProcessSupportingFileData(Map objs); + + String apiFilename(String templateName, String tag); + + boolean shouldOverwrite(String filename); +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java new file mode 100644 index 00000000000..6a84274774c --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java @@ -0,0 +1,18 @@ +package io.swagger.codegen; + +import io.swagger.models.ExternalDocs; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class CodegenModel { + public String parent; + public String name, classname, description, classVarName, modelJson; + public String defaultValue; + public List vars = new ArrayList(); + public Set imports = new HashSet(); + public Boolean hasVars, emptyVars, hasMoreModels, hasEnums; + public ExternalDocs externalDocs; +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelFactory.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelFactory.java new file mode 100644 index 00000000000..4c2b4d4eb87 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelFactory.java @@ -0,0 +1,39 @@ +package io.swagger.codegen; + +import java.util.HashMap; +import java.util.Map; + +public final class CodegenModelFactory { + + private static final Map> typeMapping = new HashMap>(); + + /** + * Configure a different implementation class. + * + * @param type the type that shall be replaced + * @param implementation the implementation class must extend the default class and must provide a public no-arg constructor + */ + public static void setTypeMapping(CodegenModelType type, Class implementation) { + if (!type.getDefaultImplementation().isAssignableFrom(implementation)) { + throw new IllegalArgumentException(implementation.getSimpleName() + " doesn't extend " + type.getDefaultImplementation().getSimpleName()); + } + try { + implementation.newInstance(); + } catch (Exception e) { + throw new IllegalArgumentException(e); + } + typeMapping.put(type, implementation); + } + + @SuppressWarnings("unchecked") + public static T newInstance(CodegenModelType type) { + Class classType = typeMapping.get(type); + try { + return (T) (classType != null ? classType : type.getDefaultImplementation()).newInstance(); + } catch (InstantiationException e) { + throw new RuntimeException(e); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelType.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelType.java new file mode 100644 index 00000000000..dce8ab0e2e5 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelType.java @@ -0,0 +1,21 @@ +package io.swagger.codegen; + +public enum CodegenModelType { + + MODEL(CodegenModel.class), + OPERATION(CodegenOperation.class), + PARAMETER(CodegenParameter.class), + PROPERTY(CodegenProperty.class), + RESPONSE(CodegenResponse.class), + SECURITY(CodegenSecurity.class); + + private final Class defaultImplementation; + + private CodegenModelType(Class defaultImplementation) { + this.defaultImplementation = defaultImplementation; + } + + public Class getDefaultImplementation() { + return defaultImplementation; + } +} 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 new file mode 100644 index 00000000000..b795f8e38e2 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java @@ -0,0 +1,35 @@ +package io.swagger.codegen; + +import io.swagger.models.ExternalDocs; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class CodegenOperation { + public final List responseHeaders = new ArrayList(); + public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive, + returnSimpleType, subresourceOperation, isMapContainer, isListContainer, + hasMore = Boolean.TRUE, isMultipart; + public String path, operationId, returnType, httpMethod, returnBaseType, + returnContainer, summary, notes, baseName, defaultResponse; + public List> consumes, produces; + public CodegenParameter bodyParam; + public List allParams = new ArrayList(); + public List bodyParams = new ArrayList(); + public List pathParams = new ArrayList(); + public List queryParams = new ArrayList(); + public List headerParams = new ArrayList(); + public List formParams = new ArrayList(); + public List authMethods; + public List tags; + public List responses = new ArrayList(); + public Set imports = new HashSet(); + public List> examples; + public ExternalDocs externalDocs; + + // legacy support + public String nickname; +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java new file mode 100644 index 00000000000..6777d1028da --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java @@ -0,0 +1,41 @@ +package io.swagger.codegen; + +public class CodegenParameter { + public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam, + isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam; + public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue; + public String jsonSchema; + + /** + * Determines whether this parameter is mandatory. If the parameter is in "path", + * this property is required and its value MUST be true. Otherwise, the property + * MAY be included and its default value is false. + */ + public Boolean required; + + public CodegenParameter copy() { + CodegenParameter output = new CodegenParameter(); + output.isFile = this.isFile; + output.notFile = this.notFile; + output.hasMore = this.hasMore; + output.isContainer = this.isContainer; + output.secondaryParam = this.secondaryParam; + output.baseName = this.baseName; + output.paramName = this.paramName; + output.dataType = this.dataType; + output.collectionFormat = this.collectionFormat; + output.description = this.description; + output.baseType = this.baseType; + output.isFormParam = this.isFormParam; + output.isQueryParam = this.isQueryParam; + output.isPathParam = this.isPathParam; + output.isHeaderParam = this.isHeaderParam; + output.isCookieParam = this.isCookieParam; + output.isBodyParam = this.isBodyParam; + output.required = this.required; + output.jsonSchema = this.jsonSchema; + output.defaultValue = this.defaultValue; + + return output; + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java new file mode 100644 index 00000000000..7872da2c707 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java @@ -0,0 +1,37 @@ +package io.swagger.codegen; + +import java.util.List; +import java.util.Map; + +public class CodegenProperty { + public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum, + name, min, max, defaultValue, baseType, containerType; + + /** + * maxLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.1 + */ + public Integer maxLength; + /** + * minLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.2 + */ + public Integer minLength; + /** + * pattern validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.3 + */ + public String pattern; + /** + * A free-form property to include an example of an instance for this schema. + */ + public String example; + + public String jsonSchema; + public Double minimum; + public Double maximum; + public Boolean exclusiveMinimum; + public Boolean exclusiveMaximum; + public Boolean hasMore = null, required = null, secondaryParam = null; + public Boolean isPrimitiveType, isContainer, isNotContainer; + public boolean isEnum; + public List _enum; + public Map allowableValues; +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java new file mode 100644 index 00000000000..6d90152f514 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java @@ -0,0 +1,24 @@ +package io.swagger.codegen; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class CodegenResponse { + public final List headers = new ArrayList(); + public String code, message; + public Boolean hasMore; + public List> examples; + public String dataType, baseType, containerType; + public Boolean isDefault; + public Boolean simpleType; + public Boolean primitiveType; + public Boolean isMapContainer; + public Boolean isListContainer; + public Object schema; + public String jsonSchema; + + public boolean isWildcard() { + return "0".equals(code) || "default".equals(code); + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java new file mode 100644 index 00000000000..8613e0a8d41 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java @@ -0,0 +1,10 @@ +package io.swagger.codegen; + +public class CodegenSecurity { + public String name; + public String type; + public Boolean hasMore, isBasic, isOAuth, isApiKey; + // ApiKey specific + public String keyParamName; + public Boolean isKeyInQuery, isKeyInHeader; +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java new file mode 100644 index 00000000000..8d65290e8f8 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java @@ -0,0 +1,36 @@ +package io.swagger.codegen; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +import java.util.HashMap; +import java.util.Map; + +public enum CodegenType { + CLIENT, SERVER, DOCUMENTATION, OTHER; + + private static Map names = new HashMap(); + + @JsonCreator + public static CodegenType forValue(String value) { + return names.get(value.toLowerCase()); + } + + @JsonValue + public String toValue() { + for (Map.Entry entry : names.entrySet()) { + if (entry.getValue() == this) { + return entry.getKey(); + } + } + + return null; // or fail + } + + static { + names.put("client", CLIENT); + names.put("server", SERVER); + names.put("documentation", DOCUMENTATION); + names.put("other", OTHER); + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..71b6295c9be --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -0,0 +1,1299 @@ +package io.swagger.codegen; + +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import io.swagger.codegen.examples.ExampleGenerator; +import io.swagger.models.ArrayModel; +import io.swagger.models.ComposedModel; +import io.swagger.models.Model; +import io.swagger.models.ModelImpl; +import io.swagger.models.Operation; +import io.swagger.models.RefModel; +import io.swagger.models.Response; +import io.swagger.models.Swagger; +import io.swagger.models.auth.ApiKeyAuthDefinition; +import io.swagger.models.auth.BasicAuthDefinition; +import io.swagger.models.auth.In; +import io.swagger.models.auth.SecuritySchemeDefinition; +import io.swagger.models.parameters.BodyParameter; +import io.swagger.models.parameters.CookieParameter; +import io.swagger.models.parameters.FormParameter; +import io.swagger.models.parameters.HeaderParameter; +import io.swagger.models.parameters.Parameter; +import io.swagger.models.parameters.PathParameter; +import io.swagger.models.parameters.QueryParameter; +import io.swagger.models.parameters.SerializableParameter; +import io.swagger.models.properties.AbstractNumericProperty; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +import io.swagger.models.properties.DecimalProperty; +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; +import io.swagger.models.properties.PropertyBuilder; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; +import io.swagger.util.Json; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Nullable; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + + +public class DefaultCodegen { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); + + protected String outputFolder = ""; + protected Set defaultIncludes = new HashSet(); + protected Map typeMapping = new HashMap(); + protected Map instantiationTypes = new HashMap(); + protected Set reservedWords = new HashSet(); + protected Set languageSpecificPrimitives = new HashSet(); + protected Map importMapping = new HashMap(); + protected String modelPackage = "", apiPackage = "", fileSuffix; + protected Map apiTemplateFiles = new HashMap(); + protected Map modelTemplateFiles = new HashMap(); + protected String templateDir; + protected Map additionalProperties = new HashMap(); + protected List supportingFiles = new ArrayList(); + protected List cliOptions = new ArrayList(); + + public List cliOptions() { + return cliOptions; + } + + public void processOpts() { + if (additionalProperties.containsKey("templateDir")) { + this.setTemplateDir((String) additionalProperties.get("templateDir")); + } + + if (additionalProperties.containsKey("modelPackage")) { + this.setModelPackage((String) additionalProperties.get("modelPackage")); + } + + if (additionalProperties.containsKey("apiPackage")) { + this.setApiPackage((String) additionalProperties.get("apiPackage")); + } + } + + // override with any special post-processing + public Map postProcessModels(Map objs) { + return objs; + } + + // override with any special post-processing + public Map postProcessOperations(Map objs) { + return objs; + } + + // override with any special post-processing + public Map postProcessSupportingFileData(Map objs) { + return objs; + } + + // override with any special handling of the entire swagger spec + public void processSwagger(Swagger swagger) { + } + + // override with any special text escaping logic + public String escapeText(String input) { + if (input != null) { + String output = input.replaceAll("\n", "\\\\n"); + output = output.replace("\"", "\\\""); + return output; + } + return input; + } + + public Set defaultIncludes() { + return defaultIncludes; + } + + public Map typeMapping() { + return typeMapping; + } + + public Map instantiationTypes() { + return instantiationTypes; + } + + public Set reservedWords() { + return reservedWords; + } + + public Set languageSpecificPrimitives() { + return languageSpecificPrimitives; + } + + public Map importMapping() { + return importMapping; + } + + public String modelPackage() { + return modelPackage; + } + + public String apiPackage() { + return apiPackage; + } + + public String fileSuffix() { + return fileSuffix; + } + + public String templateDir() { + return templateDir; + } + + public Map apiTemplateFiles() { + return apiTemplateFiles; + } + + public Map modelTemplateFiles() { + return modelTemplateFiles; + } + + public String apiFileFolder() { + return outputFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + public Map additionalProperties() { + return additionalProperties; + } + + public List supportingFiles() { + return supportingFiles; + } + + public String outputFolder() { + return outputFolder; + } + + public void setOutputDir(String dir) { + this.outputFolder = dir; + } + + public String getOutputDir() { + return outputFolder(); + } + + public void setTemplateDir(String templateDir) { + this.templateDir = templateDir; + } + + public void setModelPackage(String modelPackage) { + this.modelPackage = modelPackage; + } + + public void setApiPackage(String apiPackage) { + this.apiPackage = apiPackage; + } + + public String toApiFilename(String name) { + return toApiName(name); + } + + public String toApiVarName(String name) { + return snakeCase(name); + } + + public String toModelFilename(String name) { + return initialCaps(name); + } + + public String toOperationId(String operationId) { + return operationId; + } + + public String toVarName(String name) { + if (reservedWords.contains(name)) { + return escapeReservedWord(name); + } else { + return name; + } + } + + public String toParamName(String name) { + name = removeNonNameElementToCamelCase(name); + if (reservedWords.contains(name)) { + return escapeReservedWord(name); + } + return name; + } + + public String toEnumName(CodegenProperty property) { + return StringUtils.capitalize(property.name) + "Enum"; + } + + public String escapeReservedWord(String name) { + throw new RuntimeException("reserved word " + name + " not allowed"); + } + + public String toModelImport(String name) { + if ("".equals(modelPackage())) { + return name; + } else { + return modelPackage() + "." + name; + } + } + + public String toApiImport(String name) { + return apiPackage() + "." + name; + } + + public DefaultCodegen() { + defaultIncludes = new HashSet( + Arrays.asList("double", + "int", + "long", + "short", + "char", + "float", + "String", + "boolean", + "Boolean", + "Double", + "Void", + "Integer", + "Long", + "Float") + ); + + typeMapping = new HashMap(); + typeMapping.put("array", "List"); + typeMapping.put("map", "Map"); + typeMapping.put("List", "List"); + typeMapping.put("boolean", "Boolean"); + typeMapping.put("string", "String"); + typeMapping.put("int", "Integer"); + typeMapping.put("float", "Float"); + typeMapping.put("number", "BigDecimal"); + typeMapping.put("DateTime", "Date"); + typeMapping.put("long", "Long"); + typeMapping.put("short", "Short"); + typeMapping.put("char", "String"); + typeMapping.put("double", "Double"); + typeMapping.put("object", "Object"); + typeMapping.put("integer", "Integer"); + + instantiationTypes = new HashMap(); + + reservedWords = new HashSet(); + + importMapping = new HashMap(); + importMapping.put("BigDecimal", "java.math.BigDecimal"); + importMapping.put("UUID", "java.util.UUID"); + importMapping.put("File", "java.io.File"); + importMapping.put("Date", "java.util.Date"); + importMapping.put("Timestamp", "java.sql.Timestamp"); + importMapping.put("Map", "java.util.Map"); + importMapping.put("HashMap", "java.util.HashMap"); + importMapping.put("Array", "java.util.List"); + importMapping.put("ArrayList", "java.util.ArrayList"); + importMapping.put("List", "java.util.*"); + importMapping.put("Set", "java.util.*"); + importMapping.put("DateTime", "org.joda.time.*"); + importMapping.put("LocalDateTime", "org.joda.time.*"); + importMapping.put("LocalDate", "org.joda.time.*"); + importMapping.put("LocalTime", "org.joda.time.*"); + + cliOptions.add(new CliOption("modelPackage", "package for generated models")); + cliOptions.add(new CliOption("apiPackage", "package for generated api classes")); + } + + + public String generateExamplePath(String path, Operation operation) { + StringBuilder sb = new StringBuilder(); + sb.append(path); + + if (operation.getParameters() != null) { + int count = 0; + + for (Parameter param : operation.getParameters()) { + if (param instanceof QueryParameter) { + StringBuilder paramPart = new StringBuilder(); + QueryParameter qp = (QueryParameter) param; + + if (count == 0) { + paramPart.append("?"); + } else { + paramPart.append(","); + } + count += 1; + if (!param.getRequired()) { + paramPart.append("["); + } + paramPart.append(param.getName()).append("="); + paramPart.append("{"); + if (qp.getCollectionFormat() != null) { + paramPart.append(param.getName() + "1"); + if ("csv".equals(qp.getCollectionFormat())) { + paramPart.append(","); + } else if ("pipes".equals(qp.getCollectionFormat())) { + paramPart.append("|"); + } else if ("tsv".equals(qp.getCollectionFormat())) { + paramPart.append("\t"); + } else if ("multi".equals(qp.getCollectionFormat())) { + paramPart.append("&").append(param.getName()).append("="); + paramPart.append(param.getName() + "2"); + } + } else { + paramPart.append(param.getName()); + } + paramPart.append("}"); + if (!param.getRequired()) { + paramPart.append("]"); + } + sb.append(paramPart.toString()); + } + } + } + + return sb.toString(); + } + + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return instantiationTypes.get("map") + ""; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return instantiationTypes.get("array") + "<" + inner + ">"; + } else { + return null; + } + } + + public String toDefaultValue(Property p) { + if (p instanceof StringProperty) { + return "null"; + } else if (p instanceof BooleanProperty) { + return "null"; + } else if (p instanceof DateProperty) { + return "null"; + } else if (p instanceof DateTimeProperty) { + return "null"; + } else if (p instanceof DoubleProperty) { + DoubleProperty dp = (DoubleProperty) p; + if (dp.getDefault() != null) { + return dp.getDefault().toString(); + } + return "null"; + } else if (p instanceof FloatProperty) { + FloatProperty dp = (FloatProperty) p; + if (dp.getDefault() != null) { + return dp.getDefault().toString(); + } + return "null"; + } 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(); + } + return "null"; + } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "new HashMap() "; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return "new ArrayList<" + inner + ">() "; + } else { + return "null"; + } + } + + /** + * returns the swagger type for the property + **/ + public String getSwaggerType(Property p) { + String datatype = null; + if (p instanceof StringProperty) { + datatype = "string"; + } else if (p instanceof BooleanProperty) { + datatype = "boolean"; + } else if (p instanceof DateProperty) { + datatype = "date"; + } else if (p instanceof DateTimeProperty) { + datatype = "DateTime"; + } else if (p instanceof DoubleProperty) { + datatype = "double"; + } else if (p instanceof FloatProperty) { + datatype = "float"; + } else if (p instanceof IntegerProperty) { + datatype = "integer"; + } else if (p instanceof LongProperty) { + datatype = "long"; + } else if (p instanceof MapProperty) { + datatype = "map"; + } else if (p instanceof DecimalProperty) { + datatype = "number"; + } else if (p instanceof RefProperty) { + RefProperty r = (RefProperty) p; + datatype = r.get$ref(); + if (datatype.indexOf("#/definitions/") == 0) { + datatype = datatype.substring("#/definitions/".length()); + } + } else { + if (p != null) { + datatype = p.getType(); + } + } + return datatype; + } + + public String snakeCase(String name) { + return (name.length() > 0) ? (Character.toLowerCase(name.charAt(0)) + name.substring(1)) : ""; + } + + public String initialCaps(String name) { + return StringUtils.capitalize(name); + } + + public String getTypeDeclaration(String name) { + return name; + } + + public String getTypeDeclaration(Property p) { + String swaggerType = getSwaggerType(p); + if (typeMapping.containsKey(swaggerType)) { + return typeMapping.get(swaggerType); + } + return swaggerType; + } + + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultApi"; + } + return initialCaps(name) + "Api"; + } + + public String toModelName(String name) { + return initialCaps(name); + } + + public CodegenModel fromModel(String name, Model model) { + CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL); + if (reservedWords.contains(name)) { + m.name = escapeReservedWord(name); + } else { + m.name = name; + } + m.description = escapeText(model.getDescription()); + m.classname = toModelName(name); + m.classVarName = toVarName(name); + m.modelJson = Json.pretty(model); + m.externalDocs = model.getExternalDocs(); + if (model instanceof ArrayModel) { + ArrayModel am = (ArrayModel) model; + ArrayProperty arrayProperty = new ArrayProperty(am.getItems()); + addParentContainer(m, name, arrayProperty); + } else if (model instanceof RefModel) { + // TODO + } else if (model instanceof ComposedModel) { + final ComposedModel composed = (ComposedModel) model; + final RefModel parent = (RefModel) composed.getParent(); + final String parentModel = toModelName(parent.getSimpleRef()); + m.parent = parentModel; + addImport(m, parentModel); + final ModelImpl child = (ModelImpl) composed.getChild(); + addVars(m, child.getProperties(), child.getRequired()); + } else { + ModelImpl impl = (ModelImpl) model; + if (impl.getAdditionalProperties() != null) { + MapProperty mapProperty = new MapProperty(impl.getAdditionalProperties()); + addParentContainer(m, name, mapProperty); + } + addVars(m, impl.getProperties(), impl.getRequired()); + } + return m; + } + + public String getterAndSetterCapitalize(String name) { + if (name == null || name.length() == 0) { + return name; + } + + return camelize(toVarName(name)); + + } + + public CodegenProperty fromProperty(String name, Property p) { + if (p == null) { + LOGGER.error("unexpected missing property for name " + null); + return null; + } + CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY); + + property.name = toVarName(name); + property.baseName = name; + property.description = escapeText(p.getDescription()); + property.getter = "get" + getterAndSetterCapitalize(name); + property.setter = "set" + getterAndSetterCapitalize(name); + property.example = p.getExample(); + property.defaultValue = toDefaultValue(p); + property.jsonSchema = Json.pretty(p); + + String type = getSwaggerType(p); + if (p instanceof AbstractNumericProperty) { + AbstractNumericProperty np = (AbstractNumericProperty) p; + property.minimum = np.getMinimum(); + property.maximum = np.getMaximum(); + property.exclusiveMinimum = np.getExclusiveMinimum(); + property.exclusiveMaximum = np.getExclusiveMaximum(); + + // legacy support + Map allowableValues = new HashMap(); + if (np.getMinimum() != null) { + allowableValues.put("min", np.getMinimum()); + } + if (np.getMaximum() != null) { + allowableValues.put("max", np.getMaximum()); + } + property.allowableValues = allowableValues; + } + + if (p instanceof StringProperty) { + StringProperty sp = (StringProperty) p; + property.maxLength = sp.getMaxLength(); + property.minLength = sp.getMinLength(); + property.pattern = sp.getPattern(); + if (sp.getEnum() != null) { + List _enum = sp.getEnum(); + property._enum = _enum; + property.isEnum = true; + + // legacy support + Map allowableValues = new HashMap(); + allowableValues.put("values", _enum); + property.allowableValues = allowableValues; + } + } + + property.datatype = getTypeDeclaration(p); + + // this can cause issues for clients which don't support enums + if (property.isEnum) { + property.datatypeWithEnum = toEnumName(property); + } else { + property.datatypeWithEnum = property.datatype; + } + + property.baseType = getSwaggerType(p); + + if (p instanceof ArrayProperty) { + property.isContainer = true; + property.containerType = "array"; + ArrayProperty ap = (ArrayProperty) p; + CodegenProperty cp = fromProperty("inner", ap.getItems()); + if (cp == null) { + LOGGER.warn("skipping invalid property " + Json.pretty(p)); + } else { + property.baseType = getSwaggerType(p); + if (!languageSpecificPrimitives.contains(cp.baseType)) { + property.complexType = cp.baseType; + } else { + property.isPrimitiveType = true; + } + } + } else if (p instanceof MapProperty) { + property.isContainer = true; + property.containerType = "map"; + MapProperty ap = (MapProperty) p; + CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties()); + + property.baseType = getSwaggerType(p); + if (!languageSpecificPrimitives.contains(cp.baseType)) { + property.complexType = cp.baseType; + } else { + property.isPrimitiveType = true; + } + } else { + setNonArrayMapProperty(property, type); + } + return property; + } + + protected void setNonArrayMapProperty(CodegenProperty property, String type) { + property.isNotContainer = true; + if (languageSpecificPrimitives().contains(type)) { + property.isPrimitiveType = true; + } else { + property.complexType = property.baseType; + } + } + + private Response findMethodResponse(Map responses) { + + String code = null; + for (String responseCode : responses.keySet()) { + if (responseCode.startsWith("2") || responseCode.equals("default")) { + if (code == null || code.compareTo(responseCode) > 0) { + code = responseCode; + } + } + } + if (code == null) { + return null; + } + return responses.get(code); + } + + public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map definitions) { + CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION); + Set imports = new HashSet(); + + String operationId = operation.getOperationId(); + if (operationId == null) { + String tmpPath = path; + tmpPath = tmpPath.replaceAll("\\{", ""); + tmpPath = tmpPath.replaceAll("\\}", ""); + String[] parts = (tmpPath + "/" + httpMethod).split("/"); + StringBuilder builder = new StringBuilder(); + if ("/".equals(tmpPath)) { + // must be root tmpPath + builder.append("root"); + } + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + if (part.length() > 0) { + if (builder.toString().length() == 0) { + part = Character.toLowerCase(part.charAt(0)) + part.substring(1); + } else { + part = initialCaps(part); + } + builder.append(part); + } + } + operationId = builder.toString(); + LOGGER.warn("generated operationId " + operationId); + } + operationId = removeNonNameElementToCamelCase(operationId); + op.path = path; + op.operationId = toOperationId(operationId); + op.summary = escapeText(operation.getSummary()); + op.notes = escapeText(operation.getDescription()); + op.tags = operation.getTags(); + + if (operation.getConsumes() != null && operation.getConsumes().size() > 0) { + List> c = new ArrayList>(); + int count = 0; + for (String key : operation.getConsumes()) { + Map mediaType = new HashMap(); + mediaType.put("mediaType", key); + count += 1; + if (count < operation.getConsumes().size()) { + mediaType.put("hasMore", "true"); + } else { + mediaType.put("hasMore", null); + } + c.add(mediaType); + } + op.consumes = c; + op.hasConsumes = true; + } + + if (operation.getProduces() != null && operation.getProduces().size() > 0) { + List> c = new ArrayList>(); + int count = 0; + for (String key : operation.getProduces()) { + Map mediaType = new HashMap(); + mediaType.put("mediaType", key); + count += 1; + if (count < operation.getProduces().size()) { + mediaType.put("hasMore", "true"); + } else { + mediaType.put("hasMore", null); + } + c.add(mediaType); + } + op.produces = c; + op.hasProduces = true; + } + + if (operation.getResponses() != null && !operation.getResponses().isEmpty()) { + Response methodResponse = findMethodResponse(operation.getResponses()); + + for (Map.Entry entry : operation.getResponses().entrySet()) { + Response response = entry.getValue(); + CodegenResponse r = fromResponse(entry.getKey(), response); + r.hasMore = true; + if (r.baseType != null && + !defaultIncludes.contains(r.baseType) && + !languageSpecificPrimitives.contains(r.baseType)) { + imports.add(r.baseType); + } + r.isDefault = response == methodResponse; + op.responses.add(r); + } + op.responses.get(op.responses.size() - 1).hasMore = false; + + if (methodResponse != null) { + if (methodResponse.getSchema() != null) { + CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); + + Property responseProperty = methodResponse.getSchema(); + + if (responseProperty instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) responseProperty; + CodegenProperty innerProperty = fromProperty("response", ap.getItems()); + op.returnBaseType = innerProperty.baseType; + } else { + if (cm.complexType != null) { + op.returnBaseType = cm.complexType; + } else { + op.returnBaseType = cm.baseType; + } + } + op.examples = new ExampleGenerator(definitions).generate(methodResponse.getExamples(), operation.getProduces(), responseProperty); + op.defaultResponse = toDefaultValue(responseProperty); + op.returnType = cm.datatype; + if (cm.isContainer != null) { + op.returnContainer = cm.containerType; + if ("map".equals(cm.containerType)) { + op.isMapContainer = Boolean.TRUE; + } else if ("list".equalsIgnoreCase(cm.containerType)) { + op.isListContainer = Boolean.TRUE; + } else if ("array".equalsIgnoreCase(cm.containerType)) { + op.isListContainer = Boolean.TRUE; + } + } else { + op.returnSimpleType = true; + } + if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null) { + op.returnTypeIsPrimitive = true; + } + } + addHeaders(methodResponse, op.responseHeaders); + } + } + + List parameters = operation.getParameters(); + CodegenParameter bodyParam = null; + List allParams = new ArrayList(); + List bodyParams = new ArrayList(); + List pathParams = new ArrayList(); + List queryParams = new ArrayList(); + List headerParams = new ArrayList(); + List cookieParams = new ArrayList(); + List formParams = new ArrayList(); + + if (parameters != null) { + for (Parameter param : parameters) { + CodegenParameter p = fromParameter(param, imports); + allParams.add(p); + if (param instanceof QueryParameter) { + p.isQueryParam = new Boolean(true); + queryParams.add(p.copy()); + } else if (param instanceof PathParameter) { + p.required = true; + p.isPathParam = new Boolean(true); + pathParams.add(p.copy()); + } else if (param instanceof HeaderParameter) { + p.isHeaderParam = new Boolean(true); + headerParams.add(p.copy()); + } else if (param instanceof CookieParameter) { + p.isCookieParam = new Boolean(true); + cookieParams.add(p.copy()); + } else if (param instanceof BodyParameter) { + p.isBodyParam = new Boolean(true); + bodyParam = p; + bodyParams.add(p.copy()); + } else if (param instanceof FormParameter) { + if ("file".equalsIgnoreCase(((FormParameter) param).getType())) { + p.isFile = true; + } else { + p.notFile = true; + } + p.isFormParam = new Boolean(true); + formParams.add(p.copy()); + } + } + } + for (String i : imports) { + if (!defaultIncludes.contains(i) && !languageSpecificPrimitives.contains(i)) { + op.imports.add(i); + } + } + op.bodyParam = bodyParam; + op.httpMethod = httpMethod.toUpperCase(); + op.allParams = addHasMore(allParams); + op.bodyParams = addHasMore(bodyParams); + op.pathParams = addHasMore(pathParams); + op.queryParams = addHasMore(queryParams); + op.headerParams = addHasMore(headerParams); + // op.cookieParams = cookieParams; + op.formParams = addHasMore(formParams); + // legacy support + op.nickname = op.operationId; + + + if (op.allParams.size() > 0) { + op.hasParams = true; + } + op.externalDocs = operation.getExternalDocs(); + + return op; + } + + public CodegenResponse fromResponse(String responseCode, Response response) { + CodegenResponse r = CodegenModelFactory.newInstance(CodegenModelType.RESPONSE); + if ("default".equals(responseCode)) { + r.code = "0"; + } else { + r.code = responseCode; + } + r.message = response.getDescription(); + r.schema = response.getSchema(); + r.examples = toExamples(response.getExamples()); + r.jsonSchema = Json.pretty(response); + addHeaders(response, r.headers); + + if (r.schema != null) { + Property responseProperty = response.getSchema(); + responseProperty.setRequired(true); + CodegenProperty cm = fromProperty("response", responseProperty); + + if (responseProperty instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) responseProperty; + CodegenProperty innerProperty = fromProperty("response", ap.getItems()); + r.baseType = innerProperty.baseType; + } else { + if (cm.complexType != null) { + r.baseType = cm.complexType; + } else { + r.baseType = cm.baseType; + } + } + r.dataType = cm.datatype; + if (cm.isContainer != null) { + r.simpleType = false; + r.containerType = cm.containerType; + r.isMapContainer = "map".equals(cm.containerType); + r.isListContainer = "list".equals(cm.containerType); + } else { + r.simpleType = true; + } + r.primitiveType = (r.baseType == null || languageSpecificPrimitives().contains(r.baseType)); + } + if (r.baseType == null) { + r.isMapContainer = false; + r.isListContainer = false; + r.primitiveType = true; + r.simpleType = true; + } + return r; + } + + public CodegenParameter fromParameter(Parameter param, Set imports) { + CodegenParameter p = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER); + p.baseName = param.getName(); + p.description = escapeText(param.getDescription()); + if (param.getRequired()) { + p.required = param.getRequired(); + } + p.jsonSchema = Json.pretty(param); + + // move the defaultValue for headers, forms and params + if (param instanceof QueryParameter) { + p.defaultValue = ((QueryParameter) param).getDefaultValue(); + } else if (param instanceof HeaderParameter) { + p.defaultValue = ((HeaderParameter) param).getDefaultValue(); + } else if (param instanceof FormParameter) { + p.defaultValue = ((FormParameter) param).getDefaultValue(); + } + + if (param instanceof SerializableParameter) { + SerializableParameter qp = (SerializableParameter) param; + Property property = null; + String collectionFormat = null; + if ("array".equals(qp.getType())) { + Property inner = qp.getItems(); + if (inner == null) { + LOGGER.warn("warning! No inner type supplied for array parameter \"" + qp.getName() + "\", using String"); + inner = new StringProperty().description("//TODO automatically added by swagger-codegen"); + } + property = new ArrayProperty(inner); + collectionFormat = qp.getCollectionFormat(); + CodegenProperty pr = fromProperty("inner", inner); + p.baseType = pr.datatype; + p.isContainer = true; + imports.add(pr.baseType); + } else if ("object".equals(qp.getType())) { + Property inner = qp.getItems(); + if (inner == null) { + LOGGER.warn("warning! No inner type supplied for map parameter \"" + qp.getName() + "\", using String"); + inner = new StringProperty().description("//TODO automatically added by swagger-codegen"); + } + property = new MapProperty(inner); + collectionFormat = qp.getCollectionFormat(); + CodegenProperty pr = fromProperty("inner", inner); + p.baseType = pr.datatype; + imports.add(pr.baseType); + } else { + property = PropertyBuilder.build(qp.getType(), qp.getFormat(), null); + } + if (property == null) { + LOGGER.warn("warning! Property type \"" + qp.getType() + "\" not found for parameter \"" + param.getName() + "\", using String"); + property = new StringProperty().description("//TODO automatically added by swagger-codegen. Type was " + qp.getType() + " but not supported"); + } + property.setRequired(param.getRequired()); + CodegenProperty model = fromProperty(qp.getName(), property); + p.collectionFormat = collectionFormat; + p.dataType = model.datatype; + p.paramName = toParamName(qp.getName()); + + if (model.complexType != null) { + imports.add(model.complexType); + } + } else { + BodyParameter bp = (BodyParameter) param; + Model model = bp.getSchema(); + + if (model instanceof ModelImpl) { + ModelImpl impl = (ModelImpl) model; + CodegenModel cm = fromModel(bp.getName(), impl); + if (cm.emptyVars != null && cm.emptyVars == false) { + p.dataType = getTypeDeclaration(cm.classname); + imports.add(p.dataType); + } else { + // TODO: missing format, so this will not always work + Property prop = PropertyBuilder.build(impl.getType(), null, null); + prop.setRequired(bp.getRequired()); + CodegenProperty cp = fromProperty("property", prop); + if (cp != null) { + p.dataType = cp.datatype; + } + } + } else if (model instanceof ArrayModel) { + // to use the built-in model parsing, we unwrap the ArrayModel + // and get a single property from it + ArrayModel impl = (ArrayModel) model; + CodegenModel cm = fromModel(bp.getName(), impl); + // get the single property + ArrayProperty ap = new ArrayProperty().items(impl.getItems()); + ap.setRequired(param.getRequired()); + CodegenProperty cp = fromProperty("inner", ap); + if (cp.complexType != null) { + imports.add(cp.complexType); + } + imports.add(cp.baseType); + p.dataType = cp.datatype; + p.isContainer = true; + } else { + Model sub = bp.getSchema(); + if (sub instanceof RefModel) { + String name = ((RefModel) sub).getSimpleRef(); + if (typeMapping.containsKey(name)) { + name = typeMapping.get(name); + } else { + name = toModelName(name); + if (defaultIncludes.contains(name)) { + imports.add(name); + } + imports.add(name); + name = getTypeDeclaration(name); + } + p.dataType = name; + } + } + p.paramName = toParamName(bp.getName()); + } + return p; + } + + public List fromSecurity(Map schemes) { + if (schemes == null) { + return null; + } + + List secs = new ArrayList(schemes.size()); + for (Iterator> it = schemes.entrySet().iterator(); it.hasNext(); ) { + final Map.Entry entry = it.next(); + final SecuritySchemeDefinition schemeDefinition = entry.getValue(); + + CodegenSecurity sec = CodegenModelFactory.newInstance(CodegenModelType.SECURITY); + sec.name = entry.getKey(); + sec.type = schemeDefinition.getType(); + + if (schemeDefinition instanceof ApiKeyAuthDefinition) { + final ApiKeyAuthDefinition apiKeyDefinition = (ApiKeyAuthDefinition) schemeDefinition; + sec.isBasic = sec.isOAuth = false; + sec.isApiKey = true; + sec.keyParamName = apiKeyDefinition.getName(); + sec.isKeyInHeader = apiKeyDefinition.getIn() == In.HEADER; + sec.isKeyInQuery = !sec.isKeyInHeader; + } else { + sec.isKeyInHeader = sec.isKeyInQuery = sec.isApiKey = false; + sec.isBasic = schemeDefinition instanceof BasicAuthDefinition; + sec.isOAuth = !sec.isBasic; + } + + sec.hasMore = it.hasNext(); + secs.add(sec); + } + return secs; + } + + protected List> toExamples(Map examples) { + if (examples == null) { + return null; + } + + final List> output = new ArrayList>(examples.size()); + for (Map.Entry entry : examples.entrySet()) { + final Map kv = new HashMap(); + kv.put("contentType", entry.getKey()); + kv.put("example", entry.getValue()); + output.add(kv); + } + return output; + } + + private void addHeaders(Response response, List target) { + if (response.getHeaders() != null) { + for (Map.Entry headers : response.getHeaders().entrySet()) { + target.add(fromProperty(headers.getKey(), headers.getValue())); + } + } + } + + private List addHasMore(List objs) { + if (objs != null) { + for (int i = 0; i < objs.size(); i++) { + if (i > 0) { + objs.get(i).secondaryParam = new Boolean(true); + } + if (i < objs.size() - 1) { + objs.get(i).hasMore = new Boolean(true); + } + } + } + return objs; + } + + private Map addHasMore(Map objs) { + if (objs != null) { + for (int i = 0; i < objs.size() - 1; i++) { + if (i > 0) { + objs.put("secondaryParam", new Boolean(true)); + } + if (i < objs.size() - 1) { + objs.put("hasMore", true); + } + } + } + return objs; + } + + public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { + List opList = operations.get(tag); + if (opList == null) { + opList = new ArrayList(); + operations.put(tag, opList); + } + opList.add(co); + co.baseName = tag; + } + + /* underscore and camelize are copied from Twitter elephant bird + * https://github.com/twitter/elephant-bird/blob/master/core/src/main/java/com/twitter/elephantbird/util/Strings.java + */ + + private void addParentContainer(CodegenModel m, String name, Property property) { + final CodegenProperty tmp = fromProperty(name, property); + addImport(m, tmp.complexType); + m.parent = toInstantiationType(property); + final String containerType = tmp.containerType; + final String instantiationType = instantiationTypes.get(containerType); + if (instantiationType != null) { + addImport(m, instantiationType); + } + final String mappedType = typeMapping.get(containerType); + if (mappedType != null) { + addImport(m, mappedType); + } + } /** + * Underscore the given word. + * + * @param word The word + * @return The underscored version of the word + */ + public static String underscore(String word) { + String firstPattern = "([A-Z]+)([A-Z][a-z])"; + String secondPattern = "([a-z\\d])([A-Z])"; + String replacementPattern = "$1_$2"; + // Replace package separator with slash. + word = word.replaceAll("\\.", "/"); + // Replace $ with two underscores for inner classes. + word = word.replaceAll("\\$", "__"); + // Replace capital letter with _ plus lowercase letter. + word = word.replaceAll(firstPattern, replacementPattern); + word = word.replaceAll(secondPattern, replacementPattern); + word = word.replace('-', '_'); + word = word.toLowerCase(); + return word; + } + + private void addImport(CodegenModel m, String type) { + if (type != null && !languageSpecificPrimitives.contains(type) && !defaultIncludes.contains(type)) { + m.imports.add(type); + } + } + + private void addVars(CodegenModel m, Map properties, Collection required) { + if (properties != null && properties.size() > 0) { + m.hasVars = true; + m.hasEnums = false; + final int totalCount = properties.size(); + final Set mandatory = required == null ? Collections.emptySet() : new HashSet(required); + int count = 0; + for (Map.Entry entry : properties.entrySet()) { + final String key = entry.getKey(); + final Property prop = entry.getValue(); + + if (prop == null) { + LOGGER.warn("null property for " + key); + } else { + final CodegenProperty cp = fromProperty(key, prop); + cp.required = mandatory.contains(key) ? true : null; + if (cp.isEnum) { + m.hasEnums = true; + } + count += 1; + if (count != totalCount) { + cp.hasMore = true; + } + if (cp.isContainer != null) { + addImport(m, typeMapping.get("array")); + } + addImport(m, cp.baseType); + addImport(m, cp.complexType); + m.vars.add(cp); + } + } + } else { + m.emptyVars = true; + } + } public static String camelize(String word) { + return camelize(word, false); + } + + /** + * Remove characters not suitable for variable or method name from the input and camelize it + * + * @param name + * @return + */ + public String removeNonNameElementToCamelCase(String name) { + String nonNameElementPattern = "[-_:;#]"; + name = StringUtils.join(Lists.transform(Lists.newArrayList(name.split(nonNameElementPattern)), new Function() { + @Nullable + @Override + public String apply(String input) { + return StringUtils.capitalize(input); + } + }), ""); + if (name.length() > 0) { + name = name.substring(0, 1).toLowerCase() + name.substring(1); + } + return name; + } public static String camelize(String word, boolean lowercaseFirstLetter) { + // Replace all slashes with dots (package separator) + Pattern p = Pattern.compile("\\/(.?)"); + Matcher m = p.matcher(word); + while (m.find()) { + word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/); + m = p.matcher(word); + } + + // case out dots + String[] parts = word.split("\\."); + StringBuilder f = new StringBuilder(); + for (String z : parts) { + if (z.length() > 0) { + f.append(Character.toUpperCase(z.charAt(0))).append(z.substring(1)); + } + } + word = f.toString(); + + m = p.matcher(word); + while (m.find()) { + word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase()*/); + m = p.matcher(word); + } + + // Uppercase the class name. + p = Pattern.compile("(\\.?)(\\w)([^\\.]*)$"); + m = p.matcher(word); + if (m.find()) { + String rep = m.group(1) + m.group(2).toUpperCase() + m.group(3); + rep = rep.replaceAll("\\$", "\\\\\\$"); + word = m.replaceAll(rep); + } + + // Replace two underscores with $ to support inner classes. + p = Pattern.compile("(__)(.)"); + m = p.matcher(word); + while (m.find()) { + word = m.replaceFirst("\\$" + m.group(2).toUpperCase()); + m = p.matcher(word); + } + + // Remove all underscores + p = Pattern.compile("(_)(.)"); + m = p.matcher(word); + while (m.find()) { + word = m.replaceFirst(m.group(2).toUpperCase()); + m = p.matcher(word); + } + + if (lowercaseFirstLetter) { + word = word.substring(0, 1).toLowerCase() + word.substring(1); + } + + return word; + } + + public String apiFilename(String templateName, String tag) { + String suffix = apiTemplateFiles().get(templateName); + return apiFileFolder() + File.separator + toApiFilename(tag) + suffix; + } + + public boolean shouldOverwrite(String filename) { + return true; + } +} 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 new file mode 100644 index 00000000000..a04e517bee5 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -0,0 +1,484 @@ +package io.swagger.codegen; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; +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.Swagger; +import io.swagger.models.auth.SecuritySchemeDefinition; +import io.swagger.util.Json; +import org.apache.commons.io.IOUtils; + +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.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.commons.lang3.StringUtils.capitalize; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; + +public class DefaultGenerator extends AbstractGenerator implements Generator { + protected CodegenConfig config; + protected ClientOptInput opts = null; + protected Swagger swagger = null; + + public Generator opts(ClientOptInput opts) { + this.opts = opts; + + this.swagger = opts.getSwagger(); + this.config = opts.getConfig(); + this.config.additionalProperties().putAll(opts.getOpts().getProperties()); + + return this; + } + + public List generate() { + if (swagger == null || config == null) { + throw new RuntimeException("missing swagger input or config!"); + } + if (System.getProperty("debugSwagger") != null) { + Json.prettyPrint(swagger); + } + List files = new ArrayList(); + try { + config.processOpts(); + if (swagger.getInfo() != null) { + Info info = swagger.getInfo(); + if (info.getTitle() != null) { + config.additionalProperties().put("appName", info.getTitle()); + } + if (info.getVersion() != null) { + config.additionalProperties().put("appVersion", info.getVersion()); + } + if (info.getDescription() != null) { + config.additionalProperties().put("appDescription", + config.escapeText(info.getDescription())); + } + if (info.getContact() != null) { + Contact contact = info.getContact(); + config.additionalProperties().put("infoUrl", contact.getUrl()); + if (contact.getEmail() != null) { + config.additionalProperties().put("infoEmail", contact.getEmail()); + } + } + if (info.getLicense() != null) { + License license = info.getLicense(); + if (license.getName() != null) { + config.additionalProperties().put("licenseInfo", license.getName()); + } + if (license.getUrl() != null) { + config.additionalProperties().put("licenseUrl", license.getUrl()); + } + } + if (info.getVersion() != null) { + config.additionalProperties().put("version", info.getVersion()); + } + } + + StringBuilder hostBuilder = new StringBuilder(); + String scheme; + if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) { + scheme = swagger.getSchemes().get(0).toValue(); + } else { + scheme = "https"; + } + hostBuilder.append(scheme); + hostBuilder.append("://"); + if (swagger.getHost() != null) { + hostBuilder.append(swagger.getHost()); + } else { + hostBuilder.append("localhost"); + } + if (swagger.getBasePath() != null) { + hostBuilder.append(swagger.getBasePath()); + } else { + hostBuilder.append("/"); + } + String contextPath = swagger.getBasePath() == null ? "/" : swagger.getBasePath(); + String basePath = hostBuilder.toString(); + + + List allOperations = new ArrayList(); + List allModels = new ArrayList(); + + // models + Map definitions = swagger.getDefinitions(); + if (definitions != null) { + for (String name : definitions.keySet()) { + Model model = definitions.get(name); + Map modelMap = new HashMap(); + modelMap.put(name, model); + Map models = processModels(config, modelMap); + models.putAll(config.additionalProperties()); + + allModels.add(((List) models.get("models")).get(0)); + + for (String templateName : config.modelTemplateFiles().keySet()) { + String suffix = config.modelTemplateFiles().get(templateName); + String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix; + String template = readTemplate(config.templateDir() + File.separator + templateName); + Template tmpl = Mustache.compiler() + .withLoader(new Mustache.TemplateLoader() { + public Reader getTemplate(String name) { + return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); + } + }) + .defaultValue("") + .compile(template); + writeToFile(filename, tmpl.execute(models)); + files.add(new File(filename)); + } + } + } + if (System.getProperty("debugModels") != null) { + System.out.println("############ Model info ############"); + Json.prettyPrint(allModels); + } + + // apis + Map> paths = processPaths(swagger.getPaths()); + for (String tag : paths.keySet()) { + List ops = paths.get(tag); + Map operation = processOperations(config, tag, ops); + + operation.put("basePath", basePath); + operation.put("contextPath", contextPath); + operation.put("baseName", tag); + operation.put("modelPackage", config.modelPackage()); + operation.putAll(config.additionalProperties()); + operation.put("classname", config.toApiName(tag)); + operation.put("classVarName", config.toApiVarName(tag)); + operation.put("importPath", config.toApiImport(tag)); + + processMimeTypes(swagger.getConsumes(), operation, "consumes"); + processMimeTypes(swagger.getProduces(), operation, "produces"); + + allOperations.add(new HashMap(operation)); + for (int i = 0; i < allOperations.size(); i++) { + Map oo = (Map) allOperations.get(i); + if (i < (allOperations.size() - 1)) { + oo.put("hasMore", "true"); + } + } + + for (String templateName : config.apiTemplateFiles().keySet()) { + + String filename = config.apiFilename(templateName, tag); + if (new File(filename).exists() && !config.shouldOverwrite(filename)) { + continue; + } + + String template = readTemplate(config.templateDir() + File.separator + templateName); + Template tmpl = Mustache.compiler() + .withLoader(new Mustache.TemplateLoader() { + public Reader getTemplate(String name) { + return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); + } + }) + .defaultValue("") + .compile(template); + + writeToFile(filename, tmpl.execute(operation)); + files.add(new File(filename)); + } + } + if (System.getProperty("debugOperations") != null) { + System.out.println("############ Operation info ############"); + Json.prettyPrint(allOperations); + } + + // supporting files + Map bundle = new HashMap(); + bundle.putAll(config.additionalProperties()); + bundle.put("apiPackage", config.apiPackage()); + + Map apis = new HashMap(); + apis.put("apis", allOperations); + if (swagger.getHost() != null) { + bundle.put("host", swagger.getHost()); + } + bundle.put("basePath", basePath); + bundle.put("scheme", scheme); + bundle.put("contextPath", contextPath); + bundle.put("apiInfo", apis); + bundle.put("models", allModels); + bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar)); + bundle.put("modelPackage", config.modelPackage()); + bundle.put("authMethods", config.fromSecurity(swagger.getSecurityDefinitions())); + if (swagger.getExternalDocs() != null) { + bundle.put("externalDocs", swagger.getExternalDocs()); + } + for (int i = 0; i < allModels.size() - 1; i++) { + HashMap cm = (HashMap) allModels.get(i); + CodegenModel m = cm.get("model"); + m.hasMoreModels = true; + } + + config.postProcessSupportingFileData(bundle); + + if (System.getProperty("debugSupportingFiles") != null) { + System.out.println("############ Supporting file info ############"); + Json.prettyPrint(bundle); + } + + for (SupportingFile support : config.supportingFiles()) { + String outputFolder = config.outputFolder(); + if (isNotEmpty(support.folder)) { + outputFolder += File.separator + support.folder; + } + File of = new File(outputFolder); + if (!of.isDirectory()) { + of.mkdirs(); + } + String outputFilename = outputFolder + File.separator + support.destinationFilename; + + if (support.templateFile.endsWith("mustache")) { + String template = readTemplate(config.templateDir() + File.separator + support.templateFile); + Template tmpl = Mustache.compiler() + .withLoader(new Mustache.TemplateLoader() { + public Reader getTemplate(String name) { + return getTemplateReader(config.templateDir() + File.separator + name + ".mustache"); + } + }) + .defaultValue("") + .compile(template); + + writeToFile(outputFilename, tmpl.execute(bundle)); + files.add(new File(outputFilename)); + } else { + InputStream in = null; + + try { + in = new FileInputStream(config.templateDir() + File.separator + support.templateFile); + } catch (Exception e) { + // continue + } + if (in == null) { + in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile); + } + File outputFile = new File(outputFilename); + OutputStream out = new FileOutputStream(outputFile, false); + if (in != null && out != null) { + IOUtils.copy(in, out); + } else { + if (in == null) { + System.out.println("can't open " + config.templateDir() + File.separator + support.templateFile + " for input"); + } + if (out == null) { + System.out.println("can't open " + outputFile + " for output"); + } + } + + files.add(outputFile); + } + } + + config.processSwagger(swagger); + } catch (Exception e) { + e.printStackTrace(); + } + return files; + } + + private void processMimeTypes(List mimeTypeList, Map operation, String source) { + if (mimeTypeList != null && mimeTypeList.size() > 0) { + List> c = new ArrayList>(); + int count = 0; + for (String key : mimeTypeList) { + Map mediaType = new HashMap(); + mediaType.put("mediaType", key); + count += 1; + if (count < mimeTypeList.size()) { + mediaType.put("hasMore", "true"); + } else { + mediaType.put("hasMore", null); + } + c.add(mediaType); + } + operation.put(source, c); + String flagFieldName = "has" + source.substring(0, 1).toUpperCase() + source.substring(1); + operation.put(flagFieldName, true); + } + } + + public Map> processPaths(Map paths) { + Map> ops = new HashMap>(); + + for (String resourcePath : paths.keySet()) { + Path path = paths.get(resourcePath); + processOperation(resourcePath, "get", path.getGet(), ops); + processOperation(resourcePath, "put", path.getPut(), ops); + processOperation(resourcePath, "post", path.getPost(), ops); + processOperation(resourcePath, "delete", path.getDelete(), ops); + processOperation(resourcePath, "patch", path.getPatch(), ops); + processOperation(resourcePath, "options", path.getOptions(), ops); + } + return ops; + } + + public SecuritySchemeDefinition fromSecurity(String name) { + Map map = swagger.getSecurityDefinitions(); + if (map == null) { + return null; + } + return map.get(name); + } + + + public void processOperation(String resourcePath, String httpMethod, Operation operation, Map> operations) { + if (operation != null) { + List tags = operation.getTags(); + if (tags == null) { + tags = new ArrayList(); + tags.add("default"); + } + + for (String tag : tags) { + CodegenOperation co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions()); + co.tags = new ArrayList(); + co.tags.add(sanitizeTag(tag)); + config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations); + + List>> securities = operation.getSecurity(); + if (securities == null) { + continue; + } + Map authMethods = new HashMap(); + for (Map> security : securities) { + if (security.size() != 1) { + //Not sure what to do + continue; + } + String securityName = security.keySet().iterator().next(); + SecuritySchemeDefinition securityDefinition = fromSecurity(securityName); + if (securityDefinition != null) { + authMethods.put(securityName, securityDefinition); + } + } + if (!authMethods.isEmpty()) { + co.authMethods = config.fromSecurity(authMethods); + } + } + } + } + + protected String sanitizeTag(String tag) { + // remove spaces and make strong case + String[] parts = tag.split(" "); + StringBuilder buf = new StringBuilder(); + for (String part : parts) { + if (isNotEmpty(part)) { + buf.append(capitalize(part)); + } + } + return buf.toString().replaceAll("[^a-zA-Z ]", ""); + } + + public Map processOperations(CodegenConfig config, String tag, List ops) { + Map operations = new HashMap(); + Map objs = new HashMap(); + objs.put("classname", config.toApiName(tag)); + + // check for operationId uniqueness + Set opIds = new HashSet(); + int counter = 0; + for (CodegenOperation op : ops) { + String opId = op.nickname; + if (opIds.contains(opId)) { + counter++; + op.nickname += "_" + counter; + } + opIds.add(opId); + } + objs.put("operation", ops); + + operations.put("operations", objs); + operations.put("package", config.apiPackage()); + + + Set allImports = new LinkedHashSet(); + for (CodegenOperation op : ops) { + allImports.addAll(op.imports); + } + + List> imports = new ArrayList>(); + for (String nextImport : allImports) { + Map im = new LinkedHashMap(); + String mapping = config.importMapping().get(nextImport); + if (mapping == null) { + mapping = config.toModelImport(nextImport); + } + if (mapping != null) { + im.put("import", mapping); + imports.add(im); + } + } + + operations.put("imports", imports); + config.postProcessOperations(operations); + if (objs.size() > 0) { + List os = (List) objs.get("operation"); + + if (os != null && os.size() > 0) { + CodegenOperation op = os.get(os.size() - 1); + op.hasMore = null; + } + } + return operations; + } + + public Map processModels(CodegenConfig config, Map definitions) { + Map objs = new HashMap(); + objs.put("package", config.modelPackage()); + List models = new ArrayList(); + Set allImports = new LinkedHashSet(); + for (String key : definitions.keySet()) { + Model mm = definitions.get(key); + CodegenModel cm = config.fromModel(key, mm); + Map mo = new HashMap(); + mo.put("model", cm); + mo.put("importPath", config.toModelImport(key)); + models.add(mo); + allImports.addAll(cm.imports); + } + objs.put("models", models); + + List> imports = new ArrayList>(); + for (String nextImport : allImports) { + Map im = new LinkedHashMap(); + String mapping = config.importMapping().get(nextImport); + if (mapping == null) { + mapping = config.toModelImport(nextImport); + } + if (mapping != null && !config.defaultIncludes().contains(mapping)) { + im.put("import", mapping); + imports.add(im); + } + // add instantiation types + mapping = config.instantiationTypes().get(nextImport); + if (mapping != null && !config.defaultIncludes().contains(mapping)) { + im.put("import", mapping); + imports.add(im); + } + } + + objs.put("imports", imports); + config.postProcessModels(objs); + + return objs; + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Generator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Generator.java new file mode 100644 index 00000000000..926eb54b2b7 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Generator.java @@ -0,0 +1,10 @@ +package io.swagger.codegen; + +import java.io.File; +import java.util.List; + +public interface Generator { + Generator opts(ClientOptInput opts); + + List generate(); +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java new file mode 100644 index 00000000000..8c8308471ff --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java @@ -0,0 +1,196 @@ +package io.swagger.codegen; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; +import io.swagger.models.Swagger; +import org.apache.commons.cli.BasicParser; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.Reader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; + +/** + * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator} + * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547 + */ +@Deprecated +public class MetaGenerator extends AbstractGenerator { + static Map configs = new HashMap(); + static String configString; + + public static void main(String[] args) { + new MetaGenerator().generate(args); + } + + public static List getExtensions() { + ServiceLoader loader = ServiceLoader.load(CodegenConfig.class); + List output = new ArrayList(); + Iterator itr = loader.iterator(); + while (itr.hasNext()) { + output.add(itr.next()); + } + return output; + } + + static void usage(Options options) { + HelpFormatter formatter = new HelpFormatter(); + formatter.printHelp("MetaGenerator. Generator for creating a new template set " + + "and configuration for Codegen. The output will be based on the language you " + + "specify, and includes default templates to include.", options); + } + + public static CodegenConfig getConfig(String name) { + if (configs.containsKey(name)) { + return configs.get(name); + } + return null; + } + + protected void generate(String[] args) { + StringBuilder sb = new StringBuilder(); + String targetLanguage = null; + String outputFolder = null; + String name = null; + String targetPackage = "io.swagger.codegen"; + final String templateDir = "codegen"; + + Options options = new Options(); + options.addOption("h", "help", false, "shows this message"); + options.addOption("l", "lang", false, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]"); + options.addOption("o", "output", true, "where to write the generated files"); + options.addOption("n", "name", true, "the human-readable name of the generator"); + options.addOption("p", "package", true, "the package to put the main class into (defaults to io.swagger.codegen"); + + ClientOptInput clientOptInput = new ClientOptInput(); + Swagger swagger = null; + CommandLine cmd = null; + try { + CommandLineParser parser = new BasicParser(); + + cmd = parser.parse(options, args); + if (cmd.hasOption("h")) { + usage(options); + return; + } + if (cmd.hasOption("n")) { + name = cmd.getOptionValue("n"); + } else { + System.out.println("name is required"); + usage(options); + return; + } + if (cmd.hasOption("l")) { + targetLanguage = cmd.getOptionValue("l"); + } + if (cmd.hasOption("p")) { + targetPackage = cmd.getOptionValue("p"); + } + if (cmd.hasOption("o")) { + outputFolder = cmd.getOptionValue("o"); + } else { + System.out.println("output folder is required"); + usage(options); + return; + } + } catch (Exception e) { + usage(options); + return; + } + System.out.println("writing to folder " + outputFolder); + File outputFolderLocation = new File(outputFolder); + if (!outputFolderLocation.exists()) { + outputFolderLocation.mkdirs(); + } + File sourceFolder = new File(outputFolder + File.separator + "src/main/java/" + targetPackage.replace('.', File.separatorChar)); + if (!sourceFolder.exists()) { + sourceFolder.mkdirs(); + } + File resourcesFolder = new File(outputFolder + File.separator + "src/main/resources/META-INF/services"); + if (!resourcesFolder.exists()) { + resourcesFolder.mkdirs(); + } + + String mainClass = Character.toUpperCase(name.charAt(0)) + name.substring(1) + "Generator"; + + List supportingFiles = new ArrayList(); + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("generatorClass.mustache", + "src/main/java/" + File.separator + targetPackage.replace('.', File.separatorChar), + mainClass + ".java")); + supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache")); + supportingFiles.add(new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache")); + + supportingFiles.add(new SupportingFile("services.mustache", "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig")); + + List files = new ArrayList(); + + Map data = new HashMap(); + data.put("generatorPackage", targetPackage); + data.put("generatorClass", mainClass); + data.put("name", name); + data.put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass); + + for (SupportingFile support : supportingFiles) { + try { + String destinationFolder = outputFolder; + if (support.folder != null && !"".equals(support.folder)) { + destinationFolder += File.separator + support.folder; + } + File of = new File(destinationFolder); + if (!of.isDirectory()) { + of.mkdirs(); + } + String outputFilename = destinationFolder + File.separator + support.destinationFilename; + + if (support.templateFile.endsWith("mustache")) { + String template = readTemplate(templateDir + File.separator + support.templateFile); + Template tmpl = Mustache.compiler() + .withLoader(new Mustache.TemplateLoader() { + public Reader getTemplate(String name) { + return getTemplateReader(templateDir + File.separator + name + ".mustache"); + } + + ; + }) + .defaultValue("") + .compile(template); + + writeToFile(outputFilename, tmpl.execute(data)); + files.add(new File(outputFilename)); + } else { + String template = readTemplate(templateDir + File.separator + support.templateFile); + FileUtils.writeStringToFile(new File(outputFilename), template); + System.out.println("copying file to " + outputFilename); + files.add(new File(outputFilename)); + } + } catch (java.io.IOException e) { + e.printStackTrace(); + } + } + } + + static { + List extensions = getExtensions(); + StringBuilder sb = new StringBuilder(); + + for (CodegenConfig config : extensions) { + if (sb.toString().length() != 0) { + sb.append(", "); + } + sb.append(config.getName()); + configs.put(config.getName(), config); + configString = sb.toString(); + } + } +} 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 new file mode 100644 index 00000000000..6be69b85d54 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java @@ -0,0 +1,13 @@ +package io.swagger.codegen; + +public class SupportingFile { + public String templateFile; + public String folder; + public String destinationFilename; + + public SupportingFile(String templateFile, String folder, String destinationFilename) { + this.templateFile = templateFile; + this.folder = folder; + this.destinationFilename = destinationFilename; + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthMethod.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthMethod.java new file mode 100644 index 00000000000..9a526f1ecf1 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthMethod.java @@ -0,0 +1,7 @@ +package io.swagger.codegen.auth; + +public interface AuthMethod { + String getType(); + + void setType(String type); +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java new file mode 100644 index 00000000000..855739af1fd --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java @@ -0,0 +1,158 @@ +package io.swagger.codegen.examples; + +import io.swagger.models.Model; +import io.swagger.models.ModelImpl; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +import io.swagger.models.properties.DecimalProperty; +import io.swagger.models.properties.DoubleProperty; +import io.swagger.models.properties.FileProperty; +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.ObjectProperty; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; +import io.swagger.models.properties.UUIDProperty; +import io.swagger.util.Json; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class ExampleGenerator { + protected Map examples; + + public ExampleGenerator(Map examples) { + this.examples = examples; + } + + public List> generate(Map examples, List mediaTypes, Property property) { + List> output = new ArrayList>(); + Set processedModels = new HashSet(); + if (examples == null) { + if (mediaTypes == null) { + // assume application/json for this + mediaTypes = Arrays.asList("application/json"); + } + for (String mediaType : mediaTypes) { + Map kv = new HashMap(); + kv.put("contentType", mediaType); + if (property != null && mediaType.startsWith("application/json")) { + String example = Json.pretty(resolvePropertyToExample(mediaType, property, processedModels)); + + if (example != null) { + kv.put("example", example); + output.add(kv); + } + } else if (property != null && mediaType.startsWith("application/xml")) { + String example = new XmlExampleGenerator(this.examples).toXml(property); + if (example != null) { + kv.put("example", example); + output.add(kv); + } + } + } + } else { + for (Map.Entry entry : examples.entrySet()) { + final Map kv = new HashMap(); + kv.put("contentType", entry.getKey()); + kv.put("example", Json.pretty(entry.getValue())); + output.add(kv); + } + } + if (output.size() == 0) { + Map kv = new HashMap(); + kv.put("output", "none"); + output.add(kv); + } + return output; + } + + protected Object resolvePropertyToExample(String mediaType, Property property, Set processedModels) { + if (property.getExample() != null) { + return property.getExample(); + } else if (property instanceof StringProperty) { + return "aeiou"; + } else if (property instanceof BooleanProperty) { + return Boolean.TRUE; + } else if (property instanceof ArrayProperty) { + Property innerType = ((ArrayProperty) property).getItems(); + if (innerType != null) { + Object[] output = new Object[]{ + resolvePropertyToExample(mediaType, innerType, processedModels) + }; + return output; + } + } else if (property instanceof DateProperty) { + return new java.util.Date(System.currentTimeMillis()); + } else if (property instanceof DateTimeProperty) { + return new java.util.Date(System.currentTimeMillis()); + } else if (property instanceof DecimalProperty) { + return new BigDecimal(1.3579); + } else if (property instanceof DoubleProperty) { + return new Double(3.149); + } else if (property instanceof FileProperty) { + return ""; // TODO + } else if (property instanceof FloatProperty) { + return new Float(1.23); + } else if (property instanceof IntegerProperty) { + return new Integer(123); + } else if (property instanceof LongProperty) { + return new Long(123456789); + } else if (property instanceof MapProperty) { + Map mp = new HashMap(); + if (property.getName() != null) { + mp.put(property.getName(), + resolvePropertyToExample(mediaType, ((MapProperty) property).getAdditionalProperties(), processedModels)); + } else { + mp.put("key", + resolvePropertyToExample(mediaType, ((MapProperty) property).getAdditionalProperties(), processedModels)); + } + return mp; + } else if (property instanceof ObjectProperty) { + return "{}"; + } else if (property instanceof RefProperty) { + String simpleName = ((RefProperty) property).getSimpleRef(); + Model model = examples.get(simpleName); + if (model != null) { + return resolveModelToExample(simpleName, mediaType, model, processedModels); + } + } else if (property instanceof UUIDProperty) { + return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; + } + + return ""; + } + + public Object resolveModelToExample(String name, String mediaType, Model model, Set processedModels) { + if (processedModels.contains(name)) { + return ""; + } + if (model instanceof ModelImpl) { + processedModels.add(name); + ModelImpl impl = (ModelImpl) model; + Map values = new HashMap(); + + if (impl != null && impl.getProperties() != null) { + for (String propertyName : impl.getProperties().keySet()) { + Property property = impl.getProperties().get(propertyName); + values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels)); + } + } + + return values; + } + + return ""; + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java new file mode 100644 index 00000000000..73294268f39 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java @@ -0,0 +1,226 @@ +package io.swagger.codegen.examples; + + +import io.swagger.models.Model; +import io.swagger.models.ModelImpl; +import io.swagger.models.RefModel; +import io.swagger.models.Xml; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +import io.swagger.models.properties.IntegerProperty; +import io.swagger.models.properties.LongProperty; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; +import org.codehaus.plexus.util.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + +public class XmlExampleGenerator { + public static String NEWLINE = "\n"; + public static String TAG_START = "<"; + public static String CLOSE_TAG = ">"; + public static String TAG_END = " examples; + protected SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + + public XmlExampleGenerator(Map examples) { + this.examples = examples; + if (examples == null) { + examples = new HashMap(); + } + } + + public String toXml(Property property) { + return toXml(null, property, 0, Collections.emptySet()); + } + + protected String toXml(Model model, int indent, Collection path) { + if (model instanceof RefModel) { + RefModel ref = (RefModel) model; + Model actualModel = examples.get(ref.getSimpleRef()); + if (actualModel instanceof ModelImpl) { + return modelImplToXml((ModelImpl) actualModel, indent, path); + } + } else if (model instanceof ModelImpl) { + return modelImplToXml((ModelImpl) model, indent, path); + } + return null; + } + + protected String modelImplToXml(ModelImpl model, int indent, Collection path) { + final String modelName = model.getName(); + if (path.contains(modelName)) { + return EMPTY; + } + final Set selfPath = new HashSet(path); + selfPath.add(modelName); + + StringBuilder sb = new StringBuilder(); + // attributes + Map attributes = new LinkedHashMap(); + Map elements = new LinkedHashMap(); + + String name = modelName; + String namespace; + String prefix; + Boolean wrapped; + + Xml xml = model.getXml(); + if (xml != null) { + if (xml.getName() != null) { + name = xml.getName(); + } + } + for (String pName : model.getProperties().keySet()) { + Property p = model.getProperties().get(pName); + if (p != null && p.getXml() != null && p.getXml().getAttribute() != null && p.getXml().getAttribute()) { + attributes.put(pName, p); + } else { + elements.put(pName, p); + } + } + sb.append(indent(indent)).append(TAG_START); + sb.append(name); + for (String pName : attributes.keySet()) { + Property p = attributes.get(pName); + sb.append(" ").append(pName).append("=").append(quote(toXml(null, p, 0, selfPath))); + } + sb.append(CLOSE_TAG); + sb.append(NEWLINE); + for (String pName : elements.keySet()) { + Property p = elements.get(pName); + final String asXml = toXml(pName, p, indent + 1, selfPath); + if (StringUtils.isEmpty(asXml)) { + continue; + } + sb.append(asXml); + sb.append(NEWLINE); + } + sb.append(indent(indent)).append(TAG_END).append(name).append(CLOSE_TAG); + + return sb.toString(); + } + + protected String quote(String string) { + return "\"" + string + "\""; + } + + protected String toXml(String name, Property property, int indent, Collection path) { + if (property == null) { + return ""; + } + StringBuilder sb = new StringBuilder(); + + if (property instanceof ArrayProperty) { + ArrayProperty p = (ArrayProperty) property; + Property inner = p.getItems(); + boolean wrapped = false; + if (property.getXml() != null && property.getXml().getWrapped()) { + wrapped = true; + } + if (wrapped) { + String prefix = EMPTY; + if (name != null) { + sb.append(indent(indent)); + sb.append(openTag(name)); + prefix = NEWLINE; + } + final String asXml = toXml(name, inner, indent + 1, path); + if (StringUtils.isNotEmpty(asXml)) { + sb.append(prefix).append(asXml); + } + if (name != null) { + sb.append(NEWLINE); + sb.append(indent(indent)); + sb.append(closeTag(name)); + } + } else { + sb.append(toXml(name, inner, indent, path)); + } + } else if (property instanceof RefProperty) { + RefProperty ref = (RefProperty) property; + Model actualModel = examples.get(ref.getSimpleRef()); + sb.append(toXml(actualModel, indent, path)); + } else { + if (name != null) { + sb.append(indent(indent)); + sb.append(openTag(name)); + } + sb.append(getExample(property)); + if (name != null) { + sb.append(closeTag(name)); + } + } + return sb.toString(); + } + + protected String getExample(Property property) { + if (property instanceof DateTimeProperty) { + if (property.getExample() != null) { + return property.getExample(); + } else { + return dtFormat.format(new Date()); + } + } else if (property instanceof StringProperty) { + if (property.getExample() != null) { + return property.getExample(); + } else { + return "string"; + } + } else if (property instanceof DateProperty) { + if (property.getExample() != null) { + return property.getExample(); + } else { + return dateFormat.format(new Date()); + } + } else if (property instanceof IntegerProperty) { + if (property.getExample() != null) { + return property.getExample(); + } else { + return "0"; + } + } else if (property instanceof BooleanProperty) { + if (property.getExample() != null) { + return property.getExample(); + } else { + return "true"; + } + } else if (property instanceof LongProperty) { + if (property.getExample() != null) { + return property.getExample(); + } else { + return "123456"; + } + } + return "not implemented " + property; + } + + protected String openTag(String name) { + return "<" + name + ">"; + } + + protected String closeTag(String name) { + return ""; + } + + protected String indent(int indent) { + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < indent; i++) { + sb.append(" "); + } + return sb.toString(); + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..efcd771ac10 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java @@ -0,0 +1,399 @@ +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.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenProperty; +import io.swagger.codegen.CodegenResponse; +import io.swagger.codegen.CodegenSecurity; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.auth.SecuritySchemeDefinition; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +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; +import io.swagger.models.properties.StringProperty; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String mainPackage = "io.swagger.client"; + protected String invokerPackage = mainPackage + ".core"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/scala"; + protected String resourcesFolder = "src/main/resources"; + protected String configKey = "apiRequest"; + protected int defaultTimeoutInMs = 5000; + protected String configKeyPath = mainPackage; + protected boolean registerNonStandardStatusCodes = true; + protected boolean renderJavadoc = true; + protected boolean removeOAuthSecurities = true; + /** + * If set to true, only the default response (the one with le lowest 2XX code) will be considered as a success, and all + * others as ApiErrors. + * If set to false, all responses defined in the model will be considered as a success upon reception. Only http errors, + * unmarshalling problems and any other RuntimeException will be considered as ApiErrors. + */ + protected boolean onlyOneSuccess = true; + Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class); + + public AkkaScalaClientCodegen() { + super(); + outputFolder = "generated-code/scala"; + modelTemplateFiles.put("model.mustache", ".scala"); + apiTemplateFiles.put("api.mustache", ".scala"); + templateDir = "akka-scala"; + apiPackage = mainPackage + ".api"; + modelPackage = mainPackage + ".model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "case", "catch", "class", "def", "do", "else", "extends", + "false", "final", "finally", "for", "forSome", "if", "implicit", + "import", "lazy", "match", "new", "null", "object", "override", "package", + "private", "protected", "return", "sealed", "super", "this", "throw", + "trait", "try", "true", "type", "val", "var", "while", "with", "yield") + ); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + additionalProperties.put("configKey", configKey); + additionalProperties.put("configKeyPath", configKeyPath); + additionalProperties.put("defaultTimeout", defaultTimeoutInMs); + if (renderJavadoc) { + additionalProperties.put("javadocRenderer", new JavadocLambda()); + } + additionalProperties.put("fnCapitalize", new CapitalizeLambda()); + additionalProperties.put("fnCamelize", new CamelizeLambda(false)); + additionalProperties.put("fnEnumEntry", new EnumEntryLambda()); + additionalProperties.put("onlyOneSuccess", onlyOneSuccess); + + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf")); + final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator); + supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala")); + supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala")); + supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala")); + supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala")); + final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); + supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala")); + + importMapping.remove("Seq"); + importMapping.remove("List"); + importMapping.remove("Set"); + importMapping.remove("Map"); + + importMapping.put("DateTime", "org.joda.time.DateTime"); + + typeMapping = new HashMap(); + typeMapping.put("array", "Seq"); + typeMapping.put("set", "Set"); + typeMapping.put("boolean", "Boolean"); + typeMapping.put("string", "String"); + typeMapping.put("int", "Int"); + typeMapping.put("integer", "Int"); + typeMapping.put("long", "Long"); + typeMapping.put("float", "Float"); + typeMapping.put("byte", "Byte"); + typeMapping.put("short", "Short"); + typeMapping.put("char", "Char"); + typeMapping.put("long", "Long"); + typeMapping.put("double", "Double"); + typeMapping.put("object", "Any"); + typeMapping.put("file", "File"); + typeMapping.put("number", "Double"); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Int", + "Long", + "Float", + "Object", + "List", + "Seq", + "Map") + ); + instantiationTypes.put("array", "ListBuffer"); + instantiationTypes.put("map", "Map"); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "akka-scala"; + } + + public String getHelp() { + return "Generates a Scala client library base on Akka/Spray."; + } + + @Override + public String escapeReservedWord(String name) { + return "`" + name + "`"; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public Map postProcessOperations(Map objs) { + if (registerNonStandardStatusCodes) { + try { + @SuppressWarnings("unchecked") + Map> opsMap = (Map>) objs.get("operations"); + HashSet unknownCodes = new HashSet(); + for (CodegenOperation operation : opsMap.get("operation")) { + for (CodegenResponse response : operation.responses) { + if ("default".equals(response.code)) { + continue; + } + try { + int code = Integer.parseInt(response.code); + if (code >= 600) { + unknownCodes.add(code); + } + } catch (NumberFormatException e) { + LOGGER.error("Status code is not an integer : response.code", e); + } + } + } + if (!unknownCodes.isEmpty()) { + additionalProperties.put("unknownStatusCodes", unknownCodes); + } + } catch (Exception e) { + LOGGER.error("Unable to find operations List", e); + } + } + return super.postProcessOperations(objs); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public List fromSecurity(Map schemes) { + final List codegenSecurities = super.fromSecurity(schemes); + if (!removeOAuthSecurities) { + return codegenSecurities; + } + + // Remove OAuth securities + Iterator it = codegenSecurities.iterator(); + while (it.hasNext()) { + final CodegenSecurity security = it.next(); + if (security.isOAuth) { + it.remove(); + } + } + // Adapt 'hasMore' + it = codegenSecurities.iterator(); + while (it.hasNext()) { + final CodegenSecurity security = it.next(); + security.hasMore = it.hasNext(); + } + + if (codegenSecurities.isEmpty()) { + return null; + } + return codegenSecurities; + } + + @Override + public String toOperationId(String operationId) { + return super.toOperationId(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, operationId)); + } + + private String formatIdentifier(String name, boolean capitalized) { + String identifier = camelize(name, true); + if (capitalized) { + identifier = StringUtils.capitalize(identifier); + } + if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !reservedWords.contains(identifier)) { + return identifier; + } + return escapeReservedWord(identifier); + } + + @Override + public String toParamName(String name) { + return formatIdentifier(name, false); + } + + @Override + public String toVarName(String name) { + return formatIdentifier(name, false); + } + + @Override + public String toEnumName(CodegenProperty property) { + return formatIdentifier(property.baseName, true); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return instantiationTypes.get("map") + "[String, " + inner + "]"; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return instantiationTypes.get("array") + "[" + inner + "]"; + } else { + return null; + } + } + + public String toDefaultValue(Property p) { + if (!p.getRequired()) { + return "None"; + } + if (p instanceof StringProperty) { + return "null"; + } else if (p instanceof BooleanProperty) { + return "null"; + } else if (p instanceof DateProperty) { + return "null"; + } else if (p instanceof DateTimeProperty) { + return "null"; + } else if (p instanceof DoubleProperty) { + return "null"; + } else if (p instanceof FloatProperty) { + return "null"; + } else if (p instanceof IntegerProperty) { + return "null"; + } else if (p instanceof LongProperty) { + return "null"; + } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "Map[String, " + inner + "].empty "; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return "Seq[" + inner + "].empty "; + } else { + return "null"; + } + } + + private static abstract class CustomLambda implements Mustache.Lambda { + @Override + public void execute(Template.Fragment frag, Writer out) throws IOException { + final StringWriter tempWriter = new StringWriter(); + frag.execute(tempWriter); + out.write(formatFragment(tempWriter.toString())); + } + + public abstract String formatFragment(String fragment); + } + + + private static class JavadocLambda extends CustomLambda { + @Override + public String formatFragment(String fragment) { + final String[] lines = fragment.split("\\r?\\n"); + final StringBuilder sb = new StringBuilder(); + sb.append(" /**\n"); + for (String line : lines) { + sb.append(" * ").append(line).append("\n"); + } + sb.append(" */\n"); + return sb.toString(); + } + } + + private static class CapitalizeLambda extends CustomLambda { + @Override + public String formatFragment(String fragment) { + return StringUtils.capitalize(fragment); + } + } + + private static class CamelizeLambda extends CustomLambda { + private final boolean capitalizeFirst; + + public CamelizeLambda(boolean capitalizeFirst) { + this.capitalizeFirst = capitalizeFirst; + } + + @Override + public String formatFragment(String fragment) { + return camelize(fragment, !capitalizeFirst); + } + } + + private class EnumEntryLambda extends CustomLambda { + @Override + public String formatFragment(String fragment) { + return formatIdentifier(fragment, true); + } + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000000..9a3237d92ca --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java @@ -0,0 +1,265 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; + +public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-android-client"; + protected String artifactVersion = "1.0.0"; + protected String projectFolder = "src/main"; + protected String sourceFolder = projectFolder + "/java"; + protected Boolean useAndroidMavenGradlePlugin = true; + + public AndroidClientCodegen() { + super(); + outputFolder = "generated-code/android"; + modelTemplateFiles.put("model.mustache", ".java"); + apiTemplateFiles.put("api.mustache", ".java"); + templateDir = "android-java"; + apiPackage = "io.swagger.client.api"; + modelPackage = "io.swagger.client.model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "continue", "for", "new", "switch", "assert", + "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", + "native", "super", "while") + ); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float", + "Object") + ); + instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("map", "HashMap"); + + cliOptions.add(new CliOption("invokerPackage", "root package to use for the generated code")); + cliOptions.add(new CliOption("groupId", "groupId for use in the generated build.gradle and pom.xml")); + cliOptions.add(new CliOption("artifactId", "artifactId for use in the generated build.gradle and pom.xml")); + cliOptions.add(new CliOption("artifactVersion", "artifact version for use in the generated build.gradle and pom.xml")); + cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); + cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true.")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "android"; + } + + public String getHelp() { + return "Generates an Android client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + ""; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, do nothing + if (name.matches("^[A-Z_]*$")) { + return name; + } + + // camelize (lower first character) the variable name + // pet_id => petId + name = camelize(name, true); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return camelize(operationId, true); + } + + @Override + public void processOpts() { + super.processOpts(); + + if (additionalProperties.containsKey("invokerPackage")) { + this.setInvokerPackage((String) additionalProperties.get("invokerPackage")); + } else { + //not set, use default to be passed to template + additionalProperties.put("invokerPackage", invokerPackage); + } + + if (additionalProperties.containsKey("groupId")) { + this.setGroupId((String) additionalProperties.get("groupId")); + } else { + //not set, use to be passed to template + additionalProperties.put("groupId", groupId); + } + + if (additionalProperties.containsKey("artifactId")) { + this.setArtifactId((String) additionalProperties.get("artifactId")); + } else { + //not set, use to be passed to template + additionalProperties.put("artifactId", artifactId); + } + + if (additionalProperties.containsKey("artifactVersion")) { + this.setArtifactVersion((String) additionalProperties.get("artifactVersion")); + } else { + //not set, use to be passed to template + additionalProperties.put("artifactVersion", artifactVersion); + } + + if (additionalProperties.containsKey("sourceFolder")) { + this.setSourceFolder((String) additionalProperties.get("sourceFolder")); + } + + if (additionalProperties.containsKey("useAndroidMavenGradlePlugin")) { + this.setUseAndroidMavenGradlePlugin((Boolean) additionalProperties.get("useAndroidMavenGradlePlugin")); + } else { + additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin); + } + + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin); + + supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); + supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle")); + supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml")); + supportingFiles.add(new SupportingFile("apiInvoker.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java")); + supportingFiles.add(new SupportingFile("httpPatch.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java")); + supportingFiles.add(new SupportingFile("jsonUtil.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java")); + supportingFiles.add(new SupportingFile("apiException.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java")); + } + + public Boolean getUseAndroidMavenGradlePlugin() { + return useAndroidMavenGradlePlugin; + } + + public void setUseAndroidMavenGradlePlugin(Boolean useAndroidMavenGradlePlugin) { + this.useAndroidMavenGradlePlugin = useAndroidMavenGradlePlugin; + } + + public void setInvokerPackage(String invokerPackage) { + this.invokerPackage = invokerPackage; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public void setArtifactId(String artifactId) { + this.artifactId = artifactId; + } + + public void setArtifactVersion(String artifactVersion) { + this.artifactVersion = artifactVersion; + } + + public void setSourceFolder(String sourceFolder) { + this.sourceFolder = sourceFolder; + } + +} 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 new file mode 100644 index 00000000000..c941d8b8d97 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java @@ -0,0 +1,207 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +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; +import io.swagger.models.properties.StringProperty; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; + +public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-async-scala-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/scala"; + protected String clientName = "SwaggerClient"; + protected String authScheme = ""; + protected boolean authPreemptive = false; + protected boolean asyncHttpClient = !authScheme.isEmpty(); + + public AsyncScalaClientCodegen() { + super(); + outputFolder = "generated-code/async-scala"; + modelTemplateFiles.put("model.mustache", ".scala"); + apiTemplateFiles.put("api.mustache", ".scala"); + templateDir = "asyncscala"; + apiPackage = "io.swagger.client.api"; + modelPackage = "io.swagger.client.model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "case", "catch", "class", "def", "do", "else", "extends", + "false", "final", "finally", "for", "forSome", "if", "implicit", + "import", "lazy", "match", "new", "null", "object", "override", "package", + "private", "protected", "return", "sealed", "super", "this", "throw", + "trait", "try", "true", "type", "val", "var", "while", "with", "yield") + ); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + additionalProperties.put("asyncHttpClient", asyncHttpClient); + additionalProperties.put("authScheme", authScheme); + additionalProperties.put("authPreemptive", authPreemptive); + additionalProperties.put("clientName", clientName); + + supportingFiles.add(new SupportingFile("sbt.mustache", "", "build.sbt")); + supportingFiles.add(new SupportingFile("client.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), clientName + ".scala")); + + importMapping.remove("List"); + importMapping.remove("Set"); + importMapping.remove("Map"); + + importMapping.put("DateTime", "org.joda.time.DateTime"); + importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer"); + + typeMapping = new HashMap(); + typeMapping.put("enum", "NSString"); + typeMapping.put("array", "List"); + typeMapping.put("set", "Set"); + typeMapping.put("boolean", "Boolean"); + typeMapping.put("string", "String"); + typeMapping.put("int", "Int"); + typeMapping.put("long", "Long"); + typeMapping.put("float", "Float"); + typeMapping.put("byte", "Byte"); + typeMapping.put("short", "Short"); + typeMapping.put("char", "Char"); + typeMapping.put("long", "Long"); + typeMapping.put("double", "Double"); + typeMapping.put("object", "Any"); + typeMapping.put("file", "File"); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Int", + "Long", + "Float", + "Object", + "List", + "Map") + ); + instantiationTypes.put("array", "ListBuffer"); + instantiationTypes.put("map", "HashMap"); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "async-scala"; + } + + public String getHelp() { + return "Generates an Asynchronous Scala client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return instantiationTypes.get("map") + "[String, " + inner + "]"; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return instantiationTypes.get("array") + "[" + inner + "]"; + } else { + return null; + } + } + + public String toDefaultValue(Property p) { + if (p instanceof StringProperty) { + return "null"; + } else if (p instanceof BooleanProperty) { + return "null"; + } else if (p instanceof DateProperty) { + return "null"; + } else if (p instanceof DateTimeProperty) { + return "null"; + } else if (p instanceof DoubleProperty) { + return "null"; + } else if (p instanceof FloatProperty) { + return "null"; + } else if (p instanceof IntegerProperty) { + return "null"; + } else if (p instanceof LongProperty) { + return "null"; + } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "new HashMap[String, " + inner + "]() "; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return "new ListBuffer[" + inner + "]() "; + } else { + return "null"; + } + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..a564ec5f883 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -0,0 +1,203 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; + +public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "IO.Swagger.Client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-csharp-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/csharp"; + + public CSharpClientCodegen() { + super(); + outputFolder = "generated-code/csharp"; + modelTemplateFiles.put("model.mustache", ".cs"); + apiTemplateFiles.put("api.mustache", ".cs"); + templateDir = "csharp"; + apiPackage = "IO.Swagger.Api"; + modelPackage = "IO.Swagger.Model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while") + ); + + additionalProperties.put("invokerPackage", invokerPackage); + + supportingFiles.add(new SupportingFile("Configuration.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Configuration.cs")); + supportingFiles.add(new SupportingFile("ApiClient.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiClient.cs")); + supportingFiles.add(new SupportingFile("ApiException.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs")); + supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll")); + supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll")); + supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat")); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "string", + "bool?", + "double?", + "int?", + "long?", + "float?", + "byte[]", + "List", + "Dictionary", + "DateTime?", + "String", + "Boolean", + "Double", + "Integer", + "Long", + "Float", + "Object") + ); + instantiationTypes.put("array", "List"); + instantiationTypes.put("map", "Dictionary"); + + typeMapping = new HashMap(); + typeMapping.put("string", "string"); + typeMapping.put("boolean", "bool?"); + typeMapping.put("integer", "int?"); + typeMapping.put("float", "float?"); + typeMapping.put("long", "long?"); + typeMapping.put("double", "double?"); + typeMapping.put("number", "double?"); + typeMapping.put("datetime", "DateTime?"); + typeMapping.put("date", "DateTime?"); + typeMapping.put("file", "string"); // path to file + typeMapping.put("array", "List"); + typeMapping.put("list", "List"); + typeMapping.put("map", "Dictionary"); + typeMapping.put("object", "Object"); + + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "csharp"; + } + + public String getHelp() { + return "Generates a CSharp client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar); + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, do nothing + if (name.matches("^[A-Z_]*$")) { + return name; + } + + // camelize the variable name + // pet_id => PetId + name = camelize(name); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + ""; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType.toLowerCase())) { + type = typeMapping.get(swaggerType.toLowerCase()); + if (languageSpecificPrimitives.contains(type)) { + return type; + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return camelize(operationId); + } + +} 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 new file mode 100644 index 00000000000..fcec455e9b3 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -0,0 +1,247 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; + +public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-java-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/java"; + + public JavaClientCodegen() { + super(); + outputFolder = "generated-code/java"; + modelTemplateFiles.put("model.mustache", ".java"); + apiTemplateFiles.put("api.mustache", ".java"); + templateDir = "Java"; + apiPackage = "io.swagger.client.api"; + modelPackage = "io.swagger.client.model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "continue", "for", "new", "switch", "assert", + "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", + "native", "super", "while") + ); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float", + "Object") + ); + instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("map", "HashMap"); + + cliOptions.add(new CliOption("invokerPackage", "root package for generated code")); + cliOptions.add(new CliOption("groupId", "groupId in generated pom.xml")); + cliOptions.add(new CliOption("artifactId", "artifactId in generated pom.xml")); + cliOptions.add(new CliOption("artifactVersion", "artifact version in generated pom.xml")); + cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "java"; + } + + public String getHelp() { + return "Generates a Java client library."; + } + + @Override + public void processOpts() { + super.processOpts(); + + if (additionalProperties.containsKey("invokerPackage")) { + this.setInvokerPackage((String) additionalProperties.get("invokerPackage")); + } else { + //not set, use default to be passed to template + additionalProperties.put("invokerPackage", invokerPackage); + } + + if (additionalProperties.containsKey("groupId")) { + this.setGroupId((String) additionalProperties.get("groupId")); + } else { + //not set, use to be passed to template + additionalProperties.put("groupId", groupId); + } + + if (additionalProperties.containsKey("artifactId")) { + this.setArtifactId((String) additionalProperties.get("artifactId")); + } else { + //not set, use to be passed to template + additionalProperties.put("artifactId", artifactId); + } + + if (additionalProperties.containsKey("artifactVersion")) { + this.setArtifactVersion((String) additionalProperties.get("artifactVersion")); + } else { + //not set, use to be passed to template + additionalProperties.put("artifactVersion", artifactVersion); + } + + if (additionalProperties.containsKey("sourceFolder")) { + this.setSourceFolder((String) additionalProperties.get("sourceFolder")); + } + + final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator); + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java")); + supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java")); + supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java")); + supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java")); + supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java")); + + final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator); + supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java")); + 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")); + } + + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, do nothing + if (name.matches("^[A-Z_]*$")) { + return name; + } + + // camelize (lower first character) the variable name + // pet_id => petId + name = camelize(name, true); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + ""; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return camelize(operationId, true); + } + + public void setInvokerPackage(String invokerPackage) { + this.invokerPackage = invokerPackage; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public void setArtifactId(String artifactId) { + this.artifactId = artifactId; + } + + public void setArtifactVersion(String artifactVersion) { + this.artifactVersion = artifactVersion; + } + + public void setSourceFolder(String sourceFolder) { + this.sourceFolder = sourceFolder; + } +} 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 new file mode 100644 index 00000000000..ac541157458 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java @@ -0,0 +1,206 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Operation; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.api"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-jaxrs-server"; + protected String artifactVersion = "1.0.0"; + protected String title = "Swagger Server"; + + public JaxRSServerCodegen() { + super.processOpts(); + + sourceFolder = "src/gen/java"; + + outputFolder = System.getProperty("swagger.codegen.jaxrs.genfolder", "generated-code/javaJaxRS"); + modelTemplateFiles.put("model.mustache", ".java"); + apiTemplateFiles.put("api.mustache", ".java"); + apiTemplateFiles.put("apiService.mustache", ".java"); + apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); + apiTemplateFiles.put("apiServiceFactory.mustache", ".java"); + templateDir = "JavaJaxRS"; + apiPackage = System.getProperty("swagger.codegen.jaxrs.apipackage", "io.swagger.api"); + modelPackage = System.getProperty("swagger.codegen.jaxrs.modelpackage", "io.swagger.model"); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + additionalProperties.put("title", title); + + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float") + ); + } + + public CodegenType getTag() { + return CodegenType.SERVER; + } + + public String getName() { + return "jaxrs"; + } + + public String getHelp() { + return "Generates a Java JAXRS Server application."; + } + + @Override + public void processOpts() { + super.processOpts(); + + supportingFiles.clear(); + 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")); + supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache", + (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java")); + supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache", + (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java")); + supportingFiles.add(new SupportingFile("NotFoundException.mustache", + (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java")); + supportingFiles.add(new SupportingFile("web.mustache", + ("src/main/webapp/WEB-INF"), "web.xml")); + + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getTypeDeclaration(inner); + } + return super.getTypeDeclaration(p); + } + + @Override + public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { + String basePath = resourcePath; + if (basePath.startsWith("/")) { + basePath = basePath.substring(1); + } + int pos = basePath.indexOf("/"); + if (pos > 0) { + basePath = basePath.substring(0, pos); + } + + if (basePath == "") { + basePath = "default"; + } else { + if (co.path.startsWith("/" + basePath)) { + co.path = co.path.substring(("/" + basePath).length()); + } + co.subresourceOperation = !co.path.isEmpty(); + } + List opList = operations.get(basePath); + if (opList == null) { + opList = new ArrayList(); + operations.put(basePath, opList); + } + opList.add(co); + co.baseName = basePath; + } + + public Map postProcessOperations(Map objs) { + Map operations = (Map) objs.get("operations"); + if (operations != null) { + List ops = (List) operations.get("operation"); + for (CodegenOperation operation : ops) { + if (operation.returnType == null) { + operation.returnType = "Void"; + } else if (operation.returnType.startsWith("List")) { + String rt = operation.returnType; + int end = rt.lastIndexOf(">"); + if (end > 0) { + operation.returnType = rt.substring("List<".length(), end); + operation.returnContainer = "List"; + } + } else if (operation.returnType.startsWith("Map")) { + String rt = operation.returnType; + int end = rt.lastIndexOf(">"); + if (end > 0) { + operation.returnType = rt.substring("Map<".length(), end); + operation.returnContainer = "Map"; + } + } else if (operation.returnType.startsWith("Set")) { + String rt = operation.returnType; + int end = rt.lastIndexOf(">"); + if (end > 0) { + operation.returnType = rt.substring("Set<".length(), end); + operation.returnContainer = "Set"; + } + } + } + } + return objs; + } + + @Override + public String apiFilename(String templateName, String tag) { + + String result = super.apiFilename(templateName, tag); + + if (templateName.endsWith("Impl.mustache")) { + int ix = result.lastIndexOf('/'); + 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)); + } + } else if (templateName.endsWith("Factory.mustache")) { + int ix = result.lastIndexOf('/'); + result = result.substring(0, ix) + "/factories" + result.substring(ix, result.length() - 5) + "ServiceFactory.java"; + + String output = System.getProperty("swagger.codegen.jaxrs.impl.source"); + if (output != null) { + result = result.replace(apiFileFolder(), implFileFolder(output)); + } + } else if (templateName.endsWith("Service.mustache")) { + int ix = result.lastIndexOf('.'); + result = result.substring(0, ix) + "Service.java"; + } + + return result; + } + + private String implFileFolder(String output) { + return outputFolder + "/" + output + "/" + apiPackage().replace('.', File.separatorChar); + } + + public boolean shouldOverwrite(String filename) { + + return !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java"); + } +} \ 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 new file mode 100644 index 00000000000..28a0abfb6f7 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -0,0 +1,200 @@ +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.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig { + protected String apiVersion = "1.0.0"; + protected int serverPort = 8080; + protected String projectName = "swagger-server"; + + public NodeJSServerCodegen() { + super(); + + // set the output folder here + outputFolder = "generated-code/nodejs"; + + /** + * 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 + ".js"); // 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. + */ + templateDir = "nodejs"; + + /** + * Reserved words. Override this with reserved words specific to your language + */ + reservedWords = new HashSet( + Arrays.asList( + "break", "case", "class", "catch", "const", "continue", "debugger", + "default", "delete", "do", "else", "export", "extends", "finally", + "for", "function", "if", "import", "in", "instanceof", "let", "new", + "return", "super", "switch", "this", "throw", "try", "typeof", "var", + "void", "while", "with", "yield") + ); + + /** + * 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("controller.mustache", + // "controllers", + // "controller.js") + // ); + supportingFiles.add(new SupportingFile("swagger.mustache", + "api", + "swagger.json") + ); + supportingFiles.add(new SupportingFile("index.mustache", + "", + "index.js") + ); + supportingFiles.add(new SupportingFile("package.mustache", + "", + "package.json") + ); + if (System.getProperty("noservice") == null) { + apiTemplateFiles.put( + "service.mustache", // the template to use + "Service.js"); // the extension for each file to write + } + } + + 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 "nodejs"; + } + + /** + * 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 nodejs server library using the swagger-tools 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 Map postProcessOperations(Map objs) { + @SuppressWarnings("unchecked") + Map objectMap = (Map) objs.get("operations"); + @SuppressWarnings("unchecked") + List operations = (List) objectMap.get("operation"); + for (CodegenOperation operation : operations) { + operation.httpMethod = operation.httpMethod.toLowerCase(); + List params = operation.allParams; + if (params != null && params.size() == 0) { + operation.allParams = null; + } + List responses = operation.responses; + if (responses != null) { + for (CodegenResponse resp : responses) { + if ("0".equals(resp.code)) { + resp.code = "default"; + } + } + } + if (operation.examples != null && !operation.examples.isEmpty()) { + // Leave application/json* items only + for (Iterator> it = operation.examples.iterator(); it.hasNext(); ) { + final Map example = it.next(); + final String contentType = example.get("contentType"); + if (contentType == null || !contentType.startsWith("application/json")) { + it.remove(); + } + } + } + } + return objs; + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..f0c0a8ffa80 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -0,0 +1,361 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenProperty; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; + +public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { + protected Set foundationClasses = new HashSet(); + protected String sourceFolder = "client"; + protected String classPrefix = "SWG"; + protected String projectName = "swaggerClient"; + + public ObjcClientCodegen() { + super(); + outputFolder = "generated-code" + File.separator + "objc"; + modelTemplateFiles.put("model-header.mustache", ".h"); + modelTemplateFiles.put("model-body.mustache", ".m"); + apiTemplateFiles.put("api-header.mustache", ".h"); + apiTemplateFiles.put("api-body.mustache", ".m"); + templateDir = "objc"; + modelPackage = ""; + + defaultIncludes = new HashSet( + Arrays.asList( + "bool", + "BOOL", + "int", + "NSString", + "NSObject", + "NSArray", + "NSNumber", + "NSDate", + "NSDictionary", + "NSMutableArray", + "NSMutableDictionary") + ); + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "NSNumber", + "NSString", + "NSObject", + "NSDate", + "bool", + "BOOL") + ); + + // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm + reservedWords = new HashSet( + Arrays.asList( + "auto", "else", "long", "switch", + "break", "enum", "register", "typedef", + "case", "extern", "return", "union", + "char", "float", "short", "unsigned", + "const", "for", "signed", "void", + "continue", "goto", "sizeof", "volatile", + "default", "if", "id", "static", "while", + "do", "int", "struct", "_Packed", + "double", "protocol", "interface", "implementation", + "NSObject", "NSInteger", "NSNumber", "CGFloat", + "property", "nonatomic", "retain", "strong", + "weak", "unsafe_unretained", "readwrite", "readonly" + )); + + typeMapping = new HashMap(); + typeMapping.put("enum", "NSString"); + typeMapping.put("Date", "NSDate"); + typeMapping.put("DateTime", "NSDate"); + typeMapping.put("boolean", "BOOL"); + typeMapping.put("string", "NSString"); + typeMapping.put("integer", "NSNumber"); + typeMapping.put("int", "NSNumber"); + typeMapping.put("float", "NSNumber"); + typeMapping.put("long", "NSNumber"); + typeMapping.put("double", "NSNumber"); + typeMapping.put("array", "NSArray"); + typeMapping.put("map", "NSDictionary"); + typeMapping.put("number", "NSNumber"); + typeMapping.put("List", "NSArray"); + typeMapping.put("object", "NSObject"); + + importMapping = new HashMap(); + + foundationClasses = new HashSet( + Arrays.asList( + "NSNumber", + "NSObject", + "NSString", + "NSDate", + "NSDictionary") + ); + + instantiationTypes.put("array", "NSMutableArray"); + instantiationTypes.put("map", "NSMutableDictionary"); + + cliOptions.add(new CliOption("classPrefix", "prefix for generated classes")); + cliOptions.add(new CliOption("sourceFolder", "source folder for generated code")); + cliOptions.add(new CliOption("projectName", "name of the Xcode project in generated Podfile")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "objc"; + } + + public String getHelp() { + return "Generates an Objective-C client library."; + } + + @Override + public void processOpts() { + super.processOpts(); + + if (additionalProperties.containsKey("sourceFolder")) { + this.setSourceFolder((String) additionalProperties.get("sourceFolder")); + } + + if (additionalProperties.containsKey("classPrefix")) { + this.setClassPrefix((String) additionalProperties.get("classPrefix")); + } + + if (additionalProperties.containsKey("projectName")) { + this.setProjectName((String) additionalProperties.get("projectName")); + } else { + additionalProperties.put("projectName", projectName); + } + + supportingFiles.add(new SupportingFile("SWGObject.h", sourceFolder, "SWGObject.h")); + supportingFiles.add(new SupportingFile("SWGObject.m", sourceFolder, "SWGObject.m")); + supportingFiles.add(new SupportingFile("SWGQueryParamCollection.h", sourceFolder, "SWGQueryParamCollection.h")); + supportingFiles.add(new SupportingFile("SWGQueryParamCollection.m", sourceFolder, "SWGQueryParamCollection.m")); + supportingFiles.add(new SupportingFile("SWGApiClient.h", sourceFolder, "SWGApiClient.h")); + supportingFiles.add(new SupportingFile("SWGApiClient.m", sourceFolder, "SWGApiClient.m")); + supportingFiles.add(new SupportingFile("SWGFile.h", sourceFolder, "SWGFile.h")); + supportingFiles.add(new SupportingFile("SWGFile.m", sourceFolder, "SWGFile.m")); + supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m", sourceFolder, "JSONValueTransformer+ISO8601.m")); + supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", sourceFolder, "JSONValueTransformer+ISO8601.h")); + supportingFiles.add(new SupportingFile("SWGConfiguration-body.mustache", sourceFolder, "SWGConfiguration.m")); + supportingFiles.add(new SupportingFile("SWGConfiguration-header.mustache", sourceFolder, "SWGConfiguration.h")); + supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile")); + } + + @Override + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return instantiationTypes.get("map"); + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return instantiationTypes.get("array"); + } else { + return null; + } + } + + @Override + public String getTypeDeclaration(String name) { + if (languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name)) { + return name; + } else { + return name + "*"; + } + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + String innerType = getSwaggerType(inner); + + // In this codition, type of property p is array of primitive, + // return container type with pointer, e.g. `NSArray*' + if (languageSpecificPrimitives.contains(innerType)) { + return getSwaggerType(p) + "*"; + } + + // In this codition, type of property p is array of model, + // return container type combine inner type with pointer, e.g. `NSArray*' + String innerTypeDeclaration = getTypeDeclaration(inner); + + if (innerTypeDeclaration.endsWith("*")) { + innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1); + } + + return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*"; + } else { + String swaggerType = getSwaggerType(p); + + // In this codition, type of p is objective-c primitive type, e.g. `NSSNumber', + // return type of p with pointer, e.g. `NSNumber*' + if (languageSpecificPrimitives.contains(swaggerType) && + foundationClasses.contains(swaggerType)) { + return swaggerType + "*"; + } + // In this codition, type of p is c primitive type, e.g. `bool', + // return type of p, e.g. `bool' + else if (languageSpecificPrimitives.contains(swaggerType)) { + return swaggerType; + } + // In this codition, type of p is objective-c object type, e.g. `SWGPet', + // return type of p with pointer, e.g. `SWGPet*' + else { + return swaggerType + "*"; + } + } + } + + @Override + public String toModelName(String type) { + type = type.replaceAll("[^0-9a-zA-Z_]", "_"); + + // language build-in classes + if (typeMapping.keySet().contains(type) || + foundationClasses.contains(type) || + importMapping.values().contains(type) || + defaultIncludes.contains(type) || + languageSpecificPrimitives.contains(type)) { + return camelize(type); + } + // custom classes + else { + return classPrefix + camelize(type); + } + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + + @Override + protected void setNonArrayMapProperty(CodegenProperty property, String type) { + super.setNonArrayMapProperty(property, type); + if ("NSDictionary".equals(type)) { + property.setter = "initWithDictionary"; + } else { + property.setter = "initWithValues"; + } + } + + @Override + public String toModelImport(String name) { + if ("".equals(modelPackage())) { + return name; + } else { + return modelPackage() + "." + name; + } + } + + @Override + public String toDefaultValue(Property p) { + return null; + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separator + sourceFolder; + } + + @Override + public String modelFileFolder() { + return outputFolder + File.separator + sourceFolder; + } + + @Override + public String toApiName(String name) { + return classPrefix + camelize(name) + "Api"; + } + + public String toApiFilename(String name) { + return classPrefix + camelize(name) + "Api"; + } + + @Override + public String toVarName(String name) { + // replace non-word characters to `_` + // e.g. `created-at` to `created_at` + name = name.replaceAll("[^a-zA-Z0-9_]", "_"); + + // if it's all upper case, do noting + if (name.matches("^[A-Z_]$")) { + return name; + } + + // camelize (lower first character) the variable name + // e.g. `pet_id` to `petId` + name = camelize(name, true); + + // for reserved word or word starting with number, prepend `_` + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return camelize(operationId, true); + } + + public void setSourceFolder(String sourceFolder) { + this.sourceFolder = sourceFolder; + } + + public void setClassPrefix(String classPrefix) { + this.classPrefix = classPrefix; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } +} 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 new file mode 100644 index 00000000000..1b0da2698e2 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -0,0 +1,208 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; + +public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "SwaggerClient"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-client"; + protected String artifactVersion = "1.0.0"; + + public PerlClientCodegen() { + super(); + modelPackage = File.separatorChar + "Object"; + outputFolder = "generated-code" + File.separatorChar + "perl"; + modelTemplateFiles.put("object.mustache", ".pm"); + apiTemplateFiles.put("api.mustache", ".pm"); + templateDir = "perl"; + + typeMapping.clear(); + languageSpecificPrimitives.clear(); + + reservedWords = new HashSet( + Arrays.asList( + "else", "lock", "qw", + "__END__", "elsif", "lt", "qx", + "__FILE__", "eq", "m", "s", + "__LINE__", "exp", "ne", "sub", + "__PACKAGE__", "for", "no", "tr", + "and", "foreach", "or", "unless", + "cmp", "ge", "package", "until", + "continue", "gt", "q", "while", + "CORE", "if", "qq", "xor", + "do", "le", "qr", "y" + ) + ); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + + languageSpecificPrimitives.add("int"); + languageSpecificPrimitives.add("double"); + languageSpecificPrimitives.add("string"); + languageSpecificPrimitives.add("boolean"); + languageSpecificPrimitives.add("DateTime"); + languageSpecificPrimitives.add("ARRAY"); + languageSpecificPrimitives.add("HASH"); + languageSpecificPrimitives.add("object"); + + typeMapping.put("integer", "int"); + typeMapping.put("long", "int"); + typeMapping.put("float", "double"); + typeMapping.put("double", "double"); + typeMapping.put("boolean", "boolean"); + typeMapping.put("string", "string"); + typeMapping.put("date", "DateTime"); + typeMapping.put("dateTime", "DateTime"); + typeMapping.put("password", "string"); + typeMapping.put("array", "ARRAY"); + typeMapping.put("map", "HASH"); + typeMapping.put("object", "object"); + + supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "ApiClient.pm")); + supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Configuration.pm")); + supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Object/BaseObject.pm")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "perl"; + } + + public String getHelp() { + return "Generates a Perl client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return (outputFolder + "/lib/WWW/" + invokerPackage + apiPackage()).replace('/', File.separatorChar); + } + + public String modelFileFolder() { + return (outputFolder + "/lib/WWW/" + invokerPackage + modelPackage()).replace('/', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return type; + } + } else { + type = swaggerType; + } + if (type == null) { + return null; + } + return type; + } + + public String toDefaultValue(Property p) { + return "null"; + } + + + @Override + public String toVarName(String name) { + // parameter name starting with number won't compile + // need to escape it by appending _ at the beginning + if (name.matches("^[0-9]")) { + name = "_" + name; + } + + // return the name in underscore style + // PhoneNumber => phone_number + return underscore(name); + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // model name cannot use reserved keyword + if (reservedWords.contains(name)) { + escapeReservedWord(name); // e.g. return => _return + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + + @Override + public String toApiFilename(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // e.g. phone_number_api.rb => PhoneNumberApi.rb + return camelize(name) + "Api"; + } + + @Override + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultApi"; + } + // e.g. phone_number_api => PhoneNumberApi + return camelize(name) + "Api"; + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return underscore(operationId); + } + + +} 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 new file mode 100644 index 00000000000..10c03fe4381 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -0,0 +1,190 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; + +public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-client"; + protected String artifactVersion = "1.0.0"; + + public PhpClientCodegen() { + super(); + + invokerPackage = camelize("SwaggerClient"); + + String packagePath = invokerPackage + "-php"; + + modelPackage = packagePath + "/lib/models"; + apiPackage = packagePath + "/lib"; + outputFolder = "generated-code/php"; + modelTemplateFiles.put("model.mustache", ".php"); + apiTemplateFiles.put("api.mustache", ".php"); + templateDir = "php"; + + reservedWords = new HashSet( + Arrays.asList( + "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor") + ); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + + // ref: http://php.net/manual/en/language.types.intro.php + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "boolean", + "int", + "integer", + "double", + "float", + "string", + "object", + "DateTime", + "mixed", + "number") + ); + + instantiationTypes.put("array", "array"); + instantiationTypes.put("map", "map"); + + // ref: https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#data-types + typeMapping = new HashMap(); + typeMapping.put("integer", "int"); + typeMapping.put("long", "int"); + typeMapping.put("float", "float"); + typeMapping.put("double", "double"); + typeMapping.put("string", "string"); + typeMapping.put("byte", "int"); + typeMapping.put("boolean", "boolean"); + typeMapping.put("date", "DateTime"); + typeMapping.put("datetime", "DateTime"); + typeMapping.put("file", "string"); + typeMapping.put("map", "map"); + typeMapping.put("array", "array"); + typeMapping.put("list", "array"); + typeMapping.put("object", "object"); + + supportingFiles.add(new SupportingFile("composer.mustache", packagePath.replace('/', File.separatorChar), "composer.json")); + supportingFiles.add(new SupportingFile("configuration.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "Configuration.php")); + supportingFiles.add(new SupportingFile("ApiClient.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiClient.php")); + supportingFiles.add(new SupportingFile("ApiException.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiException.php")); + supportingFiles.add(new SupportingFile("require.mustache", packagePath.replace('/', File.separatorChar), invokerPackage + ".php")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "php"; + } + + public String getHelp() { + return "Generates a PHP client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return (outputFolder + "/" + apiPackage()).replace('/', File.separatorChar); + } + + public String modelFileFolder() { + return (outputFolder + "/" + modelPackage()).replace('/', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return type; + } else if (instantiationTypes.containsKey(type)) { + return type; + } + } else { + type = swaggerType; + } + if (type == null) { + return null; + } + return toModelName(type); + } + + public String toDefaultValue(Property p) { + return "null"; + } + + + @Override + public String toVarName(String name) { + // parameter name starting with number won't compile + // need to escape it by appending _ at the beginning + if (name.matches("^[0-9]")) { + name = "_" + name; + } + + // return the name in underscore style + // PhoneNumber => phone_number + return underscore(name); + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // model name cannot use reserved keyword + if (reservedWords.contains(name)) { + escapeReservedWord(name); // e.g. return => _return + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java new file mode 100755 index 00000000000..4911ca06850 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java @@ -0,0 +1,210 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; + +public class Python3ClientCodegen extends DefaultCodegen implements CodegenConfig { + String module = "client"; + + public Python3ClientCodegen() { + super(); + outputFolder = "generated-code/python3"; + modelTemplateFiles.put("model.mustache", ".py"); + apiTemplateFiles.put("api.mustache", ".py"); + templateDir = "python3"; + + apiPackage = module; + modelPackage = module + ".models"; + + languageSpecificPrimitives.clear(); + languageSpecificPrimitives.add("int"); + languageSpecificPrimitives.add("float"); + //languageSpecificPrimitives.add("long"); + languageSpecificPrimitives.add("list"); + languageSpecificPrimitives.add("bool"); + languageSpecificPrimitives.add("str"); + languageSpecificPrimitives.add("datetime"); + + typeMapping.clear(); + typeMapping.put("integer", "int"); + typeMapping.put("float", "float"); + typeMapping.put("long", "int"); + typeMapping.put("double", "float"); + typeMapping.put("array", "list"); + typeMapping.put("map", "map"); + typeMapping.put("boolean", "bool"); + typeMapping.put("string", "str"); + typeMapping.put("date", "datetime"); + + // 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")); + + //supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py")); + supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "python3"; + } + + public String getHelp() { + return "Generates a Python3 client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return type; + } + } else { + type = swaggerType; + } + return type; + } + + public String toDefaultValue(Property p) { + // TODO: Support Python def value + return "null"; + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, convert to lower case + if (name.matches("^[A-Z_]*$")) { + name = name.toLowerCase(); + } + + // camelize (lower first character) the variable name + // petId => pet_id + name = underscore(name); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // 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"); + } + + // underscore the model file name + // PhoneNumber.rb => phone_number.rb + return underscore(name); + } + + @Override + public String toApiFilename(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // e.g. PhoneNumberApi.rb => phone_number_api.rb + return underscore(name) + "_api"; + } + + @Override + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultApi"; + } + // e.g. phone_number_api => PhoneNumberApi + return camelize(name) + "Api"; + } + + @Override + public String toApiVarName(String name) { + if (name.length() == 0) { + return "default_api"; + } + return underscore(name) + "_api"; + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return underscore(operationId); + } + +} 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 new file mode 100755 index 00000000000..9553f4ad133 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -0,0 +1,227 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; + +public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String module = "SwaggerPetstore"; + protected String invokerPackage; + protected String eggPackage; + + public PythonClientCodegen() { + super(); + + eggPackage = module + "-python"; + + invokerPackage = eggPackage + File.separatorChar + module; + + outputFolder = "generated-code" + File.separatorChar + "python"; + modelTemplateFiles.put("model.mustache", ".py"); + apiTemplateFiles.put("api.mustache", ".py"); + templateDir = "python"; + + apiPackage = invokerPackage + File.separatorChar + "apis"; + modelPackage = invokerPackage + File.separatorChar + "models"; + + languageSpecificPrimitives.clear(); + languageSpecificPrimitives.add("int"); + languageSpecificPrimitives.add("float"); + languageSpecificPrimitives.add("list"); + languageSpecificPrimitives.add("bool"); + languageSpecificPrimitives.add("str"); + languageSpecificPrimitives.add("datetime"); + + typeMapping.clear(); + typeMapping.put("integer", "int"); + typeMapping.put("float", "float"); + typeMapping.put("long", "int"); + typeMapping.put("double", "float"); + typeMapping.put("array", "list"); + typeMapping.put("map", "map"); + typeMapping.put("boolean", "bool"); + typeMapping.put("string", "str"); + typeMapping.put("date", "datetime"); + + // 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")); + + additionalProperties.put("module", module); + + supportingFiles.add(new SupportingFile("README.mustache", eggPackage, "README.md")); + supportingFiles.add(new SupportingFile("setup.mustache", eggPackage, "setup.py")); + supportingFiles.add(new SupportingFile("api_client.mustache", invokerPackage, "api_client.py")); + supportingFiles.add(new SupportingFile("rest.mustache", invokerPackage, "rest.py")); + supportingFiles.add(new SupportingFile("configuration.mustache", invokerPackage, "configuration.py")); + supportingFiles.add(new SupportingFile("__init__package.mustache", invokerPackage, "__init__.py")); + supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage, "__init__.py")); + supportingFiles.add(new SupportingFile("__init__api.mustache", apiPackage, "__init__.py")); + } + + private static String dropDots(String str) { + return str.replaceAll("\\.", "_"); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "python"; + } + + public String getHelp() { + return "Generates a Python client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separatorChar + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + File.separatorChar + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return type; + } + } else { + type = toModelName(swaggerType); + } + return type; + } + + public String toDefaultValue(Property p) { + // TODO: Support Python def value + return "null"; + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, convert to lower case + if (name.matches("^[A-Z_]*$")) { + name = name.toLowerCase(); + } + + // underscore the variable name + // petId => pet_id + name = underscore(dropDots(name)); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // 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"); + } + + // underscore the model file name + // PhoneNumber => phone_number + return underscore(dropDots(name)); + } + + @Override + public String toApiFilename(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // e.g. PhoneNumberApi.rb => phone_number_api.rb + return underscore(name) + "_api"; + } + + @Override + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultApi"; + } + // e.g. phone_number_api => PhoneNumberApi + return camelize(name) + "Api"; + } + + @Override + public String toApiVarName(String name) { + if (name.length() == 0) { + return "default_api"; + } + return underscore(name) + "_api"; + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return underscore(operationId); + } + +} 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 new file mode 100644 index 00000000000..ff58dbd9440 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java @@ -0,0 +1,324 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +import io.swagger.models.properties.DecimalProperty; +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; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { + protected final String PREFIX = "SWG"; + protected Set foundationClasses = new HashSet(); + // source folder where to write the files + protected String sourceFolder = "client"; + protected String apiVersion = "1.0.0"; + protected Map namespaces = new HashMap(); + protected Set systemIncludes = new HashSet(); + + public Qt5CPPGenerator() { + super(); + + // set the output folder here + outputFolder = "generated-code/qt5cpp"; + + /** + * 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.put( + "model-header.mustache", + ".h"); + + modelTemplateFiles.put( + "model-body.mustache", + ".cpp"); + + /** + * 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( + "api-header.mustache", // the template to use + ".h"); // the extension for each file to write + + apiTemplateFiles.put( + "api-body.mustache", // the template to use + ".cpp"); // 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. + */ + templateDir = "qt5cpp"; + + /** + * Reserved words. Override this with reserved words specific to your language + */ + reservedWords = new HashSet( + Arrays.asList( + "sample1", // replace with static values + "sample2") + ); + + /** + * 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("prefix", PREFIX); + + /** + * Language Specific Primitives. These types will not trigger imports by + * the client generator + */ + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "bool", + "qint32", + "qint64") + ); + + supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h")); + supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp")); + supportingFiles.add(new SupportingFile("HttpRequest.h", sourceFolder, PREFIX + "HttpRequest.h")); + supportingFiles.add(new SupportingFile("HttpRequest.cpp", sourceFolder, PREFIX + "HttpRequest.cpp")); + supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h")); + supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h")); + + super.typeMapping = new HashMap(); + + typeMapping.put("Date", "QDate"); + typeMapping.put("DateTime", "QDateTime"); + typeMapping.put("string", "QString"); + typeMapping.put("integer", "qint32"); + typeMapping.put("long", "qint64"); + typeMapping.put("boolean", "bool"); + typeMapping.put("array", "QList"); + typeMapping.put("map", "QMap"); + typeMapping.put("file", "SWGHttpRequestInputFileElement"); + typeMapping.put("object", PREFIX + "Object"); + + importMapping = new HashMap(); + + importMapping.put("SWGHttpRequestInputFileElement", "#include \"" + PREFIX + "HttpRequest.h\""); + + namespaces = new HashMap(); + + foundationClasses.add("QString"); + + systemIncludes.add("QString"); + systemIncludes.add("QList"); + } + + /** + * Configures the type of generator. + * + * @return the CodegenType for this generator + * @see io.swagger.codegen.CodegenType + */ + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + /** + * 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 "qt5cpp"; + } + + /** + * 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 qt5 C++ client library."; + } + + @Override + public String toModelImport(String name) { + if (namespaces.containsKey(name)) { + return "using " + namespaces.get(name) + ";"; + } else if (systemIncludes.contains(name)) { + return "#include <" + name + ">"; + } + return "#include \"" + name + ".h\""; + } + + /** + * 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 model files. You can use the modelPackage() as defined when the class is + * instantiated + */ + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + /** + * Location to write api files. You can use the apiPackage() as defined when the class is + * instantiated + */ + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + @Override + public String toModelFilename(String name) { + return PREFIX + initialCaps(name); + } + + @Override + public String toApiFilename(String name) { + return PREFIX + initialCaps(name) + "Api"; + } + + /** + * Optional - type declaration. This is a String which is used by the templates to instantiate your + * types. There is typically special handling for different property types + * + * @return a string value used as the `dataType` field for model templates, `returnType` for api templates + */ + @Override + public String getTypeDeclaration(Property p) { + String swaggerType = getSwaggerType(p); + + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">*"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + return getSwaggerType(p) + "*"; + } + if (foundationClasses.contains(swaggerType)) { + return swaggerType + "*"; + } else if (languageSpecificPrimitives.contains(swaggerType)) { + return toModelName(swaggerType); + } else { + return swaggerType + "*"; + } + } + + @Override + public String toDefaultValue(Property p) { + if (p instanceof StringProperty) { + return "new QString(\"\")"; + } else if (p instanceof BooleanProperty) { + return "false"; + } else if (p instanceof DateProperty) { + return "NULL"; + } else if (p instanceof DateTimeProperty) { + return "NULL"; + } else if (p instanceof DoubleProperty) { + return "0.0"; + } else if (p instanceof FloatProperty) { + return "0.0f"; + } else if (p instanceof IntegerProperty) { + return "0"; + } else if (p instanceof LongProperty) { + return "0L"; + } else if (p instanceof DecimalProperty) { + return "0.0"; + } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "new QMap()"; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + if (!languageSpecificPrimitives.contains(inner)) { + inner += "*"; + } + return "new QList<" + inner + ">()"; + } + // else + if (p instanceof RefProperty) { + RefProperty rp = (RefProperty) p; + return "new " + toModelName(rp.getSimpleRef()) + "()"; + } + return "NULL"; + } + + + /** + * Optional - swagger type conversion. This is used to map swagger types in a `Property` into + * either language specific types via `typeMapping` or into complex models if there is not a mapping. + * + * @return a string value of the type or complex model for this property + * @see io.swagger.models.properties.Property + */ + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + if (foundationClasses.contains(type)) { + return type; + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toModelName(String type) { + if (typeMapping.keySet().contains(type) || + typeMapping.values().contains(type) || + importMapping.values().contains(type) || + defaultIncludes.contains(type) || + languageSpecificPrimitives.contains(type)) { + return type; + } else { + return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1); + } + } + + @Override + public String toApiName(String type) { + return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1) + "Api"; + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java new file mode 100644 index 00000000000..e043c68baf9 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java @@ -0,0 +1,202 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +public class RetrofitClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-java-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/java"; + + public RetrofitClientCodegen() { + super(); + outputFolder = "generated-code/java"; + modelTemplateFiles.put("model.mustache", ".java"); + apiTemplateFiles.put("api.mustache", ".java"); + templateDir = "retrofit"; + apiPackage = "io.swagger.client.api"; + modelPackage = "io.swagger.client.model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "continue", "for", "new", "switch", "assert", + "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", + "native", "super", "while") + ); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("service.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ServiceGenerator.java")); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float", + "Object") + ); + instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("map", "HashMap"); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "retrofit"; + } + + public String getHelp() { + return "Generates a Retrofit client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, do nothing + if (name.matches("^[A-Z_]*$")) { + return name; + } + + // camelize (lower first character) the variable name + // pet_id => petId + name = camelize(name, true); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // should be the same as the model name + return toModelName(name); + } + + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + ""; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return camelize(operationId, true); + } + + public Map postProcessOperations(Map objs) { + Map operations = (Map) objs.get("operations"); + if (operations != null) { + List ops = (List) operations.get("operation"); + for (CodegenOperation operation : ops) { + if (operation.hasConsumes == Boolean.TRUE) { + Map firstType = operation.consumes.get(0); + if (firstType != null) { + if ("multipart/form-data".equals(firstType.get("mediaType"))) { + operation.isMultipart = Boolean.TRUE; + } + } + } + if (operation.returnType == null) { + operation.returnType = "Void"; + } + } + } + return objs; + } +} 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 new file mode 100644 index 00000000000..01fe6c6eed4 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -0,0 +1,231 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; + +public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String gemName = "swagger_client"; + protected String moduleName = null; + protected String libFolder = "lib"; + + public RubyClientCodegen() { + super(); + moduleName = generateModuleName(); + modelPackage = gemName + "/models"; + apiPackage = gemName + "/api"; + outputFolder = "generated-code" + File.separatorChar + "ruby"; + modelTemplateFiles.put("model.mustache", ".rb"); + apiTemplateFiles.put("api.mustache", ".rb"); + templateDir = "ruby"; + + typeMapping.clear(); + languageSpecificPrimitives.clear(); + + reservedWords = new HashSet( + Arrays.asList( + "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__", + "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN", + "break", "do", "false", "next", "rescue", "then", "when", "END", "case", + "else", "for", "nil", "retry", "true", "while", "alias", "class", "elsif", + "if", "not", "return", "undef", "yield") + ); + + additionalProperties.put("gemName", gemName); + additionalProperties.put("moduleName", moduleName); + + languageSpecificPrimitives.add("int"); + languageSpecificPrimitives.add("array"); + languageSpecificPrimitives.add("map"); + languageSpecificPrimitives.add("string"); + languageSpecificPrimitives.add("DateTime"); + + typeMapping.put("long", "int"); + typeMapping.put("integer", "int"); + typeMapping.put("Array", "array"); + typeMapping.put("String", "string"); + typeMapping.put("List", "array"); + typeMapping.put("map", "map"); + + String baseFolder = "lib" + File.separatorChar + gemName; + String swaggerFolder = baseFolder + File.separatorChar + "swagger"; + String modelFolder = baseFolder + File.separatorChar + "models"; + supportingFiles.add(new SupportingFile("swagger_client.gemspec.mustache", "", gemName + ".gemspec")); + supportingFiles.add(new SupportingFile("swagger_client.mustache", "lib", gemName + ".rb")); + supportingFiles.add(new SupportingFile("monkey.mustache", baseFolder, "monkey.rb")); + supportingFiles.add(new SupportingFile("swagger.mustache", baseFolder, "swagger.rb")); + supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "request.mustache", swaggerFolder, "request.rb")); + supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "response.mustache", swaggerFolder, "response.rb")); + supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "version.mustache", swaggerFolder, "version.rb")); + supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "configuration.mustache", swaggerFolder, "configuration.rb")); + supportingFiles.add(new SupportingFile("base_object.mustache", modelFolder, "base_object.rb")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "ruby"; + } + + public String getHelp() { + return "Generates a Ruby client library."; + } + + /** + * Generate Ruby module name from the gem name, e.g. use "SwaggerClient" for "swagger_client". + */ + public String generateModuleName() { + return camelize(gemName.replaceAll("[^\\w]+", "_")); + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "api"; + } + + public String modelFileFolder() { + return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "models"; + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return type; + } + } else { + type = swaggerType; + } + if (type == null) { + return null; + } + return type; + } + + public String toDefaultValue(Property p) { + return "null"; + } + + @Override + public String toVarName(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // if it's all uppper case, convert to lower case + if (name.matches("^[A-Z_]*$")) { + name = name.toLowerCase(); + } + + // camelize (lower first character) the variable name + // petId => pet_id + name = underscore(name); + + // for reserved word or word starting with number, append _ + if (reservedWords.contains(name) || name.matches("^\\d.*")) { + name = escapeReservedWord(name); + } + + return name; + } + + @Override + public String toParamName(String name) { + // should be the same as variable name + return toVarName(name); + } + + @Override + public String toModelName(String name) { + // 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"); + } + + // camelize the model name + // phone_number => PhoneNumber + return camelize(name); + } + + @Override + public String toModelFilename(String name) { + // 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"); + } + + // underscore the model file name + // PhoneNumber.rb => phone_number.rb + return underscore(name); + } + + @Override + public String toApiFilename(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); + + // e.g. PhoneNumberApi.rb => phone_number_api.rb + return underscore(name) + "_api"; + } + + @Override + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultApi"; + } + // e.g. phone_number_api => PhoneNumberApi + return camelize(name) + "Api"; + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return underscore(operationId); + } + + @Override + public String toModelImport(String name) { + return modelPackage() + "/" + toModelFilename(name); + } + + @Override + public String toApiImport(String name) { + return apiPackage() + "/" + toApiFilename(name); + } + +} 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 new file mode 100644 index 00000000000..d8c143aad1d --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java @@ -0,0 +1,217 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +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; +import io.swagger.models.properties.StringProperty; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; + +public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-scala-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/scala"; + protected String authScheme = ""; + protected boolean authPreemptive = false; + protected boolean asyncHttpClient = !authScheme.isEmpty(); + + public ScalaClientCodegen() { + super(); + outputFolder = "generated-code/scala"; + modelTemplateFiles.put("model.mustache", ".scala"); + apiTemplateFiles.put("api.mustache", ".scala"); + templateDir = "scala"; + apiPackage = "io.swagger.client.api"; + modelPackage = "io.swagger.client.model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "case", "catch", "class", "def", "do", "else", "extends", + "false", "final", "finally", "for", "forSome", "if", "implicit", + "import", "lazy", "match", "new", "null", "object", "override", "package", + "private", "protected", "return", "sealed", "super", "this", "throw", + "trait", "try", "true", "type", "val", "var", "while", "with", "yield") + ); + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + additionalProperties.put("asyncHttpClient", asyncHttpClient); + additionalProperties.put("authScheme", authScheme); + additionalProperties.put("authPreemptive", authPreemptive); + + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("apiInvoker.mustache", + (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala")); + + importMapping.remove("List"); + importMapping.remove("Set"); + importMapping.remove("Map"); + + importMapping.put("DateTime", "org.joda.time.DateTime"); + importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer"); + + typeMapping = new HashMap(); + typeMapping.put("enum", "NSString"); + typeMapping.put("array", "List"); + typeMapping.put("set", "Set"); + typeMapping.put("boolean", "Boolean"); + typeMapping.put("string", "String"); + typeMapping.put("int", "Int"); + typeMapping.put("long", "Long"); + typeMapping.put("float", "Float"); + typeMapping.put("byte", "Byte"); + typeMapping.put("short", "Short"); + typeMapping.put("char", "Char"); + typeMapping.put("long", "Long"); + typeMapping.put("double", "Double"); + typeMapping.put("object", "Any"); + typeMapping.put("file", "File"); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Int", + "Long", + "Float", + "Object", + "List", + "Map") + ); + instantiationTypes.put("array", "ListBuffer"); + instantiationTypes.put("map", "HashMap"); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "scala"; + } + + public String getHelp() { + return "Generates a Scala client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return instantiationTypes.get("map") + "[String, " + inner + "]"; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return instantiationTypes.get("array") + "[" + inner + "]"; + } else { + return null; + } + } + + public String toDefaultValue(Property p) { + if (p instanceof StringProperty) { + return "null"; + } else if (p instanceof BooleanProperty) { + return "null"; + } else if (p instanceof DateProperty) { + return "null"; + } else if (p instanceof DateTimeProperty) { + return "null"; + } else if (p instanceof DoubleProperty) { + return "null"; + } else if (p instanceof FloatProperty) { + return "null"; + } else if (p instanceof IntegerProperty) { + return "null"; + } else if (p instanceof LongProperty) { + return "null"; + } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "new HashMap[String, " + inner + "]() "; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return "new ListBuffer[" + inner + "]() "; + } else { + return "null"; + } + } + + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + return camelize(operationId, true); + } + +} 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 new file mode 100644 index 00000000000..d6b0f78253a --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java @@ -0,0 +1,187 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/scala"; + + public ScalatraServerCodegen() { + super(); + outputFolder = "generated-code/scalatra"; + modelTemplateFiles.put("model.mustache", ".scala"); + apiTemplateFiles.put("api.mustache", ".scala"); + templateDir = "scalatra"; + apiPackage = "com.wordnik.client.api"; + modelPackage = "com.wordnik.client.model"; + + reservedWords = new HashSet( + Arrays.asList( + "abstract", "continue", "for", "new", "switch", "assert", + "default", "if", "package", "synchronized", "boolean", "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", "long", "strictfp", "volatile", "const", "float", + "native", "super", "while") + ); + + defaultIncludes = new HashSet( + Arrays.asList("double", + "Int", + "Long", + "Float", + "Double", + "char", + "float", + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float", + "List", + "Set", + "Map") + ); + + typeMapping.put("integer", "Int"); + typeMapping.put("long", "Long"); + + additionalProperties.put("appName", "Swagger Sample"); + additionalProperties.put("appName", "Swagger Sample"); + additionalProperties.put("appDescription", "A sample swagger server"); + additionalProperties.put("infoUrl", "http://swagger.io"); + additionalProperties.put("infoEmail", "apiteam@swagger.io"); + additionalProperties.put("licenseInfo", "All rights reserved"); + additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + + supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("build.sbt", "", "build.sbt")); + supportingFiles.add(new SupportingFile("web.xml", "/src/main/webapp/WEB-INF", "web.xml")); + supportingFiles.add(new SupportingFile("JettyMain.scala", sourceFolder, "JettyMain.scala")); + supportingFiles.add(new SupportingFile("Bootstrap.mustache", sourceFolder, "ScalatraBootstrap.scala")); + supportingFiles.add(new SupportingFile("ServletApp.mustache", sourceFolder, "ServletApp.scala")); + supportingFiles.add(new SupportingFile("project/build.properties", "project", "build.properties")); + supportingFiles.add(new SupportingFile("project/plugins.sbt", "project", "plugins.sbt")); + supportingFiles.add(new SupportingFile("sbt", "", "sbt")); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float", + "Object") + ); + instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("map", "HashMap"); + + importMapping = new HashMap(); + importMapping.put("BigDecimal", "java.math.BigDecimal"); + importMapping.put("UUID", "java.util.UUID"); + importMapping.put("File", "java.io.File"); + importMapping.put("Date", "java.util.Date"); + importMapping.put("Timestamp", "java.sql.Timestamp"); + importMapping.put("Map", "java.util.Map"); + importMapping.put("HashMap", "java.util.HashMap"); + importMapping.put("Array", "java.util.List"); + importMapping.put("ArrayList", "java.util.ArrayList"); + importMapping.put("DateTime", "org.joda.time.DateTime"); + importMapping.put("LocalDateTime", "org.joda.time.LocalDateTime"); + importMapping.put("LocalDate", "org.joda.time.LocalDate"); + importMapping.put("LocalTime", "org.joda.time.LocalTime"); + } + + public CodegenType getTag() { + return CodegenType.SERVER; + } + + public String getName() { + return "scalatra"; + } + + public String getHelp() { + return "Generates a Scala server application with Scalatra."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + @Override + public Map postProcessOperations(Map objs) { + Map operations = (Map) objs.get("operations"); + List operationList = (List) operations.get("operation"); + for (CodegenOperation op : operationList) { + op.httpMethod = op.httpMethod.toLowerCase(); + } + return objs; + } + + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java similarity index 77% rename from modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java index 252457758d8..a90533a3614 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -1,13 +1,20 @@ -package com.wordnik.swagger.codegen.languages; +package io.swagger.codegen.languages; -import com.wordnik.swagger.models.Operation; -import com.wordnik.swagger.models.Path; -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Operation; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; -import java.util.*; import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.api"; @@ -19,20 +26,8 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen protected String configPackage = ""; - public CodegenType getTag() { - return CodegenType.SERVER; - } - - public String getName() { - return "spring-mvc"; - } - - public String getHelp() { - return "Generates a Java Spring-MVC Server application using the SpringFox integration."; - } - public SpringMVCServerCodegen() { - super(); + super.processOpts(); outputFolder = "generated-code/javaSpringMVC"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); @@ -50,6 +45,34 @@ public SpringMVCServerCodegen() { additionalProperties.put("apiPackage", apiPackage); additionalProperties.put("configPackage", configPackage); + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float") + ); + } + + public CodegenType getTag() { + return CodegenType.SERVER; + } + + public String getName() { + return "spring-mvc"; + } + + public String getHelp() { + return "Generates a Java Spring-MVC Server application using the SpringFox integration."; + } + + @Override + public void processOpts() { + super.processOpts(); + supportingFiles.clear(); supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); @@ -73,26 +96,15 @@ public SpringMVCServerCodegen() { supportingFiles.add(new SupportingFile("swagger.properties", ("src.main.resources").replace(".", java.io.File.separator), "swagger.properties")); - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float") - ); } @Override public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { + if (p instanceof ArrayProperty) { ArrayProperty ap = (ArrayProperty) p; Property inner = ap.getItems(); return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; - } - else if (p instanceof MapProperty) { + } else if (p instanceof MapProperty) { MapProperty mp = (MapProperty) p; Property inner = mp.getAdditionalProperties(); @@ -104,21 +116,24 @@ else if (p instanceof MapProperty) { @Override public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { String basePath = resourcePath; - if(basePath.startsWith("/")) + if (basePath.startsWith("/")) { basePath = basePath.substring(1); + } int pos = basePath.indexOf("/"); - if(pos > 0) + if (pos > 0) { basePath = basePath.substring(0, pos); + } - if(basePath == "") + if (basePath == "") { basePath = "default"; - else { - if(co.path.startsWith("/" + basePath)) + } else { + if (co.path.startsWith("/" + basePath)) { co.path = co.path.substring(("/" + basePath).length()); + } co.subresourceOperation = !co.path.isEmpty(); } List opList = operations.get(basePath); - if(opList == null) { + if (opList == null) { opList = new ArrayList(); operations.put(basePath, opList); } @@ -127,32 +142,30 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera } public Map postProcessOperations(Map objs) { - Map operations = (Map)objs.get("operations"); - if(operations != null) { + Map operations = (Map) objs.get("operations"); + if (operations != null) { List ops = (List) operations.get("operation"); - for(CodegenOperation operation : ops) { - if(operation.returnType == null) + for (CodegenOperation operation : ops) { + if (operation.returnType == null) { operation.returnType = "Void"; - else if(operation.returnType.startsWith("List")) { + } else if (operation.returnType.startsWith("List")) { String rt = operation.returnType; int end = rt.lastIndexOf(">"); - if(end > 0) { + if (end > 0) { operation.returnType = rt.substring("List<".length(), end); operation.returnContainer = "List"; } - } - else if(operation.returnType.startsWith("Map")) { + } else if (operation.returnType.startsWith("Map")) { String rt = operation.returnType; int end = rt.lastIndexOf(">"); - if(end > 0) { + if (end > 0) { operation.returnType = rt.substring("Map<".length(), end); operation.returnContainer = "Map"; } - } - else if(operation.returnType.startsWith("Set")) { + } else if (operation.returnType.startsWith("Set")) { String rt = operation.returnType; int end = rt.lastIndexOf(">"); - if(end > 0) { + if (end > 0) { operation.returnType = rt.substring("Set<".length(), end); operation.returnContainer = "Set"; } 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 new file mode 100644 index 00000000000..bfee70f1732 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java @@ -0,0 +1,77 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; + +import java.io.File; + +public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig { + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "docs"; + + public StaticDocCodegen() { + super(); + outputFolder = "docs"; + modelTemplateFiles.put("model.mustache", ".html"); + apiTemplateFiles.put("operation.mustache", ".html"); + templateDir = "swagger-static"; + + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + + supportingFiles.add(new SupportingFile("package.mustache", "", "package.json")); + supportingFiles.add(new SupportingFile("main.mustache", "", "main.js")); + supportingFiles.add(new SupportingFile("assets/css/bootstrap-responsive.css", + outputFolder + "/assets/css", "bootstrap-responsive.css")); + supportingFiles.add(new SupportingFile("assets/css/bootstrap.css", + outputFolder + "/assets/css", "bootstrap.css")); + supportingFiles.add(new SupportingFile("assets/css/style.css", + outputFolder + "/assets/css", "style.css")); + supportingFiles.add(new SupportingFile("assets/images/logo.png", + outputFolder + "/assets/images", "logo.png")); + supportingFiles.add(new SupportingFile("assets/js/bootstrap.js", + outputFolder + "/assets/js", "bootstrap.js")); + supportingFiles.add(new SupportingFile("assets/js/jquery-1.8.3.min.js", + 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", + outputFolder, "index.html")); + + instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("map", "HashMap"); + } + + public CodegenType getTag() { + return CodegenType.DOCUMENTATION; + } + + public String getName() { + return "dynamic-html"; + } + + public String getHelp() { + return "Generates a dynamic HTML site."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separator + sourceFolder + File.separator + "operations"; + } + + public String modelFileFolder() { + return outputFolder + File.separator + sourceFolder + File.separator + "models"; + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..8a3244b0097 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java @@ -0,0 +1,104 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Operation; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig { + private static final String ALL_OPERATIONS = ""; + protected String invokerPackage = "io.swagger.client"; + protected String groupId = "io.swagger"; + protected String artifactId = "swagger-client"; + protected String artifactVersion = "1.0.0"; + protected String sourceFolder = "src/main/scala"; + + public StaticHtmlGenerator() { + super(); + outputFolder = "docs"; + templateDir = "htmlDocs"; + + defaultIncludes = new HashSet(); + + additionalProperties.put("appName", "Swagger Sample"); + additionalProperties.put("appDescription", "A sample swagger server"); + additionalProperties.put("infoUrl", "https://helloreverb.com"); + additionalProperties.put("infoEmail", "hello@helloreverb.com"); + additionalProperties.put("licenseInfo", "All rights reserved"); + additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); + additionalProperties.put("invokerPackage", invokerPackage); + additionalProperties.put("groupId", groupId); + additionalProperties.put("artifactId", artifactId); + additionalProperties.put("artifactVersion", artifactVersion); + + supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); + reservedWords = new HashSet(); + + languageSpecificPrimitives = new HashSet(); + importMapping = new HashMap(); + } + + public CodegenType getTag() { + return CodegenType.DOCUMENTATION; + } + + public String getName() { + return "html"; + } + + public String getHelp() { + return "Generates a static HTML file."; + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + + return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public Map postProcessOperations(Map objs) { + Map operations = (Map) objs.get("operations"); + List operationList = (List) operations.get("operation"); + for (CodegenOperation op : operationList) { + op.httpMethod = op.httpMethod.toLowerCase(); + } + return objs; + } + + @Override + public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { + List opList = operations.get(ALL_OPERATIONS); + if (opList == null) { + opList = new ArrayList(); + operations.put(ALL_OPERATIONS, opList); + } + for (CodegenOperation addedOperation : opList) { + if (addedOperation.operationId.equals(co.operationId) && addedOperation.path.equals(co.path) && addedOperation.httpMethod.equals(co.httpMethod)) { + addedOperation.tags.addAll(co.tags); + return; + } + } + opList.add(co); + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..94f6279f46f --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java @@ -0,0 +1,46 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Swagger; +import io.swagger.util.Json; +import org.apache.commons.io.FileUtils; + +import java.io.File; + +public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { + public SwaggerGenerator() { + super(); + templateDir = "swagger"; + outputFolder = "generated-code/swagger"; + + supportingFiles.add(new SupportingFile("README.md", "", "README.md")); + } + + public CodegenType getTag() { + return CodegenType.DOCUMENTATION; + } + + public String getName() { + return "swagger"; + } + + public String getHelp() { + return "Creates a static swagger.json file."; + } + + @Override + public void processSwagger(Swagger swagger) { + String swaggerString = Json.pretty(swagger); + + try { + String outputFile = outputFolder + File.separator + "swagger.json"; + FileUtils.writeStringToFile(new File(outputFile), swaggerString); + System.out.println("wrote file to " + outputFile); + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..35874390e0f --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java @@ -0,0 +1,45 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Swagger; +import io.swagger.util.Yaml; +import org.apache.commons.io.FileUtils; + +import java.io.File; + +public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig { + public SwaggerYamlGenerator() { + super(); + templateDir = "swagger"; + outputFolder = "generated-code/swagger"; + + supportingFiles.add(new SupportingFile("README.md", "", "README.md")); + } + + public CodegenType getTag() { + return CodegenType.DOCUMENTATION; + } + + public String getName() { + return "swagger-yaml"; + } + + public String getHelp() { + return "Creates a static swagger.yaml file."; + } + + @Override + public void processSwagger(Swagger swagger) { + try { + String swaggerString = Yaml.mapper().writeValueAsString(swagger); + String outputFile = outputFolder + File.separator + "swagger.yaml"; + FileUtils.writeStringToFile(new File(outputFile), swaggerString); + System.out.println("wrote file to " + outputFile); + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java new file mode 100644 index 00000000000..2b384f36a7d --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java @@ -0,0 +1,265 @@ +package io.swagger.codegen.languages; + +import com.google.common.base.Predicate; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenProperty; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Model; +import io.swagger.models.Operation; +import io.swagger.models.parameters.HeaderParameter; +import io.swagger.models.parameters.Parameter; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; +import org.apache.commons.lang.StringUtils; + +import javax.annotation.Nullable; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class SwiftGenerator extends DefaultCodegen implements CodegenConfig { + private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}"); + protected String sourceFolder = "Classes/Swaggers"; + + public SwiftGenerator() { + super(); + outputFolder = "generated-code/swift"; + modelTemplateFiles.put("model.mustache", ".swift"); + apiTemplateFiles.put("api.mustache", ".swift"); + templateDir = "swift"; + apiPackage = "/APIs"; + modelPackage = "/Models"; + + // Inject application name + String appName = System.getProperty("appName"); + if (appName == null) { + appName = "SwaggerClient"; + } + additionalProperties.put("projectName", appName); + + // Inject base url override + String basePathOverride = System.getProperty("basePathOverride"); + if (basePathOverride != null) { + additionalProperties.put("basePathOverride", basePathOverride); + } + + sourceFolder = appName + "/" + sourceFolder; + + supportingFiles.add(new SupportingFile("Cartfile.mustache", "", "Cartfile")); + supportingFiles.add(new SupportingFile("APIHelper.mustache", sourceFolder, "APIHelper.swift")); + supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", sourceFolder, "AlamofireImplementations.swift")); + supportingFiles.add(new SupportingFile("Extensions.mustache", sourceFolder, "Extensions.swift")); + supportingFiles.add(new SupportingFile("Models.mustache", sourceFolder, "Models.swift")); + supportingFiles.add(new SupportingFile("APIs.mustache", sourceFolder, "APIs.swift")); + + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "Int", + "Float", + "Double", + "Bool", + "Void", + "String", + "Character") + ); + defaultIncludes = new HashSet( + Arrays.asList( + "NSDate", + "Array", + "Dictionary", + "Set", + "Any", + "Empty", + "AnyObject") + ); + reservedWords = new HashSet( + Arrays.asList( + "class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue", + "false", "dynamic", "extension", "default", "is", "didSet", "func", "do", "nil", "final", "import", "else", + "self", "get", "init", "fallthrough", "Self", "infix", "internal", "for", "super", "inout", "let", "if", + "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol", + "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional", + "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol", + "required", "right", "set", "Type", "unowned", "weak") + ); + + typeMapping = new HashMap(); + typeMapping.put("array", "Array"); + typeMapping.put("List", "Array"); + typeMapping.put("map", "Dictionary"); + typeMapping.put("date", "NSDate"); + typeMapping.put("Date", "NSDate"); + typeMapping.put("DateTime", "NSDate"); + typeMapping.put("boolean", "Bool"); + typeMapping.put("string", "String"); + typeMapping.put("char", "Character"); + typeMapping.put("short", "Int"); + typeMapping.put("int", "Int"); + typeMapping.put("long", "Int"); + typeMapping.put("integer", "Int"); + typeMapping.put("Integer", "Int"); + typeMapping.put("float", "Float"); + typeMapping.put("number", "Double"); + typeMapping.put("double", "Double"); + typeMapping.put("object", "AnyObject"); + typeMapping.put("file", "NSData"); + + importMapping = new HashMap(); + } + + private static String normalizePath(String path) { + StringBuilder builder = new StringBuilder(); + + int cursor = 0; + Matcher matcher = PATH_PARAM_PATTERN.matcher(path); + boolean found = matcher.find(); + while (found) { + String stringBeforeMatch = path.substring(cursor, matcher.start()); + builder.append(stringBeforeMatch); + + String group = matcher.group().substring(1, matcher.group().length() - 1); + group = camelize(group, true); + builder + .append("{") + .append(group) + .append("}"); + + cursor = matcher.end(); + found = matcher.find(); + } + + String stringAfterMatch = path.substring(cursor); + builder.append(stringAfterMatch); + + return builder.toString(); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "swift"; + } + + public String getHelp() { + return "Generates a swift client library."; + } + + @Override + public String escapeReservedWord(String name) { + return "_" + name; // add an underscore to the name + } + + @Override + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + modelPackage().replace('.', File.separatorChar); + } + + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + apiPackage().replace('.', File.separatorChar); + } + + @Override + public String getTypeDeclaration(Property p) { + if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return "[" + getTypeDeclaration(inner) + "]"; + } else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + return "[String:" + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String toDefaultValue(Property p) { + // nil + return null; + } + + @Override + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "[String:" + inner + "]"; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return "[" + inner + "]"; + } + return null; + } + + @Override + public CodegenProperty fromProperty(String name, Property p) { + CodegenProperty codegenProperty = super.fromProperty(name, p); + if (codegenProperty.isEnum) { + List> swiftEnums = new ArrayList>(); + List values = (List) codegenProperty.allowableValues.get("values"); + for (String value : values) { + Map map = new HashMap(); + map.put("enum", StringUtils.capitalize(value)); + map.put("raw", value); + swiftEnums.add(map); + } + codegenProperty.allowableValues.put("values", swiftEnums); + codegenProperty.datatypeWithEnum = + StringUtils.left(codegenProperty.datatypeWithEnum, codegenProperty.datatypeWithEnum.length() - "Enum".length()); + } + return codegenProperty; + } + + @Override + public String toApiName(String name) { + if (name.length() == 0) { + return "DefaultAPI"; + } + return initialCaps(name) + "API"; + } + + @Override + public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map definitions) { + path = normalizePath(path); + List parameters = operation.getParameters(); + parameters = Lists.newArrayList(Iterators.filter(parameters.iterator(), new Predicate() { + @Override + public boolean apply(@Nullable Parameter parameter) { + return !(parameter instanceof HeaderParameter); + } + })); + operation.setParameters(parameters); + return super.fromOperation(path, httpMethod, operation, definitions); + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..34305d7c56f --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java @@ -0,0 +1,277 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateProperty; +import io.swagger.models.properties.DateTimeProperty; +import io.swagger.models.properties.DecimalProperty; +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; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig { + protected static String PREFIX = "Sami"; + protected Set foundationClasses = new HashSet(); + protected String sourceFolder = "client"; + protected Map namespaces = new HashMap(); + + public TizenClientCodegen() { + super(); + outputFolder = "generated-code/tizen"; + modelTemplateFiles.put("model-header.mustache", ".h"); + modelTemplateFiles.put("model-body.mustache", ".cpp"); + apiTemplateFiles.put("api-header.mustache", ".h"); + apiTemplateFiles.put("api-body.mustache", ".cpp"); + templateDir = "tizen"; + modelPackage = ""; + + defaultIncludes = new HashSet( + Arrays.asList( + "bool", + "int", + "long") + ); + languageSpecificPrimitives = new HashSet(); + + additionalProperties().put("prefix", PREFIX); + + reservedWords = new HashSet( + // VERIFY + Arrays.asList( + "void", "char", "short", "int", "void", "char", "short", "int", + "long", "float", "double", "signed", "unsigned", "id", "const", + "volatile", "in", "out", "inout", "bycopy", "byref", "oneway", + "self", "super" + )); + + super.typeMapping = new HashMap(); + + typeMapping.put("Date", "DateTime"); + typeMapping.put("DateTime", "DateTime"); + typeMapping.put("string", "String"); + typeMapping.put("integer", "Integer"); + typeMapping.put("float", "Float"); + typeMapping.put("long", "Long"); + typeMapping.put("boolean", "Boolean"); + typeMapping.put("double", "Double"); + typeMapping.put("array", "IList"); + typeMapping.put("map", "HashMap"); + typeMapping.put("number", "Long"); + typeMapping.put("object", PREFIX + "Object"); + + importMapping = new HashMap(); + + namespaces = new HashMap(); + namespaces.put("DateTime", "Tizen::Base::DateTime"); + namespaces.put("Integer", "Tizen::Base::Integer"); + namespaces.put("Long", "Tizen::Base::Long"); + namespaces.put("Boolean", "Tizen::Base::Boolean"); + namespaces.put("Float", "Tizen::Base::Float"); + namespaces.put("String", "Tizen::Base::String"); + namespaces.put("Double", "Tizen::Base::Double"); + namespaces.put("IList", "Tizen::Base::Collection::IList"); + namespaces.put("HashMap", "Tizen::Base::Collection::HashMap"); + namespaces.put("ArrayList", "Tizen::Base::Collection::ArrayList"); + namespaces.put("JsonNumber", "Tizen::Web::Json"); + namespaces.put("JsonString", "Tizen::Web::Json"); + + foundationClasses = new HashSet( + Arrays.asList( + "String", + "Integer", + "Float") + ); + supportingFiles.clear(); + supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h")); + supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h")); + supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp")); + supportingFiles.add(new SupportingFile("apiclient-header.mustache", sourceFolder, PREFIX + "ApiClient.h")); + supportingFiles.add(new SupportingFile("apiclient-body.mustache", sourceFolder, PREFIX + "ApiClient.cpp")); + supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h")); + supportingFiles.add(new SupportingFile("error-header.mustache", sourceFolder, PREFIX + "Error.h")); + supportingFiles.add(new SupportingFile("error-body.mustache", sourceFolder, PREFIX + "Error.cpp")); + } + + public CodegenType getTag() { + return CodegenType.CLIENT; + } + + public String getName() { + return "tizen"; + } + + public String getHelp() { + return "Generates a Samsung Tizen C++ client library."; + } + + @Override + public String toInstantiationType(Property p) { + if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return instantiationTypes.get("map"); + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return instantiationTypes.get("array"); + } else { + return null; + } + } + + @Override + public String getTypeDeclaration(String name) { + if (languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name)) { + return name; + } else { + return name + "*"; + } + } + + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if (typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if (languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) { + return toModelName(type); + } + } else { + type = swaggerType; + } + return toModelName(type); + } + + @Override + public String getTypeDeclaration(Property p) { + String swaggerType = getSwaggerType(p); + if (languageSpecificPrimitives.contains(swaggerType) && !foundationClasses.contains(swaggerType)) { + return toModelName(swaggerType); + } else { + return swaggerType + "*"; + } + } + + @Override + public String toModelName(String type) { + if (typeMapping.keySet().contains(type) || + typeMapping.values().contains(type) || + foundationClasses.contains(type) || + importMapping.values().contains(type) || + defaultIncludes.contains(type) || + languageSpecificPrimitives.contains(type)) { + return type; + } else { + return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1); + } + } + + @Override + public String toModelImport(String name) { + if (namespaces.containsKey(name)) { + return "using " + namespaces.get(name) + ";"; + } + return "#include \"" + name + ".h\""; + } + + @Override + public String toDefaultValue(Property p) { + if (p instanceof StringProperty) { + return "new String()"; + } else if (p instanceof BooleanProperty) { + return "new Boolean(false)"; + } else if (p instanceof DateProperty) { + return "new DateTime()"; + } else if (p instanceof DateTimeProperty) { + return "new DateTime()"; + } else if (p instanceof DoubleProperty) { + return "new Double()"; + } else if (p instanceof FloatProperty) { + return "new Float()"; + } else if (p instanceof IntegerProperty) { + return "new Integer()"; + } else if (p instanceof LongProperty) { + return "new Long()"; + } else if (p instanceof DecimalProperty) { + return "new Long()"; + } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + String inner = getSwaggerType(ap.getAdditionalProperties()); + return "new HashMap()"; + } else if (p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + String inner = getSwaggerType(ap.getItems()); + return "new ArrayList()"; + } + // else + if (p instanceof RefProperty) { + RefProperty rp = (RefProperty) p; + return "new " + toModelName(rp.getSimpleRef()) + "()"; + } + return "null"; + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separator + sourceFolder; + } + + @Override + public String modelFileFolder() { + return outputFolder + File.separator + sourceFolder; + } + + @Override + public String toModelFilename(String name) { + return PREFIX + initialCaps(name); + } + + @Override + public String toApiName(String name) { + return PREFIX + initialCaps(name) + "Api"; + } + + public String toApiFilename(String name) { + return PREFIX + initialCaps(name) + "Api"; + } + + @Override + public String toVarName(String name) { + String paramName = name.replaceAll("[^a-zA-Z0-9_]", ""); + paramName = Character.toUpperCase(paramName.charAt(0)) + paramName.substring(1); + return "p" + paramName; + } + + public String escapeReservedWord(String name) { + return "_" + name; + } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return$ + if (reservedWords.contains(operationId)) { + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + } + + // add_pet_by_id => addPetById + return camelize(operationId, true); + } + +} diff --git a/modules/swagger-codegen/src/main/resources/Groovy/ApiUtils.mustache b/modules/swagger-codegen/src/main/resources/Groovy/ApiUtils.mustache index 956b834c88c..725f7476afc 100644 --- a/modules/swagger-codegen/src/main/resources/Groovy/ApiUtils.mustache +++ b/modules/swagger-codegen/src/main/resources/Groovy/ApiUtils.mustache @@ -8,43 +8,43 @@ import static java.net.URI.create; class ApiUtils { - def invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, method, container, type) { - def (url, uriPath) = buildUrlAndUriPath(basePath, versionPath, resourcePath) - println "url=$url uriPath=$uriPath" - def http = new HTTPBuilder(url) - http.request( Method.valueOf(method), JSON ) { - uri.path = uriPath - uri.query = queryParams - response.success = { resp, json -> - if (type != null) { - onSuccess(parse(json, container, type)) - } - } - response.failure = { resp -> - onFailure(resp.status, resp.statusLine.reasonPhrase) - } - } - } - - - def buildUrlAndUriPath(basePath, versionPath, resourcePath) { - // HTTPBuilder expects to get as its constructor parameter an URL, - // without any other additions like path, therefore we need to cut the path - // from the basePath as it is represented by swagger APIs - // we use java.net.URI to manipulate the basePath - // then the uriPath will hold the rest of the path - URI baseUri = create(basePath) - def pathOnly = baseUri.getPath() - [basePath-pathOnly, pathOnly+versionPath+resourcePath] - } - - - def parse(object, container, clazz) { - if (container == "List") { - return object.collect {parse(it, "", clazz)} - } else { - return clazz.newInstance(object) - } - } +def invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, method, container, type) { +def (url, uriPath) = buildUrlAndUriPath(basePath, versionPath, resourcePath) +println "url=$url uriPath=$uriPath" +def http = new HTTPBuilder(url) +http.request( Method.valueOf(method), JSON ) { +uri.path = uriPath +uri.query = queryParams +response.success = { resp, json -> +if (type != null) { +onSuccess(parse(json, container, type)) +} +} +response.failure = { resp -> +onFailure(resp.status, resp.statusLine.reasonPhrase) +} +} +} + + +def buildUrlAndUriPath(basePath, versionPath, resourcePath) { +// HTTPBuilder expects to get as its constructor parameter an URL, +// without any other additions like path, therefore we need to cut the path +// from the basePath as it is represented by swagger APIs +// we use java.net.URI to manipulate the basePath +// then the uriPath will hold the rest of the path +URI baseUri = create(basePath) +def pathOnly = baseUri.getPath() +[basePath-pathOnly, pathOnly+versionPath+resourcePath] +} + + +def parse(object, container, clazz) { +if (container == "List") { +return object.collect {parse(it, "", clazz)} +} else { +return clazz.newInstance(object) +} +} } diff --git a/modules/swagger-codegen/src/main/resources/Groovy/api.mustache b/modules/swagger-codegen/src/main/resources/Groovy/api.mustache index 6ff66a84720..8ab77047d4f 100644 --- a/modules/swagger-codegen/src/main/resources/Groovy/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Groovy/api.mustache @@ -1,9 +1,6 @@ package {{package}}; - - - import groovyx.net.http.* import static groovyx.net.http.ContentType.* import static groovyx.net.http.Method.* @@ -17,40 +14,40 @@ import java.util.*; @Mixin(ApiUtils) {{#operations}} -class {{classname}} { + class {{classname}} { String basePath = "{{basePath}}" String versionPath = "/api/v1" - {{#operation}} - def {{nickname}} ({{#allParams}} {{{dataType}}} {{paramName}},{{/allParams}} Closure onSuccess, Closure onFailure) { - // create path and map variables - String resourcePath = "{{path}}" + {{#operation}} + def {{nickname}} ({{#allParams}} {{{dataType}}} {{paramName}},{{/allParams}} Closure onSuccess, Closure onFailure) { + // create path and map variables + String resourcePath = "{{path}}" - // query params - def queryParams = [:] - def headerParams = [:] + // query params + def queryParams = [:] + def headerParams = [:] - {{#requiredParamCount}} - // verify required params are set - if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) { - throw new RuntimeException("missing required params") - } - {{/requiredParamCount}} + {{#requiredParamCount}} + // verify required params are set + if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) { + throw new RuntimeException("missing required params") + } + {{/requiredParamCount}} - {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}}))) - queryParams.put("{{paramName}}", String.valueOf({{paramName}})) - {{/queryParams}} + {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}}))) + queryParams.put("{{paramName}}", String.valueOf({{paramName}})) + {{/queryParams}} - {{#headerParams}}headerParams.put("{{paramName}}", {{paramName}}) - {{/headerParams}} + {{#headerParams}}headerParams.put("{{paramName}}", {{paramName}}) + {{/headerParams}} - invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, - "{{httpMethod}}", "{{returnContainer}}", - {{#returnBaseType}}{{{returnBaseType}}}.class {{/returnBaseType}}{{^returnBaseType}}null {{/returnBaseType}}) + invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, + "{{httpMethod}}", "{{returnContainer}}", + {{#returnBaseType}}{{{returnBaseType}}}.class {{/returnBaseType}}{{^returnBaseType}}null {{/returnBaseType}}) - } - {{/operation}} -} + } + {{/operation}} + } {{/operations}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache index d98f375c61d..ed8599e357b 100644 --- a/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache @@ -6,24 +6,24 @@ archivesBaseName = 'swagger-gen-groovy' version = '0.1' buildscript { - repositories { - maven { url 'http://repo.jfrog.org/artifactory/gradle-plugins' } - } - dependencies { - classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.0.16') - } +repositories { +maven { url 'http://repo.jfrog.org/artifactory/gradle-plugins' } +} +dependencies { +classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.0.16') +} } repositories { - mavenCentral() - mavenLocal() - mavenCentral(artifactUrls: ['http://maven.springframework.org/milestone']) - maven { url "http://$artifactory:8080/artifactory/repo" } +mavenCentral() +mavenLocal() +mavenCentral(artifactUrls: ['http://maven.springframework.org/milestone']) +maven { url "http://$artifactory:8080/artifactory/repo" } } dependencies { - groovy "org.codehaus.groovy:groovy-all:2.0.5" - compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.6' +groovy "org.codehaus.groovy:groovy-all:2.0.5" +compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.6' } diff --git a/modules/swagger-codegen/src/main/resources/Groovy/model.mustache b/modules/swagger-codegen/src/main/resources/Groovy/model.mustache index bc3ca28aaec..6e4843811b2 100644 --- a/modules/swagger-codegen/src/main/resources/Groovy/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Groovy/model.mustache @@ -4,18 +4,18 @@ import groovy.transform.Canonical {{#imports}}import {{import}}; {{/imports}} {{#models}} -{{#model}} -@Canonical -class {{classname}} { - {{#vars}} + {{#model}} + @Canonical + class {{classname}} { + {{#vars}} - {{#description}}/* {{{description}}} */ - {{/description}} - {{{datatype}}} {{name}} = {{{defaultValue}}} - {{/vars}} - + {{#description}}/* {{{description}}} */ + {{/description}} + {{{datatype}}} {{name}} = {{{defaultValue}}} + {{/vars}} -} -{{/model}} + } + + {{/model}} {{/models}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache index 352401ba0d8..cab3d3f2618 100644 --- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache @@ -40,468 +40,482 @@ import {{invokerPackage}}.auth.ApiKeyAuth; import {{invokerPackage}}.auth.OAuth; public class ApiClient { - private Map hostMap = new HashMap(); - private Map defaultHeaderMap = new HashMap(); - private boolean debugging = false; - private String basePath = "{{basePath}}"; +private Map + hostMap = new HashMap +(); +private Map + defaultHeaderMap = new HashMap +(); +private boolean debugging = false; +private String basePath = "{{basePath}}"; + +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 +();{{#authMethods}}{{#isBasic}} + authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}} + authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}} + authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}} +// Prevent the authentications from being modified. +authentications = Collections.unmodifiableMap(authentications); +} - private Map authentications; +public String getBasePath() { +return basePath; +} - private DateFormat dateFormat; +public ApiClient setBasePath(String basePath) { +this.basePath = basePath; +return this; +} - 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"); +/** +* Get authentications (key: authentication name, value: authentication). +*/ +public Map + getAuthentications() { +return authentications; +} - // Use UTC as the default time zone. - this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); +/** +* 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); +} - // Set default User-Agent. - setUserAgent("Java-Swagger"); +/** +* 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!"); +} - // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap();{{#authMethods}}{{#isBasic}} - authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}} - authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}} - authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}} - // 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); - } - } - - /** - * 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; - } - } - - /** - * Deserialize the given JSON string to Java object. - * - * @param json The JSON string - * @param containerType The container type, one of "list", "array" or "" - * @param cls The type of the Java object - * @return The deserialized Java object - */ - public Object deserialize(String json, String containerType, Class cls) throws ApiException { - if(null != containerType) { - containerType = containerType.toLowerCase(); - } - try{ - if("list".equals(containerType) || "array".equals(containerType)) { - JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); - List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); - return response; - } - else if(String.class.equals(cls)) { - if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) - return json.substring(1, json.length() - 2); - else - return json; - } - else { - return JsonUtil.getJsonMapper().readValue(json, cls); - } - } - catch (IOException e) { - throw new ApiException(500, e.getMessage(), null, json); - } - } - - /** - * Serialize the given Java object into JSON string. - */ - public String serialize(Object obj) throws ApiException { - try { - if (obj != null) - return JsonUtil.getJsonMapper().writeValueAsString(obj); - else - return null; - } - catch (Exception e) { - throw new ApiException(500, e.getMessage()); - } - } - - /** - * 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 - * @return The response body in type of string - */ - public String invokeAPI(String path, String method, Map queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException { - updateParamsForAuth(authNames, queryParams, headerParams); - - Client client = getClient(); - - StringBuilder b = new StringBuilder(); - for(String key : queryParams.keySet()) { - String value = queryParams.get(key); - if (value != null){ - if(b.toString().length() == 0) - b.append("?"); - else - b.append("&"); - b.append(escapeString(key)).append("=").append(escapeString(value)); - } - } - String querystring = b.toString(); - - 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)); - } - } - - ClientResponse response = null; - - if("GET".equals(method)) { - response = (ClientResponse) builder.get(ClientResponse.class); - } - else if ("POST".equals(method)) { - if (contentType.startsWith("application/x-www-form-urlencoded")) { - String encodedFormParams = this - .getXWWWFormUrlencodedParams(formParams); - 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)); - } - else if ("PUT".equals(method)) { - if ("application/x-www-form-urlencoded".equals(contentType)) { - String encodedFormParams = this - .getXWWWFormUrlencodedParams(formParams); - response = builder.type(contentType).put(ClientResponse.class, - encodedFormParams); - } else if(body == null) { - response = builder.put(ClientResponse.class, serialize(body)); - } else { - response = builder.type(contentType).put(ClientResponse.class, serialize(body)); - } - } - else if ("DELETE".equals(method)) { - if ("application/x-www-form-urlencoded".equals(contentType)) { - String encodedFormParams = this - .getXWWWFormUrlencodedParams(formParams); - 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)); - } - } - else { - throw new ApiException(500, "unknown method type " + method); - } - - if(response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) { - return null; - } - else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) { - if(response.hasEntity()) { - return (String) response.getEntity(String.class); - } - else { - return ""; - } - } - 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.getClientResponseStatus().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, Map 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 = parameterToString(param.getKey()); - String valueStr = parameterToString(param.getValue()); - - try { - formParamBuilder.append(URLEncoder.encode(keyStr, "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); - } +/** +* 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); +} +} + +/** +* 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; +} +} + +/** +* Deserialize the given JSON string to Java object. +* +* @param json The JSON string +* @param containerType The container type, one of "list", "array" or "" +* @param cls The type of the Java object +* @return The deserialized Java object +*/ +public Object deserialize(String json, String containerType, Class cls) throws ApiException { +if(null != containerType) { +containerType = containerType.toLowerCase(); +} +try{ +if("list".equals(containerType) || "array".equals(containerType)) { +JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); +List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); +return response; +} +else if(String.class.equals(cls)) { +if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) +return json.substring(1, json.length() - 2); +else +return json; +} +else { +return JsonUtil.getJsonMapper().readValue(json, cls); +} +} +catch (IOException e) { +throw new ApiException(500, e.getMessage(), null, json); +} +} + +/** +* Serialize the given Java object into JSON string. +*/ +public String serialize(Object obj) throws ApiException { +try { +if (obj != null) +return JsonUtil.getJsonMapper().writeValueAsString(obj); +else +return null; +} +catch (Exception e) { +throw new ApiException(500, e.getMessage()); +} +} + +/** +* 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 +* @return The response body in type of string +*/ +public String invokeAPI(String path, String method, Map + queryParams, Object body, Map + headerParams, Map + formParams, String accept, String contentType, String[] authNames) throws ApiException { +updateParamsForAuth(authNames, queryParams, headerParams); + +Client client = getClient(); + +StringBuilder b = new StringBuilder(); +for(String key : queryParams.keySet()) { +String value = queryParams.get(key); +if (value != null){ +if(b.toString().length() == 0) +b.append("?"); +else +b.append("&"); +b.append(escapeString(key)).append("=").append(escapeString(value)); +} +} +String querystring = b.toString(); + +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)); +} +} + +ClientResponse response = null; + +if("GET".equals(method)) { +response = (ClientResponse) builder.get(ClientResponse.class); +} +else if ("POST".equals(method)) { +if (contentType.startsWith("application/x-www-form-urlencoded")) { +String encodedFormParams = this +.getXWWWFormUrlencodedParams(formParams); +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)); +} +else if ("PUT".equals(method)) { +if ("application/x-www-form-urlencoded".equals(contentType)) { +String encodedFormParams = this +.getXWWWFormUrlencodedParams(formParams); +response = builder.type(contentType).put(ClientResponse.class, +encodedFormParams); +} else if(body == null) { +response = builder.put(ClientResponse.class, serialize(body)); +} else { +response = builder.type(contentType).put(ClientResponse.class, serialize(body)); +} +} +else if ("DELETE".equals(method)) { +if ("application/x-www-form-urlencoded".equals(contentType)) { +String encodedFormParams = this +.getXWWWFormUrlencodedParams(formParams); +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)); +} +} +else { +throw new ApiException(500, "unknown method type " + method); +} + +if(response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) { +return null; +} +else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) { +if(response.hasEntity()) { +return (String) response.getEntity(String.class); +} +else { +return ""; +} +} +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.getClientResponseStatus().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, Map + 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 = parameterToString(param.getKey()); +String valueStr = parameterToString(param.getValue()); + +try { +formParamBuilder.append(URLEncoder.encode(keyStr, "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/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache index e936b423a91..473840fc0b0 100644 --- a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache @@ -1,21 +1,21 @@ package {{invokerPackage}}; public class Configuration { - private static ApiClient defaultApiClient = new ApiClient(); +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; - } +/** +* 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; - } +/** +* 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/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache b/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache index 29d5f55ecee..1cba673ef29 100644 --- a/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache @@ -8,16 +8,16 @@ import com.fasterxml.jackson.core.JsonGenerator.Feature; import com.fasterxml.jackson.datatype.joda.*; public class JsonUtil { - public static ObjectMapper mapper; +public static ObjectMapper mapper; - static { - mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); - mapper.registerModule(new JodaModule()); - } +static { +mapper = new ObjectMapper(); +mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); +mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); +mapper.registerModule(new JodaModule()); +} - public static ObjectMapper getJsonMapper() { - return mapper; - } +public static ObjectMapper getJsonMapper() { +return mapper; +} } diff --git a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache index 035d6739dce..0add94b988d 100644 --- a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache @@ -1,41 +1,41 @@ package {{invokerPackage}}; 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; - } +/** +* 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 ""; +/** +* 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(); - } +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/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache index 63357afd896..bcc9c5b0aa1 100644 --- a/modules/swagger-codegen/src/main/resources/Java/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache @@ -21,105 +21,111 @@ import java.util.Map; import java.util.HashMap; {{#operations}} -public class {{classname}} { - private ApiClient apiClient; + public class {{classname}} { + private ApiClient apiClient; - public {{classname}}() { + public {{classname}}() { this(Configuration.getDefaultApiClient()); - } + } - public {{classname}}(ApiClient apiClient) { + public {{classname}}(ApiClient apiClient) { this.apiClient = apiClient; - } + } - public ApiClient getApiClient() { + public ApiClient getApiClient() { return apiClient; - } + } - public void setApiClient(ApiClient apiClient) { + public void setApiClient(ApiClient apiClient) { this.apiClient = apiClient; - } - - {{#operation}} - /** - * {{summary}} - * {{notes}} -{{#allParams}} * @param {{paramName}} {{description}} -{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - */ - public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException { - Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - if ({{paramName}} == null) { - throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"); } - {{/required}}{{/allParams}} - - // create path and map variables - String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}} - .replaceAll("\\{" + "{{paramName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - {{#queryParams}}if ({{paramName}} != null) - queryParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); - {{/queryParams}} - - {{#headerParams}}if ({{paramName}} != null) - headerParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); - {{/headerParams}} - - final String[] accepts = { - {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - {{#formParams}}{{#notFile}} - if ({{paramName}} != null) { - hasFields = true; - mp.field("{{baseName}}", apiClient.parameterToString({{paramName}}), MediaType.MULTIPART_FORM_DATA_TYPE); - } - {{/notFile}}{{#isFile}} - if ({{paramName}} != null) { - hasFields = true; - mp.field("{{baseName}}", {{paramName}}.getName()); - mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE)); - } - {{/isFile}}{{/formParams}} - if(hasFields) + + {{#operation}} + /** + * {{summary}} + * {{notes}} + {{#allParams}} * @param {{paramName}} {{description}} + {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + */ + public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException { + Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; + {{#allParams}}{{#required}} + // verify the required parameter '{{paramName}}' is set + if ({{paramName}} == null) { + throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"); + } + {{/required}}{{/allParams}} + + // create path and map variables + String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}} + .replaceAll("\\{" + "{{paramName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; + + // query params + Map + queryParams = new HashMap + (); + Map + headerParams = new HashMap + (); + Map + formParams = new HashMap + (); + + {{#queryParams}}if ({{paramName}} != null) + queryParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{/queryParams}} + + {{#headerParams}}if ({{paramName}} != null) + headerParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{/headerParams}} + + final String[] accepts = { + {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} + }; + final String accept = apiClient.selectHeaderAccept(accepts); + + final String[] contentTypes = { + {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} + }; + final String contentType = apiClient.selectHeaderContentType(contentTypes); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + {{#formParams}}{{#notFile}} + if ({{paramName}} != null) { + hasFields = true; + mp.field("{{baseName}}", apiClient.parameterToString({{paramName}}), MediaType.MULTIPART_FORM_DATA_TYPE); + } + {{/notFile}}{{#isFile}} + if ({{paramName}} != null) { + hasFields = true; + mp.field("{{baseName}}", {{paramName}}.getName()); + mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE)); + } + {{/isFile}}{{/formParams}} + if(hasFields) postBody = mp; - } - else { - {{#formParams}}{{#notFile}}if ({{paramName}} != null) + } + else { + {{#formParams}}{{#notFile}}if ({{paramName}} != null) formParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));{{/notFile}} - {{/formParams}} - } + {{/formParams}} + } - try { - String[] authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; - String response = apiClient.invokeAPI(path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + try { + String[] authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; + String response = apiClient.invokeAPI(path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return {{#returnType}}({{{returnType}}}) apiClient.deserialize(response, "{{returnContainer}}", {{returnBaseType}}.class){{/returnType}}; - } - else { + } + else { return {{#returnType}}null{{/returnType}}; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + {{/operation}} } - } - {{/operation}} -} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache index 9afe96c6ffb..04d8767036c 100644 --- a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache @@ -4,44 +4,52 @@ import java.util.Map; import java.util.List; public class ApiException extends Exception { - private int code = 0; - private String message = null; - private Map> responseHeaders = null; - private String responseBody = null; +private int code = 0; +private String message = null; +private Map +> responseHeaders = null; + private String responseBody = null; - public ApiException() {} + public ApiException() {} - public ApiException(int code, String message) { + 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; - } -} + } + + 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/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache index 65720b958cb..3c6f5ef970a 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache @@ -3,53 +3,55 @@ package {{invokerPackage}}.auth; import java.util.Map; 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(Map queryParams, Map headerParams) { - String value; - if (apiKeyPrefix != null) { - value = apiKeyPrefix + " " + apiKey; - } else { - value = apiKey; - } - if (location == "query") { - queryParams.put(paramName, value); - } else if (location == "header") { - headerParams.put(paramName, value); - } - } +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(Map + queryParams, Map + headerParams) { +String value; +if (apiKeyPrefix != null) { +value = apiKeyPrefix + " " + apiKey; +} else { +value = apiKey; +} +if (location == "query") { +queryParams.put(paramName, value); +} else if (location == "header") { +headerParams.put(paramName, value); +} +} } diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache index 1b2e2bc2fbe..50ec5be52dc 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache @@ -3,6 +3,8 @@ package {{invokerPackage}}.auth; import java.util.Map; public interface Authentication { - /** Apply authentication settings to header and query params. */ - void applyToParams(Map queryParams, Map headerParams); +/** Apply authentication settings to header and query params. */ +void applyToParams(Map + queryParams, Map + headerParams); } diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache index 22a64b1a24e..de8d8864c6a 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache @@ -6,32 +6,34 @@ import java.io.UnsupportedEncodingException; import javax.xml.bind.DatatypeConverter; 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(Map 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); - } - } +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(Map + 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/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache index ef84b8cc05e..98e4be6182b 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache @@ -3,8 +3,10 @@ package {{invokerPackage}}.auth; import java.util.Map; public class OAuth implements Authentication { - @Override - public void applyToParams(Map queryParams, Map headerParams) { - // TODO: support oauth - } +@Override +public void applyToParams(Map + queryParams, Map + headerParams) { +// TODO: support oauth +} } diff --git a/modules/swagger-codegen/src/main/resources/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache index b6135636597..b38008ebc35 100644 --- a/modules/swagger-codegen/src/main/resources/Java/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/model.mustache @@ -3,49 +3,49 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; {{#models}} -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} -@ApiModel(description = "{{{description}}}") -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { - {{#vars}}{{#isEnum}} - public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} - }; - private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} - private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} + {{#model}}{{#description}} + /** + * {{description}} + **/{{/description}} + @ApiModel(description = "{{{description}}}") + public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { + {{#vars}}{{#isEnum}} + public enum {{datatypeWithEnum}} { + {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} + }; + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} + private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} - {{#vars}} - /**{{#description}} - * {{{description}}}{{/description}}{{#minimum}} - * minimum: {{minimum}}{{/minimum}}{{#maximum}} - * maximum: {{maximum}}{{/maximum}} - **/ - @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") - @JsonProperty("{{baseName}}") - public {{{datatypeWithEnum}}} {{getter}}() { - return {{name}}; - } - public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { - this.{{name}} = {{name}}; - } + {{#vars}} + /**{{#description}} + * {{{description}}}{{/description}}{{#minimum}} + * minimum: {{minimum}}{{/minimum}}{{#maximum}} + * maximum: {{maximum}}{{/maximum}} + **/ + @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + @JsonProperty("{{baseName}}") + public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + } + public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { + this.{{name}} = {{name}}; + } - {{/vars}} + {{/vars}} - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class {{classname}} {\n"); {{#parent}}sb.append(" " + super.toString()).append("\n");{{/parent}} {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); {{/vars}}sb.append("}\n"); return sb.toString(); - } -} -{{/model}} + } + } + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache index 9f4c858a8a0..d18fa9284c7 100644 --- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache @@ -1,167 +1,170 @@ - 4.0.0 - {{groupId}} - {{artifactId}} - jar - {{artifactId}} - {{artifactVersion}} - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.sun.jersey - jersey-client - ${jersey-version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey-version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson-version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson-version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.1.5 - - - joda-time - joda-time - ${jodatime-version} - + + 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.sun.jersey + jersey-client + ${jersey-version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey-version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-version} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.1.5 + + + joda-time + joda-time + ${jodatime-version} + - - - junit - junit - ${junit-version} - test - - - - 1.5.3-M1 - 1.18 - 2.4.2 - 2.3 - 1.0.0 - 4.8.1 - + + + junit + junit + ${junit-version} + test + + + + 1.5.0 + 1.18 + 2.4.2 + 2.3 + 1.0.0 + 4.8.1 + diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache index ffab3b1088e..fbb96ab9039 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache @@ -1,9 +1,9 @@ package {{apiPackage}}; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } +private int code; +public ApiException (int code, String msg) { +super(msg); +this.code = code; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache index 68675432c64..123a8734f9f 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache @@ -6,21 +6,21 @@ import javax.servlet.*; import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } +@Override +public void doFilter(ServletRequest request, ServletResponse response, +FilterChain chain) throws IOException, ServletException { +HttpServletResponse res = (HttpServletResponse) response; +res.addHeader("Access-Control-Allow-Origin", "*"); +res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); +res.addHeader("Access-Control-Allow-Headers", "Content-Type"); +chain.doFilter(request, response); +} - @Override - public void destroy() { - } +@Override +public void destroy() { +} - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } +@Override +public void init(FilterConfig filterConfig) throws ServletException { +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache index 94711b26efb..d625431db4d 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache @@ -4,65 +4,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; +public static final int ERROR = 1; +public static final int WARNING = 2; +public static final int INFO = 3; +public static final int OK = 4; +public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } +int code; +String type; +String message; - @XmlTransient - public int getCode() { - return code; - } +public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } +public ApiResponseMessage(int code, String message){ +this.code = code; +switch(code){ +case ERROR: +setType("error"); +break; +case WARNING: +setType("warning"); +break; +case INFO: +setType("info"); +break; +case OK: +setType("ok"); +break; +case TOO_BUSY: +setType("too busy"); +break; +default: +setType("unknown"); +break; +} +this.message = message; +} + +@XmlTransient +public int getCode() { +return code; +} + +public void setCode(int code) { +this.code = code; +} - public String getType() { - return type; - } +public String getType() { +return type; +} - public void setType(String type) { - this.type = type; - } +public void setType(String type) { +this.type = type; +} - public String getMessage() { - return message; - } +public String getMessage() { +return message; +} - public void setMessage(String message) { - this.message = message; - } +public void setMessage(String message) { +this.message = message; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache index 8ab2c99e4f8..499a1d1dcc7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache @@ -1,9 +1,9 @@ package {{apiPackage}}; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } +private int code; +public NotFoundException (int code, String msg) { +super(code, msg); +this.code = code; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/README.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/README.mustache index f8a560b776f..4a80e8480a7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/README.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/README.mustache @@ -1,10 +1,10 @@ # Swagger generated server ## Overview -This server was generated by the [swagger-codegen](https://github.com/wordnik/swagger-codegen) project. By using the -[swagger-spec](https://github.com/wordnik/swagger-core/wiki) from a remote server, you can easily generate a server stub. This +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 scalatra server. This example uses the [scalatra](http://scalatra.org/) framework. To see how to make this your own, look here: -[README](https://github.com/wordnik/swagger-codegen/tree/master/samples/server-generator/scalatra) \ No newline at end of file +[README](https://github.com/swagger-api/swagger-codegen/tree/master/samples/server-generator/scalatra) \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache index a0afd38f634..654d6d64ae9 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache @@ -4,7 +4,7 @@ import {{modelPackage}}.*; import {{package}}.{{classname}}Service; import {{package}}.factories.{{classname}}ServiceFactory; -import com.wordnik.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiParam; import com.sun.jersey.multipart.FormDataParam; @@ -25,28 +25,28 @@ import javax.ws.rs.*; @Path("/{{baseName}}") {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} -@com.wordnik.swagger.annotations.Api(value = "/{{baseName}}", description = "the {{baseName}} API") +@io.swagger.annotations.Api(value = "/{{baseName}}", description = "the {{baseName}} API") {{#operations}} -public class {{classname}} { - - private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}(); - -{{#operation}} - @{{httpMethod}} - {{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}} - {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} - {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} - @com.wordnik.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}) - @com.wordnik.swagger.annotations.ApiResponses(value = { {{#responses}} - @com.wordnik.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}}, - {{/hasMore}}{{/responses}} }) - - public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, - {{/hasMore}}{{/allParams}}) - throws NotFoundException { - return delegate.{{nickname}}({{#allParams}}{{#isFile}}fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}{{#hasMore}},{{/hasMore}}{{/allParams}}); + public class {{classname}} { + + private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}(); + + {{#operation}} + @{{httpMethod}} + {{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}} + {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} + {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} + @io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}) + @io.swagger.annotations.ApiResponses(value = { {{#responses}} + @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}}, + {{/hasMore}}{{/responses}} }) + + public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, + {{/hasMore}}{{/allParams}}) + throws NotFoundException { + return delegate.{{nickname}}({{#allParams}}{{#isFile}}fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}{{#hasMore}},{{/hasMore}}{{/allParams}}); + } + {{/operation}} } -{{/operation}} -} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache index 43e7cd8685c..6bc5dfcb869 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache @@ -19,10 +19,10 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; {{#operations}} -public abstract class {{classname}}Service { - {{#operation}} - public abstract Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) - throws NotFoundException; - {{/operation}} -} + public abstract class {{classname}}Service { + {{#operation}} + public abstract Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) + throws NotFoundException; + {{/operation}} + } {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache index a434311d285..4a7ddfe1237 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache @@ -5,10 +5,10 @@ import {{package}}.impl.{{classname}}ServiceImpl; public class {{classname}}ServiceFactory { - private final static {{classname}}Service service = new {{classname}}ServiceImpl(); +private final static {{classname}}Service service = new {{classname}}ServiceImpl(); - public static {{classname}}Service get{{classname}}() - { - return service; - } +public static {{classname}}Service get{{classname}}() +{ +return service; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache index d49fa4952a2..1a3281118de 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache @@ -19,14 +19,14 @@ import com.sun.jersey.multipart.FormDataParam; import javax.ws.rs.core.Response; {{#operations}} -public class {{classname}}ServiceImpl extends {{classname}}Service { - {{#operation}} - @Override - public Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) - throws NotFoundException { - // do some magic! - return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); - } - {{/operation}} -} + public class {{classname}}ServiceImpl extends {{classname}}Service { + {{#operation}} + @Override + public Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + {{/operation}} + } {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache index ba842165f3d..1af86a79a2f 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache @@ -1,2 +1,2 @@ {{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@FormParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") @FormDataParam("file") InputStream inputStream, - @ApiParam(value = "file detail") @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}} \ No newline at end of file +@ApiParam(value = "file detail") @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache index 98901e392bc..7e0640585bf 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache @@ -3,49 +3,49 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; {{#models}} -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} -@ApiModel(description = "{{{description}}}") -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { - {{#vars}}{{#isEnum}} - public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} - }; - private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} - private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} + {{#model}}{{#description}} + /** + * {{description}} + **/{{/description}} + @ApiModel(description = "{{{description}}}") + public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { + {{#vars}}{{#isEnum}} + public enum {{datatypeWithEnum}} { + {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} + }; + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} + private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} - {{#vars}} - /**{{#description}} - * {{{description}}}{{/description}}{{#minimum}} - * minimum: {{minimum}}{{/minimum}}{{#maximum}} - * maximum: {{maximum}}{{/maximum}} - **/ - @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") - @JsonProperty("{{name}}") - public {{{datatypeWithEnum}}} {{getter}}() { - return {{name}}; - } - public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { - this.{{name}} = {{name}}; - } + {{#vars}} + /**{{#description}} + * {{{description}}}{{/description}}{{#minimum}} + * minimum: {{minimum}}{{/minimum}}{{#maximum}} + * maximum: {{maximum}}{{/maximum}} + **/ + @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + @JsonProperty("{{name}}") + public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + } + public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { + this.{{name}} = {{name}}; + } - {{/vars}} + {{/vars}} - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class {{classname}} {\n"); {{#parent}}sb.append(" " + super.toString()).append("\n");{{/parent}} {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); {{/vars}}sb.append("}\n"); return sb.toString(); - } -} -{{/model}} + } + } + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index 64cfdc0af23..f0f877813ee 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -1,159 +1,161 @@ - - 4.0.0 - {{groupId}} - {{artifactId}} - jar - {{artifactId}} - {{artifactVersion}} - - src/main/java - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty-version} - - - / - - target/${project.artifactId}-${project.version} - 8079 - stopit - - 8080 - 60000 - - - - - start-jetty - pre-integration-test - - start - - - 0 - true - - - - stop-jetty - post-integration-test - - stop - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/gen/java - - - - - - - - - - com.wordnik - swagger-jersey-jaxrs - ${swagger-core-version} - - - org.slf4j - slf4j-log4j12 - ${slf4j-version} - - - com.sun.jersey - jersey-core - ${jersey-version} - - - com.sun.jersey - jersey-json - ${jersey-version} - - - com.sun.jersey - jersey-servlet - ${jersey-version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey-version} - - - com.sun.jersey - jersey-server - ${jersey-version} - + + 4.0.0 + {{groupId}} + {{artifactId}} + jar + {{artifactId}} + {{artifactVersion}} + + src/main/java + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-version} + + + / + + target/${project.artifactId}-${project.version} + 8079 + stopit + + 8080 + 60000 + + + + + start-jetty + pre-integration-test + + start + + + 0 + true + + + + stop-jetty + post-integration-test + + stop + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + + src/gen/java + + + + + + + + + + io.swagger + swagger-jersey-jaxrs + ${swagger-core-version} + + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + + + com.sun.jersey + jersey-core + ${jersey-version} + + + com.sun.jersey + jersey-json + ${jersey-version} + + + com.sun.jersey + jersey-servlet + ${jersey-version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey-version} + + + com.sun.jersey + jersey-server + ${jersey-version} + - - org.scalatest - scalatest_2.9.1 - ${scala-test-version} - test - - - junit - junit - ${junit-version} - test - - - javax.servlet - servlet-api - ${servlet-api-version} - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - - - 1.5.2-M2 - 9.2.9.v20150224 - 1.13 - 1.6.3 - 1.6.1 - 4.8.1 - 2.5 - + + org.scalatest + scalatest_2.9.1 + ${scala-test-version} + test + + + junit + junit + ${junit-version} + test + + + javax.servlet + servlet-api + ${servlet-api-version} + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + + + 1.5.0 + 9.2.9.v20150224 + 1.13 + 1.6.3 + 1.6.1 + 4.8.1 + 2.5 + \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache index 752615b76b7..c98d523dc50 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache @@ -1,54 +1,54 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + > - - jersey - com.sun.jersey.spi.container.servlet.ServletContainer - - com.sun.jersey.config.property.packages - com.wordnik.swagger.jaxrs.json;com.wordnik.swagger.jaxrs.listing;{{apiPackage}} - - - com.sun.jersey.spi.container.ContainerRequestFilters - com.sun.jersey.api.container.filter.PostReplaceFilter - - - com.sun.jersey.api.json.POJOMappingFeature - true - - 1 - + + jersey + com.sun.jersey.spi.container.servlet.ServletContainer + + com.sun.jersey.config.property.packages + io.swagger.jaxrs.json;io.swagger.jaxrs.listing;{{apiPackage}} + + + com.sun.jersey.spi.container.ContainerRequestFilters + com.sun.jersey.api.container.filter.PostReplaceFilter + + + com.sun.jersey.api.json.POJOMappingFeature + true + + 1 + - - DefaultJaxrsConfig - com.wordnik.swagger.jaxrs.config.DefaultJaxrsConfig - - api.version - 1.0.0 - - - swagger.api.title - {{{title}}} - - - swagger.api.basepath - http://localhost:8080 - - 2 - + + DefaultJaxrsConfig + io.swagger.jaxrs.config.DefaultJaxrsConfig + + api.version + 1.0.0 + + + swagger.api.title + {{{title}}} + + + swagger.api.basepath + http://localhost:8080 + + 2 + - - jersey - /* - - - ApiOriginFilter - {{apiPackage}}.ApiOriginFilter - - - ApiOriginFilter - /* - + + jersey + /* + + + ApiOriginFilter + {{apiPackage}}.ApiOriginFilter + + + ApiOriginFilter + /* + diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache index 007a4a75ccf..657aab0e369 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache @@ -5,11 +5,11 @@ import {{modelPackage}}.*; {{#imports}}import {{import}}; {{/imports}} -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -31,23 +31,23 @@ import static org.springframework.http.MediaType.*; @RequestMapping(value = "/{{baseName}}", produces = {APPLICATION_JSON_VALUE}) @Api(value = "/{{baseName}}", description = "the {{baseName}} API") {{#operations}} -public class {{classname}} { - {{#operation}} - - @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}) - @ApiResponses(value = { {{#responses}} - @ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} }) - @RequestMapping(value = "{{path}}", - {{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}} - {{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}} - method = RequestMethod.{{httpMethod}}) - public ResponseEntity<{{returnType}}> {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, - {{/hasMore}}{{/allParams}}) - throws NotFoundException { - // do some magic! - return new ResponseEntity<{{returnType}}>(HttpStatus.OK); - } - - {{/operation}} -} + public class {{classname}} { + {{#operation}} + + @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}) + @ApiResponses(value = { {{#responses}} + @ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} }) + @RequestMapping(value = "{{path}}", + {{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}} + {{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}} + method = RequestMethod.{{httpMethod}}) + public ResponseEntity<{{returnType}}> {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, + {{/hasMore}}{{/allParams}}) + throws NotFoundException { + // do some magic! + return new ResponseEntity<{{returnType}}>(HttpStatus.OK); + } + + {{/operation}} + } {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache index ffab3b1088e..fbb96ab9039 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache @@ -1,9 +1,9 @@ package {{apiPackage}}; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } +private int code; +public ApiException (int code, String msg) { +super(msg); +this.code = code; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache index 68675432c64..123a8734f9f 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache @@ -6,21 +6,21 @@ import javax.servlet.*; import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } +@Override +public void doFilter(ServletRequest request, ServletResponse response, +FilterChain chain) throws IOException, ServletException { +HttpServletResponse res = (HttpServletResponse) response; +res.addHeader("Access-Control-Allow-Origin", "*"); +res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); +res.addHeader("Access-Control-Allow-Headers", "Content-Type"); +chain.doFilter(request, response); +} - @Override - public void destroy() { - } +@Override +public void destroy() { +} - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } +@Override +public void init(FilterConfig filterConfig) throws ServletException { +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache index 94711b26efb..d625431db4d 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache @@ -4,65 +4,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; +public static final int ERROR = 1; +public static final int WARNING = 2; +public static final int INFO = 3; +public static final int OK = 4; +public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } +int code; +String type; +String message; - @XmlTransient - public int getCode() { - return code; - } +public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } +public ApiResponseMessage(int code, String message){ +this.code = code; +switch(code){ +case ERROR: +setType("error"); +break; +case WARNING: +setType("warning"); +break; +case INFO: +setType("info"); +break; +case OK: +setType("ok"); +break; +case TOO_BUSY: +setType("too busy"); +break; +default: +setType("unknown"); +break; +} +this.message = message; +} + +@XmlTransient +public int getCode() { +return code; +} + +public void setCode(int code) { +this.code = code; +} - public String getType() { - return type; - } +public String getType() { +return type; +} - public void setType(String type) { - this.type = type; - } +public void setType(String type) { +this.type = type; +} - public String getMessage() { - return message; - } +public String getMessage() { +return message; +} - public void setMessage(String message) { - this.message = message; - } +public void setMessage(String message) { +this.message = message; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache index 402a684f86a..c2773bc5da6 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache @@ -1,2 +1,2 @@ {{#isFormParam}}{{#notFile}} -@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestPart(value="{{paramName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail{{/isFile}}{{/isFormParam}} \ No newline at end of file + @ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestPart(value="{{paramName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache index 98901e392bc..7e0640585bf 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache @@ -3,49 +3,49 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; {{#models}} -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} -@ApiModel(description = "{{{description}}}") -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { - {{#vars}}{{#isEnum}} - public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} - }; - private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} - private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} + {{#model}}{{#description}} + /** + * {{description}} + **/{{/description}} + @ApiModel(description = "{{{description}}}") + public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { + {{#vars}}{{#isEnum}} + public enum {{datatypeWithEnum}} { + {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} + }; + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} + private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} - {{#vars}} - /**{{#description}} - * {{{description}}}{{/description}}{{#minimum}} - * minimum: {{minimum}}{{/minimum}}{{#maximum}} - * maximum: {{maximum}}{{/maximum}} - **/ - @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") - @JsonProperty("{{name}}") - public {{{datatypeWithEnum}}} {{getter}}() { - return {{name}}; - } - public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { - this.{{name}} = {{name}}; - } + {{#vars}} + /**{{#description}} + * {{{description}}}{{/description}}{{#minimum}} + * minimum: {{minimum}}{{/minimum}}{{#maximum}} + * maximum: {{maximum}}{{/maximum}} + **/ + @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + @JsonProperty("{{name}}") + public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + } + public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { + this.{{name}} = {{name}}; + } - {{/vars}} + {{/vars}} - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class {{classname}} {\n"); {{#parent}}sb.append(" " + super.toString()).append("\n");{{/parent}} {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); {{/vars}}sb.append("}\n"); return sb.toString(); - } -} -{{/model}} + } + } + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache index 8ab2c99e4f8..499a1d1dcc7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache @@ -1,9 +1,9 @@ package {{apiPackage}}; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } +private int code; +public NotFoundException (int code, String msg) { +super(code, msg); +this.code = code; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache index fc15f492fdf..a6fe9f9a298 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache @@ -1,229 +1,232 @@ - - 4.0.0 - {{groupId}} - {{artifactId}} - jar - {{artifactId}} - {{artifactVersion}} - - src/main/java - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty-version} - - - {{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}} - - target/${project.artifactId}-${project-version} - ${project.basedir}/conf/jetty/webdefault.xml - 8079 - stopit - - 8002 - 60000 - - - - - start-jetty - pre-integration-test - - start - - - 0 - true - - - - stop-jetty - post-integration-test - - stop - - - - - - com.googlecode.maven-download-plugin - download-maven-plugin - 1.2.1 - - - swagger-ui - - wget - - - https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz - true - ${project.build.directory} - - - - - - maven-resources-plugin - 2.6 - - - copy-resources - validate - - copy-resources - - - target/${project.artifactId}-${project.version} - - - ${project.build.directory}/swagger-ui-${swagger-ui-version}/dist - true - - index.html - - - - - - - - - - - - com.wordnik - swagger-jersey-jaxrs - ${swagger-core-version} - - - org.slf4j - slf4j-log4j12 - ${slf4j-version} - - - com.sun.jersey - jersey-core - ${jersey-version} - - - com.sun.jersey - jersey-json - ${jersey-version} - - - com.sun.jersey - jersey-servlet - ${jersey-version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey-version} - - - com.sun.jersey - jersey-server - ${jersey-version} - + + 4.0.0 + {{groupId}} + {{artifactId}} + jar + {{artifactId}} + {{artifactVersion}} + + src/main/java + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-version} + + + {{^contextPath}} + /{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}} + + target/${project.artifactId}-${project-version} + ${project.basedir}/conf/jetty/webdefault.xml + 8079 + stopit + + 8002 + 60000 + + + + + start-jetty + pre-integration-test + + start + + + 0 + true + + + + stop-jetty + post-integration-test + + stop + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.2.1 + + + swagger-ui + + wget + + + https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz + true + ${project.build.directory} + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + target/${project.artifactId}-${project.version} + + + ${project.build.directory}/swagger-ui-${swagger-ui-version}/dist + + true + + index.html + + + + + + + + + + + + io.swagger + swagger-jersey-jaxrs + ${swagger-core-version} + + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + + + com.sun.jersey + jersey-core + ${jersey-version} + + + com.sun.jersey + jersey-json + ${jersey-version} + + + com.sun.jersey + jersey-servlet + ${jersey-version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey-version} + + + com.sun.jersey + jersey-server + ${jersey-version} + - - - org.springframework - spring-core - ${spring-version} - - - org.springframework - spring-webmvc - ${spring-version} - - - org.springframework - spring-web - ${spring-version} - + + + org.springframework + spring-core + ${spring-version} + + + org.springframework + spring-webmvc + ${spring-version} + + + org.springframework + spring-web + ${spring-version} + - - - io.springfox - springfox-core - ${springfox-version} - - - io.springfox - springfox-spi - ${springfox-version} - - - io.springfox - springfox-spring-web - ${springfox-version} - - - io.springfox - springfox-swagger2 - ${springfox-version} - - - io.springfox - springfox-swagger-ui - ${springfox-version} - + + + io.springfox + springfox-core + ${springfox-version} + + + io.springfox + springfox-spi + ${springfox-version} + + + io.springfox + springfox-spring-web + ${springfox-version} + + + io.springfox + springfox-swagger2 + ${springfox-version} + + + io.springfox + springfox-swagger-ui + ${springfox-version} + - - org.scalatest - scalatest_2.9.1 - ${scala-test-version} - test - - - junit - junit - ${junit-version} - test - - - javax.servlet - servlet-api - ${servlet-api-version} - - - - - jcenter-snapshots - jcenter - http://oss.jfrog.org/artifactory/oss-snapshot-local/ - - - - 1.5.3-M1-SNAPSHOT - 9.2.9.v20150224 - 2.1.0-M2 - 1.13 - 1.6.3 - 1.6.1 - 4.8.1 - 2.5 - 2.0.0-SNAPSHOT - 4.0.9.RELEASE - + + org.scalatest + scalatest_2.9.1 + ${scala-test-version} + test + + + junit + junit + ${junit-version} + test + + + javax.servlet + servlet-api + ${servlet-api-version} + + + + + jcenter-snapshots + jcenter + http://oss.jfrog.org/artifactory/oss-snapshot-local/ + + + + 1.5.0 + 9.2.9.v20150224 + 2.1.0-M2 + 1.13 + 1.6.3 + 1.6.1 + 4.8.1 + 2.5 + 2.0.0-SNAPSHOT + 4.0.9.RELEASE + \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache index b33ee7fc994..9542585a694 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache @@ -19,22 +19,22 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @PropertySource("classpath:swagger.properties") @Import(SwaggerUiConfiguration.class) public class SwaggerConfig { - @Bean - ApiInfo apiInfo() { - ApiInfo apiInfo = new ApiInfo( - "{{appName}}", - "{{{appDescription}}}", - "{{appVersion}}", - "{{infoUrl}}", - "{{infoEmail}}", - "{{licenseInfo}}", - "{{licenseUrl}}" ); - return apiInfo; - } +@Bean +ApiInfo apiInfo() { +ApiInfo apiInfo = new ApiInfo( +"{{appName}}", +"{{{appDescription}}}", +"{{appVersion}}", +"{{infoUrl}}", +"{{infoEmail}}", +"{{licenseInfo}}", +"{{licenseUrl}}" ); +return apiInfo; +} - @Bean - public Docket customImplementation(){ - return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()); - } +@Bean +public Docket customImplementation(){ +return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()); +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache index 652dc310358..78b0705f6c1 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache @@ -9,38 +9,38 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter @Configuration @EnableWebMvc public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter { - private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" }; - - private static final String[] CLASSPATH_RESOURCE_LOCATIONS = { - "classpath:/META-INF/resources/", "classpath:/resources/", - "classpath:/static/", "classpath:/public/" }; - - private static final String[] RESOURCE_LOCATIONS; - static { - RESOURCE_LOCATIONS = new String[CLASSPATH_RESOURCE_LOCATIONS.length - + SERVLET_RESOURCE_LOCATIONS.length]; - System.arraycopy(SERVLET_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, 0, - SERVLET_RESOURCE_LOCATIONS.length); - System.arraycopy(CLASSPATH_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, - SERVLET_RESOURCE_LOCATIONS.length, CLASSPATH_RESOURCE_LOCATIONS.length); - } - - private static final String[] STATIC_INDEX_HTML_RESOURCES; - static { - STATIC_INDEX_HTML_RESOURCES = new String[RESOURCE_LOCATIONS.length]; - for (int i = 0; i < STATIC_INDEX_HTML_RESOURCES.length; i++) { - STATIC_INDEX_HTML_RESOURCES[i] = RESOURCE_LOCATIONS[i] + "index.html"; - } - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - if (!registry.hasMappingForPattern("/webjars/**")) { - registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - } - if (!registry.hasMappingForPattern("/**")) { - registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS); - } - } +private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" }; + +private static final String[] CLASSPATH_RESOURCE_LOCATIONS = { +"classpath:/META-INF/resources/", "classpath:/resources/", +"classpath:/static/", "classpath:/public/" }; + +private static final String[] RESOURCE_LOCATIONS; +static { +RESOURCE_LOCATIONS = new String[CLASSPATH_RESOURCE_LOCATIONS.length ++ SERVLET_RESOURCE_LOCATIONS.length]; +System.arraycopy(SERVLET_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, 0, +SERVLET_RESOURCE_LOCATIONS.length); +System.arraycopy(CLASSPATH_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, +SERVLET_RESOURCE_LOCATIONS.length, CLASSPATH_RESOURCE_LOCATIONS.length); +} + +private static final String[] STATIC_INDEX_HTML_RESOURCES; +static { +STATIC_INDEX_HTML_RESOURCES = new String[RESOURCE_LOCATIONS.length]; +for (int i = 0; i < STATIC_INDEX_HTML_RESOURCES.length; i++) { +STATIC_INDEX_HTML_RESOURCES[i] = RESOURCE_LOCATIONS[i] + "index.html"; +} +} + +@Override +public void addResourceHandlers(ResourceHandlerRegistry registry) { +if (!registry.hasMappingForPattern("/webjars/**")) { +registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); +} +if (!registry.hasMappingForPattern("/**")) { +registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS); +} +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache index 6910ad11b76..1a2c1bb094c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache @@ -4,18 +4,18 @@ import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatche public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer { - @Override - protected Class[] getRootConfigClasses() { - return new Class[] { SwaggerConfig.class }; - } +@Override +protected Class[] getRootConfigClasses() { +return new Class[] { SwaggerConfig.class }; +} - @Override - protected Class[] getServletConfigClasses() { - return new Class[] { WebMvcConfiguration.class }; - } +@Override +protected Class[] getServletConfigClasses() { +return new Class[] { WebMvcConfiguration.class }; +} - @Override - protected String[] getServletMappings() { - return new String[] { "/" }; - } +@Override +protected String[] getServletMappings() { +return new String[] { "/" }; +} } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache index 03904e51e79..67ec632ab85 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache @@ -4,8 +4,8 @@ import org.springframework.web.servlet.config.annotation.DefaultServletHandlerCo import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; public class WebMvcConfiguration extends WebMvcConfigurationSupport { - @Override - public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { - configurer.enable(); - } +@Override +public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { +configurer.enable(); +} } diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig deleted file mode 100644 index 4dec8a51df5..00000000000 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig +++ /dev/null @@ -1,24 +0,0 @@ -com.wordnik.swagger.codegen.languages.AndroidClientCodegen -com.wordnik.swagger.codegen.languages.AsyncScalaClientCodegen -com.wordnik.swagger.codegen.languages.CSharpClientCodegen -com.wordnik.swagger.codegen.languages.JavaClientCodegen -com.wordnik.swagger.codegen.languages.JaxRSServerCodegen -com.wordnik.swagger.codegen.languages.NodeJSServerCodegen -com.wordnik.swagger.codegen.languages.ObjcClientCodegen -com.wordnik.swagger.codegen.languages.PerlClientCodegen -com.wordnik.swagger.codegen.languages.PhpClientCodegen -com.wordnik.swagger.codegen.languages.PythonClientCodegen -com.wordnik.swagger.codegen.languages.Python3ClientCodegen -com.wordnik.swagger.codegen.languages.Qt5CPPGenerator -com.wordnik.swagger.codegen.languages.RetrofitClientCodegen -com.wordnik.swagger.codegen.languages.RubyClientCodegen -com.wordnik.swagger.codegen.languages.ScalaClientCodegen -com.wordnik.swagger.codegen.languages.ScalatraServerCodegen -com.wordnik.swagger.codegen.languages.SpringMVCServerCodegen -com.wordnik.swagger.codegen.languages.StaticDocCodegen -com.wordnik.swagger.codegen.languages.StaticHtmlGenerator -com.wordnik.swagger.codegen.languages.SwaggerGenerator -com.wordnik.swagger.codegen.languages.SwaggerYamlGenerator -com.wordnik.swagger.codegen.languages.SwiftGenerator -com.wordnik.swagger.codegen.languages.TizenClientCodegen -com.wordnik.swagger.codegen.languages.AkkaScalaClientCodegen 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 new file mode 100644 index 00000000000..8bbdbc8d140 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -0,0 +1,24 @@ +io.swagger.codegen.languages.AndroidClientCodegen +io.swagger.codegen.languages.AsyncScalaClientCodegen +io.swagger.codegen.languages.CSharpClientCodegen +io.swagger.codegen.languages.JavaClientCodegen +io.swagger.codegen.languages.JaxRSServerCodegen +io.swagger.codegen.languages.NodeJSServerCodegen +io.swagger.codegen.languages.ObjcClientCodegen +io.swagger.codegen.languages.PerlClientCodegen +io.swagger.codegen.languages.PhpClientCodegen +io.swagger.codegen.languages.PythonClientCodegen +io.swagger.codegen.languages.Python3ClientCodegen +io.swagger.codegen.languages.Qt5CPPGenerator +io.swagger.codegen.languages.RetrofitClientCodegen +io.swagger.codegen.languages.RubyClientCodegen +io.swagger.codegen.languages.ScalaClientCodegen +io.swagger.codegen.languages.ScalatraServerCodegen +io.swagger.codegen.languages.SpringMVCServerCodegen +io.swagger.codegen.languages.StaticDocCodegen +io.swagger.codegen.languages.StaticHtmlGenerator +io.swagger.codegen.languages.SwaggerGenerator +io.swagger.codegen.languages.SwaggerYamlGenerator +io.swagger.codegen.languages.SwiftGenerator +io.swagger.codegen.languages.TizenClientCodegen +io.swagger.codegen.languages.AkkaScalaClientCodegen diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/methodParameters.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/methodParameters.mustache index 3e1ab33f665..6394c664668 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/methodParameters.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/methodParameters.mustache @@ -1 +1 @@ -{{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{/required}}{{^required}}{{#isContainer}}{{dataType}}{{/isContainer}}{{^isContainer}}Option[{{dataType}}]{{/isContainer}}{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}{{^required}}{{^isContainer}} = None{{/isContainer}}{{/required}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#authMethods.0}})(implicit {{#authMethods}}{{#isApiKey}}apiKey: ApiKeyValue{{/isApiKey}}{{#isBasic}}basicAuth: BasicCredentials{{/isBasic}}{{#hasMore}}, {{/hasMore}}{{/authMethods}}{{/authMethods.0}} \ No newline at end of file +{{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{/required}}{{^required}}{{#isContainer}}{{dataType}}{{/isContainer}}{{^isContainer}}Option[{{dataType}}]{{/isContainer}}{{/required}}{{^defaultValue}}{{^required}}{{^isContainer}} = None{{/isContainer}}{{/required}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#authMethods.0}})(implicit {{#authMethods}}{{#isApiKey}}apiKey: ApiKeyValue{{/isApiKey}}{{#isBasic}}basicAuth: BasicCredentials{{/isBasic}}{{#hasMore}}, {{/hasMore}}{{/authMethods}}{{/authMethods.0}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache index 0d65c135957..eb24f77c072 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache @@ -162,7 +162,7 @@ ${scala-version} - com.wordnik + io.swagger swagger-core ${swagger-core-version} @@ -217,7 +217,7 @@ 2.3.9 1.2 2.2 - 1.5.0-M1 + 1.5.0 1.0.0 4.8.1 diff --git a/modules/swagger-codegen/src/main/resources/android-java/api.mustache b/modules/swagger-codegen/src/main/resources/android-java/api.mustache index ed9538c1594..22fe28f32f3 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/api.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/api.mustache @@ -18,97 +18,103 @@ import java.util.HashMap; import java.io.File; {{#operations}} -public class {{classname}} { - String basePath = "{{basePath}}"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); + public class {{classname}} { + String basePath = "{{basePath}}"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); - public void addHeader(String key, String value) { + public void addHeader(String key, String value) { getInvoker().addDefaultHeader(key, value); - } + } - public ApiInvoker getInvoker() { + public ApiInvoker getInvoker() { return apiInvoker; - } + } - public void setBasePath(String basePath) { + public void setBasePath(String basePath) { this.basePath = basePath; - } + } - public String getBasePath() { + public String getBasePath() { return basePath; - } - - {{#operation}} - /** - * {{summary}} - * {{notes}} -{{#allParams}} * @param {{paramName}} {{description}} -{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - */ - public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException { - Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - if ({{paramName}} == null) { - throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"); - } - {{/required}}{{/allParams}} - - // create path and map variables - String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{paramName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}}; - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - {{#queryParams}}if ({{paramName}} != null) - queryParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}})); - {{/queryParams}} - - {{#headerParams}}headerParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}})); - {{/headerParams}} - - String[] contentTypes = { - {{#consumes}}"{{mediaType}}"{{#hasMore}},{{/hasMore}}{{/consumes}} - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - {{#formParams}}{{#notFile}} - if ({{paramName}} != null) { - builder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8); - } - {{/notFile}}{{#isFile}} - if ({{paramName}} != null) { - builder.addBinaryBody("{{baseName}}", {{paramName}}); - } - {{/isFile}}{{/formParams}} - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - {{#formParams}}{{#notFile}}formParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));{{/notFile}} - {{/formParams}} } - try { - String response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + {{#operation}} + /** + * {{summary}} + * {{notes}} + {{#allParams}} * @param {{paramName}} {{description}} + {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + */ + public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException { + Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; + {{#allParams}}{{#required}} + // verify the required parameter '{{paramName}}' is set + if ({{paramName}} == null) { + throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"); + } + {{/required}}{{/allParams}} + + // create path and map variables + String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{paramName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}}; + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + {{#queryParams}}if ({{paramName}} != null) + queryParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}})); + {{/queryParams}} + + {{#headerParams}}headerParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}})); + {{/headerParams}} + + String[] contentTypes = { + {{#consumes}}"{{mediaType}}"{{#hasMore}},{{/hasMore}}{{/consumes}} + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + {{#formParams}}{{#notFile}} + if ({{paramName}} != null) { + builder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8); + } + {{/notFile}}{{#isFile}} + if ({{paramName}} != null) { + builder.addBinaryBody("{{baseName}}", {{paramName}}); + } + {{/isFile}}{{/formParams}} + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + {{#formParams}}{{#notFile}}formParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));{{/notFile}} + {{/formParams}} + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return {{#returnType}}({{{returnType}}}) ApiInvoker.deserialize(response, "{{returnContainer}}", {{returnBaseType}}.class){{/returnType}}; - } - else { + } + else { return {{#returnType}}null{{/returnType}}; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + {{/operation}} } - } - {{/operation}} -} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiException.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiException.mustache index a6bcba75b7c..7510bb078c5 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/apiException.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/apiException.mustache @@ -1,29 +1,29 @@ package {{invokerPackage}}; public class ApiException extends Exception { - int code = 0; - String message = null; +int code = 0; +String message = null; - public ApiException() {} +public ApiException() {} - public ApiException(int code, String message) { - this.code = code; - this.message = message; - } +public ApiException(int code, String message) { +this.code = code; +this.message = message; +} - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } +public int getCode() { +return code; +} + +public void setCode(int code) { +this.code = code; +} + +public String getMessage() { +return message; +} + +public void setMessage(String message) { +this.message = message; +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache index e759f8264a4..7250f3463df 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache @@ -52,338 +52,345 @@ import javax.net.ssl.X509TrustManager; import com.google.gson.JsonParseException; public class ApiInvoker { - private static ApiInvoker INSTANCE = new ApiInvoker(); - private Map defaultHeaderMap = new HashMap(); - - private HttpClient client = null; - - private boolean ignoreSSLCertificates = false; - - private ClientConnectionManager ignoreSSLConnectionManager; - - /** Content type "text/plain" with UTF-8 encoding. */ - public static final ContentType TEXT_PLAIN_UTF8 = ContentType.create("text/plain", Consts.UTF_8); - - /** - * ISO 8601 date time format. - * @see https://en.wikipedia.org/wiki/ISO_8601 - */ - public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - - /** - * ISO 8601 date format. - * @see https://en.wikipedia.org/wiki/ISO_8601 - */ - public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); - - static { - // Use UTC as the default time zone. - DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - - // Set default User-Agent. - setUserAgent("Android-Java-Swagger"); - } - - public static void setUserAgent(String userAgent) { - INSTANCE.addDefaultHeader("User-Agent", userAgent); - } - - public static Date parseDateTime(String str) { - try { - return DATE_TIME_FORMAT.parse(str); - } catch (java.text.ParseException e) { - throw new RuntimeException(e); - } - } - - public static Date parseDate(String str) { - try { - return DATE_FORMAT.parse(str); - } catch (java.text.ParseException e) { - throw new RuntimeException(e); - } - } - - public static String formatDateTime(Date datetime) { - return DATE_TIME_FORMAT.format(datetime); - } - - public static String formatDate(Date date) { - return DATE_FORMAT.format(date); - } - - public static String parameterToString(Object param) { - if (param == null) { - return ""; - } else if (param instanceof Date) { - return formatDateTime((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); - } - } - - public ApiInvoker() { - initConnectionManager(); - } - - public static ApiInvoker getInstance() { - return INSTANCE; - } - - public void ignoreSSLCertificates(boolean ignoreSSLCertificates) { - this.ignoreSSLCertificates = ignoreSSLCertificates; - } - - public void addDefaultHeader(String key, String value) { - defaultHeaderMap.put(key, value); - } - - public String escapeString(String str) { - return str; - } - - public static Object deserialize(String json, String containerType, Class cls) throws ApiException { - try{ - if("list".equalsIgnoreCase(containerType) || "array".equalsIgnoreCase(containerType)) { - return JsonUtil.deserializeToList(json, cls); - } - else if(String.class.equals(cls)) { - if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) - return json.substring(1, json.length() - 2); - else - return json; - } - else { - return JsonUtil.deserializeToObject(json, cls); - } - } - catch (JsonParseException e) { - throw new ApiException(500, e.getMessage()); - } - } - - public static String serialize(Object obj) throws ApiException { - try { - if (obj != null) - return JsonUtil.serialize(obj); - else - return null; - } - catch (Exception e) { - throw new ApiException(500, e.getMessage()); - } - } - - public String invokeAPI(String host, String path, String method, Map queryParams, Object body, Map headerParams, Map formParams, String contentType) throws ApiException { - HttpClient client = getClient(host); - - StringBuilder b = new StringBuilder(); - for(String key : queryParams.keySet()) { - String value = queryParams.get(key); - if (value != null){ - if(b.toString().length() == 0) - b.append("?"); - else - b.append("&"); - b.append(escapeString(key)).append("=").append(escapeString(value)); - } - } - String url = host + path + b.toString(); - - HashMap headers = new HashMap(); - - for(String key : headerParams.keySet()) { - headers.put(key, headerParams.get(key)); - } - - for(String key : defaultHeaderMap.keySet()) { - if(!headerParams.containsKey(key)) { - headers.put(key, defaultHeaderMap.get(key)); - } - } - headers.put("Accept", "application/json"); - - // URL encoded string from form parameters - String formParamStr = null; - - // for form data - if ("application/x-www-form-urlencoded".equals(contentType)) { - StringBuilder formParamBuilder = new StringBuilder(); - - // encode the form params - for (String key : formParams.keySet()) { - String value = formParams.get(key); - if (value != null && !"".equals(value.trim())) { - if (formParamBuilder.length() > 0) { - formParamBuilder.append("&"); - } - try { - formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8")); - } - catch (Exception e) { - // move on to next - } - } - } - formParamStr = formParamBuilder.toString(); - } - - HttpResponse response = null; - try { - if ("GET".equals(method)) { - HttpGet get = new HttpGet(url); - get.addHeader("Accept", "application/json"); - for(String key : headers.keySet()) { - get.setHeader(key, headers.get(key)); - } - response = client.execute(get); - } - else if ("POST".equals(method)) { - HttpPost post = new HttpPost(url); - if (formParamStr != null) { - post.setHeader("Content-Type", contentType); - post.setEntity(new StringEntity(formParamStr, "UTF-8")); - } else if (body != null) { - if (body instanceof HttpEntity) { - // this is for file uploading - post.setEntity((HttpEntity) body); - } else { - post.setHeader("Content-Type", contentType); - post.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - } - for(String key : headers.keySet()) { - post.setHeader(key, headers.get(key)); - } - response = client.execute(post); - } - else if ("PUT".equals(method)) { - HttpPut put = new HttpPut(url); - if (formParamStr != null) { - put.setHeader("Content-Type", contentType); - put.setEntity(new StringEntity(formParamStr, "UTF-8")); - } else if (body != null) { - put.setHeader("Content-Type", contentType); - put.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - for(String key : headers.keySet()) { - put.setHeader(key, headers.get(key)); - } - response = client.execute(put); - } - else if ("DELETE".equals(method)) { - HttpDelete delete = new HttpDelete(url); - for(String key : headers.keySet()) { - delete.setHeader(key, headers.get(key)); - } - response = client.execute(delete); - } - else if ("PATCH".equals(method)) { - HttpPatch patch = new HttpPatch(url); - if (formParamStr != null) { - patch.setHeader("Content-Type", contentType); - patch.setEntity(new StringEntity(formParamStr, "UTF-8")); - } else if (body != null) { - patch.setHeader("Content-Type", contentType); - patch.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - for(String key : headers.keySet()) { - patch.setHeader(key, headers.get(key)); - } - response = client.execute(patch); - } - - int code = response.getStatusLine().getStatusCode(); - String responseString = null; - if(code == 204) - responseString = ""; - else if(code >= 200 && code < 300) { - if(response.getEntity() != null) { - HttpEntity resEntity = response.getEntity(); - responseString = EntityUtils.toString(resEntity); - } - return responseString; - } - else { - if(response.getEntity() != null) { - HttpEntity resEntity = response.getEntity(); - responseString = EntityUtils.toString(resEntity); - } - else - responseString = "no data"; - } - throw new ApiException(code, responseString); - } - catch(IOException e) { - throw new ApiException(500, e.getMessage()); - } - } - - private HttpClient getClient(String host) { - if (client == null) { - if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) { - // Trust self signed certificates - client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams()); - } else { - client = new DefaultHttpClient(); - } - } - return client; - } - - private void initConnectionManager() { - try { - final SSLContext sslContext = SSLContext.getInstance("SSL"); - - // set up a TrustManager that trusts everything - TrustManager[] trustManagers = new TrustManager[] { - new X509TrustManager() { - public X509Certificate[] getAcceptedIssuers() { - return null; - } - public void checkClientTrusted(X509Certificate[] certs, String authType) {} - public void checkServerTrusted(X509Certificate[] certs, String authType) {} - }}; - - sslContext.init(null, trustManagers, new SecureRandom()); - - SSLSocketFactory sf = new SSLSocketFactory((KeyStore)null) { - private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory(); - - public Socket createSocket(Socket socket, String host, int port, boolean autoClose) - throws IOException, UnknownHostException { - return sslFactory.createSocket(socket, host, port, autoClose); - } - - public Socket createSocket() throws IOException { - return sslFactory.createSocket(); - } - }; - - sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); - Scheme httpsScheme = new Scheme("https", sf, 443); - SchemeRegistry schemeRegistry = new SchemeRegistry(); - schemeRegistry.register(httpsScheme); - schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); - - ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry); - } catch (NoSuchAlgorithmException e) { - // This will only be thrown if SSL isn't available for some reason. - } catch (KeyManagementException e) { - // This might be thrown when passing a key into init(), but no key is being passed. - } catch (GeneralSecurityException e) { - // This catches anything else that might go wrong. - // If anything goes wrong we default to the standard connection manager. - } - } +private static ApiInvoker INSTANCE = new ApiInvoker(); +private Map + defaultHeaderMap = new HashMap +(); + +private HttpClient client = null; + +private boolean ignoreSSLCertificates = false; + +private ClientConnectionManager ignoreSSLConnectionManager; + +/** Content type "text/plain" with UTF-8 encoding. */ +public static final ContentType TEXT_PLAIN_UTF8 = ContentType.create("text/plain", Consts.UTF_8); + +/** +* ISO 8601 date time format. +* @see https://en.wikipedia.org/wiki/ISO_8601 +*/ +public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + +/** +* ISO 8601 date format. +* @see https://en.wikipedia.org/wiki/ISO_8601 +*/ +public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); + +static { +// Use UTC as the default time zone. +DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); +DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + +// Set default User-Agent. +setUserAgent("Android-Java-Swagger"); +} + +public static void setUserAgent(String userAgent) { +INSTANCE.addDefaultHeader("User-Agent", userAgent); +} + +public static Date parseDateTime(String str) { +try { +return DATE_TIME_FORMAT.parse(str); +} catch (java.text.ParseException e) { +throw new RuntimeException(e); +} +} + +public static Date parseDate(String str) { +try { +return DATE_FORMAT.parse(str); +} catch (java.text.ParseException e) { +throw new RuntimeException(e); +} +} + +public static String formatDateTime(Date datetime) { +return DATE_TIME_FORMAT.format(datetime); +} + +public static String formatDate(Date date) { +return DATE_FORMAT.format(date); +} + +public static String parameterToString(Object param) { +if (param == null) { +return ""; +} else if (param instanceof Date) { +return formatDateTime((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); +} +} + +public ApiInvoker() { +initConnectionManager(); +} + +public static ApiInvoker getInstance() { +return INSTANCE; +} + +public void ignoreSSLCertificates(boolean ignoreSSLCertificates) { +this.ignoreSSLCertificates = ignoreSSLCertificates; +} + +public void addDefaultHeader(String key, String value) { +defaultHeaderMap.put(key, value); +} + +public String escapeString(String str) { +return str; +} + +public static Object deserialize(String json, String containerType, Class cls) throws ApiException { +try{ +if("list".equalsIgnoreCase(containerType) || "array".equalsIgnoreCase(containerType)) { +return JsonUtil.deserializeToList(json, cls); +} +else if(String.class.equals(cls)) { +if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) +return json.substring(1, json.length() - 2); +else +return json; +} +else { +return JsonUtil.deserializeToObject(json, cls); +} +} +catch (JsonParseException e) { +throw new ApiException(500, e.getMessage()); +} +} + +public static String serialize(Object obj) throws ApiException { +try { +if (obj != null) +return JsonUtil.serialize(obj); +else +return null; +} +catch (Exception e) { +throw new ApiException(500, e.getMessage()); +} +} + +public String invokeAPI(String host, String path, String method, Map + queryParams, Object body, Map + headerParams, Map + formParams, String contentType) throws ApiException { +HttpClient client = getClient(host); + +StringBuilder b = new StringBuilder(); +for(String key : queryParams.keySet()) { +String value = queryParams.get(key); +if (value != null){ +if(b.toString().length() == 0) +b.append("?"); +else +b.append("&"); +b.append(escapeString(key)).append("=").append(escapeString(value)); +} +} +String url = host + path + b.toString(); + +HashMap + headers = new HashMap +(); + +for(String key : headerParams.keySet()) { +headers.put(key, headerParams.get(key)); +} + +for(String key : defaultHeaderMap.keySet()) { +if(!headerParams.containsKey(key)) { +headers.put(key, defaultHeaderMap.get(key)); +} +} +headers.put("Accept", "application/json"); + +// URL encoded string from form parameters +String formParamStr = null; + +// for form data +if ("application/x-www-form-urlencoded".equals(contentType)) { +StringBuilder formParamBuilder = new StringBuilder(); + +// encode the form params +for (String key : formParams.keySet()) { +String value = formParams.get(key); +if (value != null && !"".equals(value.trim())) { +if (formParamBuilder.length() > 0) { +formParamBuilder.append("&"); +} +try { +formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8")); +} +catch (Exception e) { +// move on to next +} +} +} +formParamStr = formParamBuilder.toString(); +} + +HttpResponse response = null; +try { +if ("GET".equals(method)) { +HttpGet get = new HttpGet(url); +get.addHeader("Accept", "application/json"); +for(String key : headers.keySet()) { +get.setHeader(key, headers.get(key)); +} +response = client.execute(get); +} +else if ("POST".equals(method)) { +HttpPost post = new HttpPost(url); +if (formParamStr != null) { +post.setHeader("Content-Type", contentType); +post.setEntity(new StringEntity(formParamStr, "UTF-8")); +} else if (body != null) { +if (body instanceof HttpEntity) { +// this is for file uploading +post.setEntity((HttpEntity) body); +} else { +post.setHeader("Content-Type", contentType); +post.setEntity(new StringEntity(serialize(body), "UTF-8")); +} +} +for(String key : headers.keySet()) { +post.setHeader(key, headers.get(key)); +} +response = client.execute(post); +} +else if ("PUT".equals(method)) { +HttpPut put = new HttpPut(url); +if (formParamStr != null) { +put.setHeader("Content-Type", contentType); +put.setEntity(new StringEntity(formParamStr, "UTF-8")); +} else if (body != null) { +put.setHeader("Content-Type", contentType); +put.setEntity(new StringEntity(serialize(body), "UTF-8")); +} +for(String key : headers.keySet()) { +put.setHeader(key, headers.get(key)); +} +response = client.execute(put); +} +else if ("DELETE".equals(method)) { +HttpDelete delete = new HttpDelete(url); +for(String key : headers.keySet()) { +delete.setHeader(key, headers.get(key)); +} +response = client.execute(delete); +} +else if ("PATCH".equals(method)) { +HttpPatch patch = new HttpPatch(url); +if (formParamStr != null) { +patch.setHeader("Content-Type", contentType); +patch.setEntity(new StringEntity(formParamStr, "UTF-8")); +} else if (body != null) { +patch.setHeader("Content-Type", contentType); +patch.setEntity(new StringEntity(serialize(body), "UTF-8")); +} +for(String key : headers.keySet()) { +patch.setHeader(key, headers.get(key)); +} +response = client.execute(patch); +} + +int code = response.getStatusLine().getStatusCode(); +String responseString = null; +if(code == 204) +responseString = ""; +else if(code >= 200 && code < 300) { +if(response.getEntity() != null) { +HttpEntity resEntity = response.getEntity(); +responseString = EntityUtils.toString(resEntity); +} +return responseString; +} +else { +if(response.getEntity() != null) { +HttpEntity resEntity = response.getEntity(); +responseString = EntityUtils.toString(resEntity); +} +else +responseString = "no data"; +} +throw new ApiException(code, responseString); +} +catch(IOException e) { +throw new ApiException(500, e.getMessage()); +} +} + +private HttpClient getClient(String host) { +if (client == null) { +if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) { +// Trust self signed certificates +client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams()); +} else { +client = new DefaultHttpClient(); +} +} +return client; +} + +private void initConnectionManager() { +try { +final SSLContext sslContext = SSLContext.getInstance("SSL"); + +// set up a TrustManager that trusts everything +TrustManager[] trustManagers = new TrustManager[] { +new X509TrustManager() { +public X509Certificate[] getAcceptedIssuers() { +return null; +} +public void checkClientTrusted(X509Certificate[] certs, String authType) {} +public void checkServerTrusted(X509Certificate[] certs, String authType) {} +}}; + +sslContext.init(null, trustManagers, new SecureRandom()); + +SSLSocketFactory sf = new SSLSocketFactory((KeyStore)null) { +private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory(); + +public Socket createSocket(Socket socket, String host, int port, boolean autoClose) +throws IOException, UnknownHostException { +return sslFactory.createSocket(socket, host, port, autoClose); +} + +public Socket createSocket() throws IOException { +return sslFactory.createSocket(); +} +}; + +sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); +Scheme httpsScheme = new Scheme("https", sf, 443); +SchemeRegistry schemeRegistry = new SchemeRegistry(); +schemeRegistry.register(httpsScheme); +schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); + +ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry); +} catch (NoSuchAlgorithmException e) { +// This will only be thrown if SSL isn't available for some reason. +} catch (KeyManagementException e) { +// This might be thrown when passing a key into init(), but no key is being passed. +} catch (GeneralSecurityException e) { +// This catches anything else that might go wrong. +// If anything goes wrong we default to the standard connection manager. +} +} } diff --git a/modules/swagger-codegen/src/main/resources/android-java/build.mustache b/modules/swagger-codegen/src/main/resources/android-java/build.mustache index 66fcef2a371..ec30a79812c 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/build.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/build.mustache @@ -1,93 +1,93 @@ {{#useAndroidMavenGradlePlugin}} -group = '{{groupId}}' -project.version = '{{artifactVersion}}' + group = '{{groupId}}' + project.version = '{{artifactVersion}}' {{/useAndroidMavenGradlePlugin}} buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:1.2.2' - {{#useAndroidMavenGradlePlugin}} - classpath 'com.github.dcendents:android-maven-plugin:1.2' - {{/useAndroidMavenGradlePlugin}} - } +repositories { +jcenter() +} +dependencies { +classpath 'com.android.tools.build:gradle:1.2.2' +{{#useAndroidMavenGradlePlugin}} + classpath 'com.github.dcendents:android-maven-plugin:1.2' +{{/useAndroidMavenGradlePlugin}} +} } allprojects { - repositories { - jcenter() - } +repositories { +jcenter() +} } apply plugin: 'com.android.library' {{#useAndroidMavenGradlePlugin}} -apply plugin: 'com.github.dcendents.android-maven' + apply plugin: 'com.github.dcendents.android-maven' {{/useAndroidMavenGradlePlugin}} android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } +compileSdkVersion 22 +buildToolsVersion '22.0.0' +defaultConfig { +minSdkVersion 14 +targetSdkVersion 22 +} - // 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) - } - } - } +// 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) +} +} +} } ext { - swagger_annotations_version = "1.5.3-M1" - gson_version = "2.3.1" - httpclient_version = "4.3.3" - junit_version = "4.8.1" +swagger_annotations_version = "1.5.0" +gson_version = "2.3.1" +httpclient_version = "4.3.3" +junit_version = "4.8.1" } dependencies { - compile "com.wordnik:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.gson:gson:$gson_version" - compile "org.apache.httpcomponents:httpcore:$httpclient_version" - compile "org.apache.httpcomponents:httpclient:$httpclient_version" - compile ("org.apache.httpcomponents:httpcore:$httpclient_version") { - exclude(group: 'org.apache.httpcomponents', module: 'httpclient') - } - compile ("org.apache.httpcomponents:httpmime:$httpclient_version") { - exclude(group: 'org.apache.httpcomponents', module: 'httpclient') - } - testCompile "junit:junit:$junit_version" +compile "io.swagger:swagger-annotations:$swagger_annotations_version" +compile "com.google.code.gson:gson:$gson_version" +compile "org.apache.httpcomponents:httpcore:$httpclient_version" +compile "org.apache.httpcomponents:httpclient:$httpclient_version" +compile ("org.apache.httpcomponents:httpcore:$httpclient_version") { +exclude(group: 'org.apache.httpcomponents', module: 'httpclient') +} +compile ("org.apache.httpcomponents:httpmime:$httpclient_version") { +exclude(group: 'org.apache.httpcomponents', module: 'httpclient') +} +testCompile "junit:junit:$junit_version" } 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); - } +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); +} } {{#useAndroidMavenGradlePlugin}} -task sourcesJar(type: Jar) { + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' -} + } -artifacts { + artifacts { archives sourcesJar -} + } {{/useAndroidMavenGradlePlugin}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/android-java/httpPatch.mustache b/modules/swagger-codegen/src/main/resources/android-java/httpPatch.mustache index 55cec2f1279..72b9ec2e42b 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/httpPatch.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/httpPatch.mustache @@ -3,14 +3,14 @@ package {{invokerPackage}}; import org.apache.http.client.methods.*; public class HttpPatch extends HttpPost { - public static final String METHOD_PATCH = "PATCH"; +public static final String METHOD_PATCH = "PATCH"; - public HttpPatch(final String url) { - super(url); - } +public HttpPatch(final String url) { +super(url); +} - @Override - public String getMethod() { - return METHOD_PATCH; - } +@Override +public String getMethod() { +return METHOD_PATCH; +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/android-java/jsonUtil.mustache b/modules/swagger-codegen/src/main/resources/android-java/jsonUtil.mustache index ae8d18d3731..fb88b7f701c 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/jsonUtil.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/jsonUtil.mustache @@ -8,48 +8,55 @@ import java.util.List; import {{modelPackage}}.*; public class JsonUtil { - public static GsonBuilder gsonBuilder; +public static GsonBuilder gsonBuilder; - static { - gsonBuilder = new GsonBuilder(); - gsonBuilder.serializeNulls(); - gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - } +static { +gsonBuilder = new GsonBuilder(); +gsonBuilder.serializeNulls(); +gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); +} - public static Gson getGson() { - return gsonBuilder.create(); - } +public static Gson getGson() { +return gsonBuilder.create(); +} - public static String serialize(Object obj){ - return getGson().toJson(obj); - } +public static String serialize(Object obj){ +return getGson().toJson(obj); +} - public static T deserializeToList(String jsonString, Class cls){ +public static + T deserializeToList(String jsonString, Class cls){ return getGson().fromJson(jsonString, getListTypeForDeserialization(cls)); - } - - public static T deserializeToObject(String jsonString, Class cls){ - return getGson().fromJson(jsonString, getTypeForDeserialization(cls)); - } - - public static Type getListTypeForDeserialization(Class cls) { - String className = cls.getSimpleName(); - {{#models}}{{#model}} - if ("{{classname}}".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - {{/model}}{{/models}} - return new TypeToken>(){}.getType(); - } - - public static Type getTypeForDeserialization(Class cls) { - String className = cls.getSimpleName(); - {{#models}}{{#model}} - if ("{{classname}}".equalsIgnoreCase(className)) { - return new TypeToken<{{classname}}>(){}.getType(); } - {{/model}}{{/models}} - return new TypeToken(){}.getType(); - } -}; + public static + T deserializeToObject(String jsonString, Class cls){ + return getGson().fromJson(jsonString, getTypeForDeserialization(cls)); + } + + public static Type getListTypeForDeserialization(Class cls) { + String className = cls.getSimpleName(); + {{#models}}{{#model}} + if ("{{classname}}".equalsIgnoreCase(className)) { + return new TypeToken + >(){}.getType(); + } + {{/model}}{{/models}} + return new TypeToken + >(){}.getType(); + } + + public static Type getTypeForDeserialization(Class cls) { + String className = cls.getSimpleName(); + {{#models}}{{#model}} + if ("{{classname}}".equalsIgnoreCase(className)) { + return new TypeToken<{{classname}}>(){}.getType(); + } + {{/model}}{{/models}} + return new TypeToken + (){}.getType(); + } + + }; diff --git a/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache b/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache index 165749c3cc4..b36579739f9 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache @@ -1,3 +1,3 @@ - + diff --git a/modules/swagger-codegen/src/main/resources/android-java/model.mustache b/modules/swagger-codegen/src/main/resources/android-java/model.mustache index 0090e74d0dc..411cd69f71a 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/model.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/model.mustache @@ -3,50 +3,50 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; {{#models}} -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} -@ApiModel(description = "{{{description}}}") -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { - {{#vars}}{{#isEnum}} - public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} - }; - @SerializedName("{{baseName}}") - private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} - @SerializedName("{{baseName}}") - private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} + {{#model}}{{#description}} + /** + * {{description}} + **/{{/description}} + @ApiModel(description = "{{{description}}}") + public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { + {{#vars}}{{#isEnum}} + public enum {{datatypeWithEnum}} { + {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} + }; + @SerializedName("{{baseName}}") + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} + @SerializedName("{{baseName}}") + private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/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}} + /**{{#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}} + {{/vars}} - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class {{classname}} {\n"); {{#parent}}sb.append(" " + super.toString()).append("\n");{{/parent}} {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); {{/vars}}sb.append("}\n"); return sb.toString(); - } -} -{{/model}} + } + } + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache b/modules/swagger-codegen/src/main/resources/android-java/pom.mustache index 807df48234d..b78ae08991b 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/pom.mustache @@ -1,155 +1,158 @@ - 4.0.0 - {{groupId}} - {{artifactId}} - jar - {{artifactId}} - {{artifactVersion}} - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.google.code.gson - gson - ${gson-version} - - - org.apache.httpcomponents - httpclient - ${httpclient-version} - compile - - - org.apache.httpcomponents - httpmime - ${httpclient-version} - compile - + + 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.google.code.gson + gson + ${gson-version} + + + org.apache.httpcomponents + httpclient + ${httpclient-version} + compile + + + org.apache.httpcomponents + httpmime + ${httpclient-version} + compile + - - - junit - junit - ${junit-version} - test - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - - 1.5.1-M1 - 2.3.1 - 4.8.1 - 1.0.0 - 4.8.1 - 4.3.6 - + + + junit + junit + ${junit-version} + test + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + + 1.5.0 + 2.3.1 + 4.8.1 + 1.0.0 + 4.8.1 + 4.3.6 + \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache index 603676e22bc..bb0d9694aaf 100644 --- a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache +++ b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache @@ -2,43 +2,43 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} -import com.wordnik.swagger.client._ +import io.swagger.client._ import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import collection.mutable {{#operations}} -class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { + class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { - {{#operation}} - def {{nickname}}({{#allParams}}{{#optional}}{{paramName}}: Option[{{dataType}}] = {{#defaultValue}}Some({{defaultValue}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{#hasMore}}, - {{/hasMore}} - {{/optional}}{{^optional}}{{paramName}}: {{dataType}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}}, - {{/hasMore}}{{/optional}}{{/allParams}})(implicit reader: ClientResponseReader[{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]{{#bodyParams}}, writer: RequestWriter[{{dataType}}]{{/bodyParams}}){{#returnType}}: Future[{{returnType}}]{{/returnType}}{{^returnType}}: Future[Unit]{{/returnType}} = { - // create path and map variables - val path = (addFmt("{{path}}"){{#pathParams}} - replaceAll ("\\{" + "{{baseName}}" + "\\}",{{paramName}}.toString){{/pathParams}}) + {{#operation}} + def {{nickname}}({{#allParams}}{{#optional}}{{paramName}}: Option[{{dataType}}] = {{#defaultValue}}Some({{defaultValue}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{#hasMore}}, + {{/hasMore}} + {{/optional}}{{^optional}}{{paramName}}: {{dataType}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}}, + {{/hasMore}}{{/optional}}{{/allParams}})(implicit reader: ClientResponseReader[{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]{{#bodyParams}}, writer: RequestWriter[{{dataType}}]{{/bodyParams}}){{#returnType}}: Future[{{returnType}}]{{/returnType}}{{^returnType}}: Future[Unit]{{/returnType}} = { + // create path and map variables + val path = (addFmt("{{path}}"){{#pathParams}} + replaceAll ("\\{" + "{{baseName}}" + "\\}",{{paramName}}.toString){{/pathParams}}) - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - {{#requiredParamCount}}// verify required params are set - val paramCount = (Set[Any]({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) - null).size - if (paramCount != {{requiredParamCount}}) sys.error("missing required params"){{/requiredParamCount}} + {{#requiredParamCount}}// verify required params are set + val paramCount = (Set[Any]({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) - null).size + if (paramCount != {{requiredParamCount}}) sys.error("missing required params"){{/requiredParamCount}} - {{#queryParams}}{{#optional}}if({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }{{/optional}}{{^optional}} - if({{paramName}} != null) queryParams += "{{baseName}}" -> {{paramName}}.toString{{/optional}}{{/queryParams}} + {{#queryParams}}{{#optional}}if({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }{{/optional}}{{^optional}} + if({{paramName}} != null) queryParams += "{{baseName}}" -> {{paramName}}.toString{{/optional}}{{/queryParams}} - {{#headerParams}}headerParams += "{{baseName}}" -> {{paramName}}.toString{{/headerParams}} + {{#headerParams}}headerParams += "{{baseName}}" -> {{paramName}}.toString{{/headerParams}} - val resFuture = client.submit("{{httpMethod}}", path, queryParams.toMap, headerParams.toMap, {{#bodyParam}}writer.write({{paramName}}){{/bodyParam}}{{^bodyParam}}"{{emptyBodyParam}}"{{/bodyParam}}) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + val resFuture = client.submit("{{httpMethod}}", path, queryParams.toMap, headerParams.toMap, {{#bodyParam}}writer.write({{paramName}}){{/bodyParam}}{{^bodyParam}}"{{emptyBodyParam}}"{{/bodyParam}}) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } - {{/operation}} + {{/operation}} -} + } {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/client.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/client.mustache index ea7efa354cb..a4fcee3c988 100644 --- a/modules/swagger-codegen/src/main/resources/asyncscala/client.mustache +++ b/modules/swagger-codegen/src/main/resources/asyncscala/client.mustache @@ -4,22 +4,22 @@ package {{invokerPackage}} {{/imports}} import {{apiPackage}}._ -import com.wordnik.swagger.client._ +import io.swagger.client._ import java.io.Closeable class {{clientName}}(config: SwaggerConfig) extends Closeable { - val locator = config.locator - val name = config.name +val locator = config.locator +val name = config.name - private[this] val client = transportClient +private[this] val client = transportClient - protected def transportClient: TransportClient = new RestClient(config) - {{#apiInfo}}{{#apis}} - val {{classVarName}} = new {{classname}}(client, config) - {{/apis}}{{/apiInfo}} +protected def transportClient: TransportClient = new RestClient(config) +{{#apiInfo}}{{#apis}} + val {{classVarName}} = new {{classname}}(client, config) +{{/apis}}{{/apiInfo}} - def close() { - client.close() - } +def close() { +client.close() +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache index b0da2825b32..c69f1d0bd36 100644 --- a/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache +++ b/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache @@ -4,10 +4,10 @@ import org.joda.time.DateTime {{#models}} -{{#model}} -case class {{classname}} ( - {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}]{{/isNotRequired}}{{#hasMore}},{{/hasMore}}{{#description}} // {{description}}{{/description}} - {{/vars}} -) -{{/model}} + {{#model}} + case class {{classname}} ( + {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}]{{/isNotRequired}}{{#hasMore}},{{/hasMore}}{{#description}} // {{description}}{{/description}} + {{/vars}} + ) + {{/model}} {{/models}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache index b96e132d8a7..7de6c56badf 100644 --- a/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache +++ b/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache @@ -3,10 +3,10 @@ organization := "{{package}}" name := "{{projectName}}-client" libraryDependencies ++= Seq( - "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5", - "joda-time" % "joda-time" % "2.3", - "org.joda" % "joda-convert" % "1.3.1", - "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided", - "org.scalatest" %% "scalatest" % "2.2.1" % "test", - "junit" % "junit" % "4.11" % "test" +"io.swagger" %% "swagger-async-httpclient" % "0.3.5", +"joda-time" % "joda-time" % "2.3", +"org.joda" % "joda-convert" % "1.3.1", +"ch.qos.logback" % "logback-classic" % "1.0.13" % "provided", +"org.scalatest" %% "scalatest" % "2.2.1" % "test", +"junit" % "junit" % "4.11" % "test" ) diff --git a/modules/swagger-codegen/src/main/resources/codegen/README.mustache b/modules/swagger-codegen/src/main/resources/codegen/README.mustache index d40b9b35813..df9b28758eb 100644 --- a/modules/swagger-codegen/src/main/resources/codegen/README.mustache +++ b/modules/swagger-codegen/src/main/resources/codegen/README.mustache @@ -9,7 +9,7 @@ your changes applied. The goal of Swaggerâ„¢ is to define a standard, language-agnostic interface to REST APIs which allows both humans and computers to discover and understand the capabilities of the service without access to source code, documentation, or through network traffic inspection. When properly defined via Swagger, a consumer can understand and interact with the remote service with a minimal amount of implementation logic. Similar to what interfaces have done for lower-level programming, Swagger removes the guesswork in calling the service. -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. ## How do I use this? At this point, you've likely generated a client setup. It will include something along these lines: @@ -26,7 +26,7 @@ At this point, you've likely generated a client setup. It will include somethin |----- {{name}} // template files |----- META-INF |------ services -|------- com.wordnik.swagger.codegen.CodegenConfig +|------- io.swagger.codegen.CodegenConfig ``` You _will_ need to make changes in at least the following: @@ -46,7 +46,7 @@ mvn package In your generator project. A single jar file will be produced in `target`. You can now use that with codegen: ``` -java -cp /path/to/swagger-codegen-distribution:/path/to/your/jar com.wordnik.swagger.codegen.Codegen -l {{name}} -o ./test +java -cp /path/to/swagger-codegen-distribution:/path/to/your/jar io.swagger.codegen.Codegen -l {{name}} -o ./test ``` Now your templates are available to the client generator and you can write output values @@ -67,7 +67,7 @@ the object you have available during client generation: # -DdebugOperations prints operations passed to the template engine # -DdebugSupportingFiles prints additional data passed to the template engine -java -DdebugOperations -cp /path/to/swagger-codegen-distribution:/path/to/your/jar com.wordnik.swagger.codegen.Codegen -l {{name}} -o ./test +java -DdebugOperations -cp /path/to/swagger-codegen-distribution:/path/to/your/jar io.swagger.codegen.Codegen -l {{name}} -o ./test ``` Will, for example, output the debug info for operations. You can use this info diff --git a/modules/swagger-codegen/src/main/resources/codegen/generatorClass.mustache b/modules/swagger-codegen/src/main/resources/codegen/generatorClass.mustache index 53b3a60ad1b..025c1bd82eb 100644 --- a/modules/swagger-codegen/src/main/resources/codegen/generatorClass.mustache +++ b/modules/swagger-codegen/src/main/resources/codegen/generatorClass.mustache @@ -1,191 +1,193 @@ package {{generatorPackage}}; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.properties.*; +import io.swagger.codegen.*; +import io.swagger.models.properties.*; import java.util.*; import java.io.File; public class {{generatorClass}} extends DefaultCodegen implements CodegenConfig { - // source folder where to write the files - protected String sourceFolder = "src"; - protected String apiVersion = "1.0.0"; - - /** - * Configures the type of generator. - * - * @return the CodegenType for this generator - * @see com.wordnik.swagger.codegen.CodegenType - */ - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - /** - * 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 "{{name}}"; - } - - /** - * 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 {{name}} client library."; - } - - public {{generatorClass}}() { - super(); - - // set the output folder here - outputFolder = "generated-code/{{name}}"; - - /** - * 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.put( - "model.mustache", // the template to use - ".sample"); // the extension for each file to write - - /** - * 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( - "api.mustache", // the template to use - ".sample"); // 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. - */ - templateDir = "{{name}}"; - - /** - * Api Package. Optional, if needed, this can be used in templates - */ - apiPackage = "io.swagger.client.api"; - - /** - * Model Package. Optional, if needed, this can be used in templates - */ - modelPackage = "io.swagger.client.model"; - - /** - * Reserved words. Override this with reserved words specific to your language - */ - reservedWords = new HashSet ( - Arrays.asList( - "sample1", // replace with static values - "sample2") +// source folder where to write the files +protected String sourceFolder = "src"; +protected String apiVersion = "1.0.0"; + +/** +* Configures the type of generator. +* +* @return the CodegenType for this generator +* @see io.swagger.codegen.CodegenType +*/ +public CodegenType getTag() { +return CodegenType.CLIENT; +} + +/** +* 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 "{{name}}"; +} + +/** +* 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 {{name}} client library."; +} + +public {{generatorClass}}() { +super(); + +// set the output folder here +outputFolder = "generated-code/{{name}}"; + +/** +* 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.put( +"model.mustache", // the template to use +".sample"); // the extension for each file to write + +/** +* 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( +"api.mustache", // the template to use +".sample"); // 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. +*/ +templateDir = "{{name}}"; + +/** +* Api Package. Optional, if needed, this can be used in templates +*/ +apiPackage = "io.swagger.client.api"; + +/** +* Model Package. Optional, if needed, this can be used in templates +*/ +modelPackage = "io.swagger.client.model"; + +/** +* Reserved words. Override this with reserved words specific to your language +*/ +reservedWords = new HashSet + ( + Arrays.asList( + "sample1", // replace with static values + "sample2") ); /** - * Additional Properties. These values can be passed to the templates and - * are available in models, apis, and supporting files - */ + * Additional Properties. These values can be passed to the templates and + * are available in models, apis, and supporting files + */ additionalProperties.put("apiVersion", apiVersion); /** - * 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("myFile.mustache", // the input template or file - "", // the destination folder, relative `outputFolder` - "myFile.sample") // the output file + * 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("myFile.mustache", // the input template or file + "", // the destination folder, relative `outputFolder` + "myFile.sample") // the output file ); /** - * Language Specific Primitives. These types will not trigger imports by - * the client generator - */ - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "Type1", // replace these with your types + * Language Specific Primitives. These types will not trigger imports by + * the client generator + */ + languageSpecificPrimitives = new HashSet + ( + Arrays.asList( + "Type1", // replace these with your types "Type2") - ); - } - - /** - * 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 model files. You can use the modelPackage() as defined when the class is - * instantiated - */ - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - /** - * Location to write api files. You can use the apiPackage() as defined when the class is - * instantiated - */ - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - /** - * Optional - type declaration. This is a String which is used by the templates to instantiate your - * types. There is typically special handling for different property types - * - * @return a string value used as the `dataType` field for model templates, `returnType` for api templates - */ - @Override - public String getTypeDeclaration(Property p) { - if(p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; - } - else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; - } - return super.getTypeDeclaration(p); - } - - /** - * Optional - swagger type conversion. This is used to map swagger types in a `Property` into - * either language specific types via `typeMapping` or into complex models if there is not a mapping. - * - * @return a string value of the type or complex model for this property - * @see com.wordnik.swagger.models.properties.Property - */ - @Override - public String getSwaggerType(Property p) { - String swaggerType = super.getSwaggerType(p); - String type = null; - if(typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); - if(languageSpecificPrimitives.contains(type)) + ); + } + + /** + * 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 model files. You can use the modelPackage() as defined when the class is + * instantiated + */ + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + /** + * Location to write api files. You can use the apiPackage() as defined when the class is + * instantiated + */ + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + /** + * Optional - type declaration. This is a String which is used by the templates to instantiate your + * types. There is typically special handling for different property types + * + * @return a string value used as the `dataType` field for model templates, `returnType` for api templates + */ + @Override + public String getTypeDeclaration(Property p) { + if(p instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) p; + Property inner = ap.getItems(); + return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]"; + } + else if (p instanceof MapProperty) { + MapProperty mp = (MapProperty) p; + Property inner = mp.getAdditionalProperties(); + return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]"; + } + return super.getTypeDeclaration(p); + } + + /** + * Optional - swagger type conversion. This is used to map swagger types in a `Property` into + * either language specific types via `typeMapping` or into complex models if there is not a mapping. + * + * @return a string value of the type or complex model for this property + * @see io.swagger.models.properties.Property + */ + @Override + public String getSwaggerType(Property p) { + String swaggerType = super.getSwaggerType(p); + String type = null; + if(typeMapping.containsKey(swaggerType)) { + type = typeMapping.get(swaggerType); + if(languageSpecificPrimitives.contains(type)) + return toModelName(type); + } + else + type = swaggerType; return toModelName(type); - } - else - type = swaggerType; - return toModelName(type); - } -} \ No newline at end of file + } + } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/codegen/pom.mustache b/modules/swagger-codegen/src/main/resources/codegen/pom.mustache index f827a2f56b6..b1daf970a0d 100644 --- a/modules/swagger-codegen/src/main/resources/codegen/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/codegen/pom.mustache @@ -1,102 +1,105 @@ - 4.0.0 - io.swagger - {{name}}-swagger-codegen - jar - {{name}}-swagger-codegen - 1.0.0 - - 2.2.0 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - - loggerPath - conf/log4j.properties - - - -Xms512m -Xmx1500m - methods - pertest - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + io.swagger + {{name}}-swagger-codegen + jar + {{name}}-swagger-codegen + 1.0.0 + + 2.2.0 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + pertest + + - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - jar - test-jar - - - - - - + + + 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 - - - - - - - com.wordnik - swagger-codegen - ${swagger-codegen-version} - provided - - - - 2.1.2-M1 - 1.0.0 - 4.8.1 - + + 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-codegen + ${swagger-codegen-version} + provided + + + + 2.1.2-M1 + 1.0.0 + 4.8.1 + \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache index ad57cffdf34..466e628d23a 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache @@ -9,209 +9,308 @@ using Newtonsoft.Json; using RestSharp; namespace {{invokerPackage}} { - /// - /// API client is mainly responible for making the HTTP call to the API backend - /// - public class ApiClient { - - /// - /// Initializes a new instance of the class. - /// - /// The base path. - public ApiClient(String basePath="{{basePath}}") { - this.basePath = basePath; - this.restClient = new RestClient(this.basePath); - } +/// + + /// API client is mainly responible for making the HTTP call to the API backend + /// + +public class ApiClient { + +/// + + /// Initializes a new instance of the + + class. + /// + +/// +The base path. +public ApiClient(String basePath="{{basePath}}") { +this.basePath = basePath; +this.restClient = new RestClient(this.basePath); +} - /// +/// + /// Gets or sets the base path. - /// - /// The base path. - public string basePath { get; set; } + /// + +/// +The base path. +public string basePath { get; set; } - /// +/// + /// Gets or sets the RestClient - /// - /// The RestClient. - public RestClient restClient { get; set; } - - private Dictionary defaultHeaderMap = new Dictionary(); - - public Object CallApi(String Path, RestSharp.Method Method, Dictionary QueryParams, String PostBody, - Dictionary HeaderParams, Dictionary FormParams, Dictionary FileParams, String[] AuthSettings) { - var response = Task.Run(async () => { - var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings); - return resp; - }); - return response.Result; - } + /// + +/// +The RestClient. +public RestClient restClient { get; set; } + +private Dictionary + defaultHeaderMap = new Dictionary +(); - public async Task CallApiAsync(String Path, RestSharp.Method Method, Dictionary QueryParams, String PostBody, - Dictionary HeaderParams, Dictionary FormParams, Dictionary FileParams, String[] AuthSettings) { +public Object CallApi(String Path, RestSharp.Method Method, Dictionary + QueryParams, String PostBody, +Dictionary + HeaderParams, Dictionary + FormParams, Dictionary + FileParams, String[] AuthSettings) { +var response = Task.Run(async () => { +var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings); +return resp; +}); +return response.Result; +} - var request = new RestRequest(Path, Method); +public async Task + CallApiAsync(String Path, RestSharp.Method Method, Dictionary + QueryParams, String PostBody, + Dictionary + HeaderParams, Dictionary + FormParams, Dictionary + FileParams, String[] AuthSettings) { - UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings); + var request = new RestRequest(Path, Method); - // add default header, if any - foreach(KeyValuePair defaultHeader in this.defaultHeaderMap) - request.AddHeader(defaultHeader.Key, defaultHeader.Value); + UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings); - // add header parameter, if any - foreach(KeyValuePair param in HeaderParams) - request.AddHeader(param.Key, param.Value); - - // add query parameter, if any - foreach(KeyValuePair param in QueryParams) - request.AddQueryParameter(param.Key, param.Value); + // add default header, if any + foreach(KeyValuePair + defaultHeader in this.defaultHeaderMap) + request.AddHeader(defaultHeader.Key, defaultHeader.Value); - // add form parameter, if any - foreach(KeyValuePair param in FormParams) - request.AddParameter(param.Key, param.Value); + // add header parameter, if any + foreach(KeyValuePair + param in HeaderParams) + request.AddHeader(param.Key, param.Value); - // add file parameter, if any - foreach(KeyValuePair param in FileParams) - request.AddFile(param.Key, param.Value); + // add query parameter, if any + foreach(KeyValuePair + param in QueryParams) + request.AddQueryParameter(param.Key, param.Value); - if (PostBody != null) { - request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter - } + // add form parameter, if any + foreach(KeyValuePair + param in FormParams) + request.AddParameter(param.Key, param.Value); - return (Object) await restClient.ExecuteTaskAsync(request); + // add file parameter, if any + foreach(KeyValuePair + param in FileParams) + request.AddFile(param.Key, param.Value); + if (PostBody != null) { + request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter } - /// - /// Add default header - /// - /// Header field name - /// Header field value - /// + return (Object) await restClient.ExecuteTaskAsync(request); + + } + + /// + + /// Add default header + /// + + /// + + Header field name + /// + + Header field value + /// + public void AddDefaultHeader(string key, string value) { - defaultHeaderMap.Add(key, value); + defaultHeaderMap.Add(key, value); } - /// - /// Get default header - /// - /// Dictionary of default header - public Dictionary GetDefaultHeader() { - return defaultHeaderMap; + /// + + /// Get default header + /// + + /// + Dictionary of default header + public Dictionary + GetDefaultHeader() { + return defaultHeaderMap; } - /// - /// escape string (url-encoded) - /// - /// String to be escaped - /// Escaped string + /// + + /// escape string (url-encoded) + /// + + /// + + String to be escaped + /// + Escaped string public string EscapeString(string str) { - return str; + return str; } - /// - /// if parameter is DateTime, output in ISO8601 format - /// if parameter is a list of string, join the list with "," - /// otherwise just return the string - /// - /// The parameter (header, path, query, form) - /// Formatted string + /// + + /// if parameter is DateTime, output in ISO8601 format + /// if parameter is a list of string, join the list with "," + /// otherwise just return the string + /// + + /// + + The parameter (header, path, query, form) + /// + Formatted string public string ParameterToString(object obj) { - if (obj is DateTime) { - return ((DateTime)obj).ToString ("u"); - } else if (obj is List) { - return String.Join(",", obj as List); - } else { - return Convert.ToString (obj); - } - } + if (obj is DateTime) { + return ((DateTime)obj).ToString ("u"); + } else if (obj is List + ) { + return String.Join(",", obj as List + ); + } else { + return Convert.ToString (obj); + } + } - /// - /// Deserialize the JSON string into a proper object - /// - /// JSON string - /// Object type - /// Object representation of the JSON string - public object Deserialize(string content, Type type) { - if (type.GetType() == typeof(Object)) - return (Object)content; - - try - { - return JsonConvert.DeserializeObject(content, type); - } - catch (IOException e) { - throw new ApiException(500, e.Message); - } - } + /// + + /// Deserialize the JSON string into a proper object + /// + + /// + + JSON string + /// + + Object type + /// + Object representation of the JSON string + public object Deserialize(string content, Type type) { + if (type.GetType() == typeof(Object)) + return (Object)content; - /// - /// Serialize an object into JSON string - /// - /// Object - /// JSON string - public string Serialize(object obj) { - try - { - return obj != null ? JsonConvert.SerializeObject(obj) : null; - } - catch (Exception e) { - throw new ApiException(500, e.Message); - } - } + try + { + return JsonConvert.DeserializeObject(content, type); + } + catch (IOException e) { + throw new ApiException(500, e.Message); + } + } - /// - /// Get the API key with prefix - /// - /// Object - /// API key with prefix - public string GetApiKeyWithPrefix (string apiKey) - { - var apiKeyValue = ""; - Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue); - var apiKeyPrefix = ""; - if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) { - return apiKeyPrefix + " " + apiKeyValue; - } else { - return apiKeyValue; - } - } + /// + + /// Serialize an object into JSON string + /// + + /// + + Object + /// + JSON string + public string Serialize(object obj) { + try + { + return obj != null ? JsonConvert.SerializeObject(obj) : null; + } + catch (Exception e) { + throw new ApiException(500, e.Message); + } + } - /// - /// Update parameters based on authentication - /// - /// Query parameters - /// Header parameters - /// Authentication settings - public void UpdateParamsForAuth(Dictionary QueryParams, Dictionary HeaderParams, string[] AuthSettings) { - if (AuthSettings == null || AuthSettings.Length == 0) - return; - - foreach (string auth in AuthSettings) { - // determine which one to use - switch(auth) { - {{#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}} - break; - {{/authMethods}} - default: + /// + + /// Get the API key with prefix + /// + + /// + + Object + /// + API key with prefix + public string GetApiKeyWithPrefix (string apiKey) + { + var apiKeyValue = ""; + Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue); + var apiKeyPrefix = ""; + if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) { + return apiKeyPrefix + " " + apiKeyValue; + } else { + return apiKeyValue; + } + } + + /// + + /// Update parameters based on authentication + /// + + /// + + Query parameters + /// + + Header parameters + /// + + Authentication settings + public void UpdateParamsForAuth(Dictionary + QueryParams, Dictionary + HeaderParams, string[] AuthSettings) { + if (AuthSettings == null || AuthSettings.Length == 0) + return; + + foreach (string auth in AuthSettings) { + // determine which one to use + switch(auth) { + {{#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}} + break; + {{/authMethods}} + default: //TODO show warning about security definition not found - break; - } - } + break; + } + } - } + } - /// - /// Encode string in base64 format - /// - /// String to be encoded - public static string Base64Encode(string text) { - var textByte = System.Text.Encoding.UTF8.GetBytes(text); - return System.Convert.ToBase64String(textByte); - } + /// + + /// Encode string in base64 format + /// + + /// + + String to be encoded + public static string Base64Encode(string text) { + var textByte = System.Text.Encoding.UTF8.GetBytes(text); + return System.Convert.ToBase64String(textByte); + } - } -} + } + } diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache index 38a340be249..d21aca8814f 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache @@ -1,42 +1,61 @@ using System; namespace {{invokerPackage}} { - /// - /// API Exception - /// - public class ApiException : Exception { - /// +/// + + /// API Exception + /// + +public class ApiException : Exception { +/// + /// Gets or sets the error code (HTTP status code) - /// - /// The error code (HTTP status code). - public int ErrorCode { get; set; } + /// + +/// +The error code (HTTP status code). +public int ErrorCode { get; set; } - /// +/// + /// Gets or sets the error content (body json object) - /// - /// The error content (Http response body). - public dynamic ErrorContent { get; private set; } + /// + +/// +The error content (Http response body). +public dynamic ErrorContent { get; private set; } - /// - /// Initializes a new instance of the class. - /// - /// The base path. - public ApiException() {} +/// + + /// Initializes a new instance of the + + class. + /// + +/// +The base path. +public ApiException() {} - /// - /// Initializes a new instance of the class. - /// - /// HTTP status code. - /// Error message. - public ApiException(int errorCode, string message) : base(message) { - this.ErrorCode = errorCode; - } +/// + + /// Initializes a new instance of the + + class. + /// + +/// +HTTP status code. +/// +Error message. +public ApiException(int errorCode, string message) : base(message) { +this.ErrorCode = errorCode; +} - public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) { - this.ErrorCode = errorCode; - this.ErrorContent = errorContent; - } +public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) { +this.ErrorCode = errorCode; +this.ErrorContent = errorContent; +} - } +} } diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache index 1f5c00a356d..71f4bb07f14 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache @@ -7,41 +7,62 @@ using System.Text; using {{invokerPackage}}; namespace {{invokerPackage}} { - /// - /// Represents a set of configuration settings - /// - public class Configuration{ +/// + + /// Represents a set of configuration settings + /// + +public class Configuration{ - /// +/// + /// Gets or sets the API client. This is the default API client for making HTTP calls. - /// - /// The API client. - public static ApiClient apiClient = new ApiClient(); + /// + +/// +The API client. +public static ApiClient apiClient = new ApiClient(); - /// +/// + /// Gets or sets the username (HTTP basic authentication) - /// - /// The username. - public static String username { get; set; } + /// + +/// +The username. +public static String username { get; set; } - /// +/// + /// Gets or sets the password (HTTP basic authentication) - /// - /// The password. - public static String password { get; set; } + /// + +/// +The password. +public static String password { get; set; } - /// - /// Gets or sets the API key based on the authentication name - /// - /// The API key. - public static Dictionary apiKey = new Dictionary(); +/// + + /// Gets or sets the API key based on the authentication name + /// + +/// +The API key. +public static Dictionary + apiKey = new Dictionary +(); - /// - /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name - /// - /// The prefix of the API key. - public static Dictionary apiKeyPrefix = new Dictionary(); +/// + + /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name + /// + +/// +The prefix of the API key. +public static Dictionary + apiKeyPrefix = new Dictionary +(); - } +} } diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache index 117446441fa..67dff4c8222 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache @@ -8,166 +8,212 @@ using {{modelPackage}}; {{/imports}} namespace {{package}} { - {{#operations}} +{{#operations}} - public interface I{{classname}} { + public interface I{{classname}} { {{#operation}} - /// - /// {{summary}} {{notes}} - /// - {{#allParams}}/// {{description}}{{/allParams}} - /// {{#returnType}}{{{returnType}}}{{/returnType}} - {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); - - /// - /// {{summary}} {{notes}} - /// - {{#allParams}}/// {{description}}{{/allParams}} - /// {{#returnType}}{{{returnType}}}{{/returnType}} - {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); + /// + + /// {{summary}} {{notes}} + /// + + {{#allParams}}/// + {{description}}{{/allParams}} + /// + {{#returnType}}{{{returnType}}}{{/returnType}} + {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); + + /// + + /// {{summary}} {{notes}} + /// + + {{#allParams}}/// + {{description}}{{/allParams}} + /// + {{#returnType}}{{{returnType}}}{{/returnType}} + {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); {{/operation}} - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class {{classname}} : I{{classname}} { - - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// + } + + /// + + /// Represents a collection of functions to interact with the API endpoints + /// + + public class {{classname}} : I{{classname}} { + + /// + + /// Initializes a new instance of the + + class. + /// + + /// + an instance of ApiClient (optional) + /// + public {{classname}}(ApiClient apiClient = null) { - if (apiClient == null) { // use the default one in Configuration - this.apiClient = Configuration.apiClient; - } else { - this.apiClient = apiClient; - } + if (apiClient == null) { // use the default one in Configuration + this.apiClient = Configuration.apiClient; + } else { + this.apiClient = apiClient; + } } - /// - /// Initializes a new instance of the class. - /// - /// + /// + + /// Initializes a new instance of the + + class. + /// + + /// + public {{classname}}(String basePath) { - this.apiClient = new ApiClient(basePath); + this.apiClient = new ApiClient(basePath); } - /// - /// Sets the base path of the API client. - /// - /// The base path + /// + + /// Sets the base path of the API client. + /// + + /// + The base path public void SetBasePath(String basePath) { - this.apiClient.basePath = basePath; + this.apiClient.basePath = basePath; } - /// - /// Gets the base path of the API client. - /// - /// The base path + /// + + /// Gets the base path of the API client. + /// + + /// + The base path public String GetBasePath(String basePath) { - return this.apiClient.basePath; + return this.apiClient.basePath; } - /// - /// Gets or sets the API client. - /// - /// The API client + /// + + /// Gets or sets the API client. + /// + + /// + The API client public ApiClient apiClient {get; set;} {{#operation}} - /// - /// {{summary}} {{notes}} - /// - {{#allParams}}/// {{description}}{{/allParams}} - /// {{#returnType}}{{{returnType}}}{{/returnType}} - public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { - - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}"); - {{/required}}{{/allParams}} - - var path = "{{path}}"; - path = path.Replace("{format}", "json"); - {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}})); - {{/pathParams}} - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter - {{/queryParams}} - {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter - {{/headerParams}} - {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}} - {{/formParams}} - {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter - {{/bodyParam}} - - // authentication setting, if any - 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, authSettings); - - if (((int)response.StatusCode) >= 400) { + /// + + /// {{summary}} {{notes}} + /// + + {{#allParams}}/// + {{description}}{{/allParams}} + /// + {{#returnType}}{{{returnType}}}{{/returnType}} + public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { + + {{#allParams}}{{#required}} + // verify the required parameter '{{paramName}}' is set + if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}"); + {{/required}}{{/allParams}} + + var path = "{{path}}"; + path = path.Replace("{format}", "json"); + {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}})); + {{/pathParams}} + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter + {{/queryParams}} + {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter + {{/headerParams}} + {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}} + {{/formParams}} + {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter + {{/bodyParam}} + + // authentication setting, if any + 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, authSettings); + + if (((int)response.StatusCode) >= 400) { throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content); - } - {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}} - return;{{/returnType}} - } - - /// - /// {{summary}} {{notes}} - /// - {{#allParams}}/// {{description}}{{/allParams}} - /// {{#returnType}}{{{returnType}}}{{/returnType}} - public async {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { - - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}"); - {{/required}}{{/allParams}} - - var path = "{{path}}"; - path = path.Replace("{format}", "json"); - {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}})); - {{/pathParams}} - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter - {{/queryParams}} - {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter - {{/headerParams}} - {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}} - {{/formParams}} - {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter - {{/bodyParam}} - - // authentication setting, if any - 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, authSettings); - if (((int)response.StatusCode) >= 400) { + } + {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}} + return;{{/returnType}} + } + + /// + + /// {{summary}} {{notes}} + /// + + {{#allParams}}/// + {{description}}{{/allParams}} + /// + {{#returnType}}{{{returnType}}}{{/returnType}} + public async {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { + + {{#allParams}}{{#required}} + // verify the required parameter '{{paramName}}' is set + if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}"); + {{/required}}{{/allParams}} + + var path = "{{path}}"; + path = path.Replace("{format}", "json"); + {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}})); + {{/pathParams}} + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter + {{/queryParams}} + {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter + {{/headerParams}} + {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}} + {{/formParams}} + {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter + {{/bodyParam}} + + // authentication setting, if any + 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, authSettings); + if (((int)response.StatusCode) >= 400) { throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content); - } - {{#returnType}}return ({{{returnType}}}) ApiInvoker.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}} - return;{{/returnType}} - } + } + {{#returnType}}return ({{{returnType}}}) ApiInvoker.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}} + return;{{/returnType}} + } {{/operation}} - } - {{/operations}} + } +{{/operations}} } diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache index ce0e62de192..4f1b56a47de 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache @@ -6,44 +6,52 @@ using System.Runtime.Serialization; using Newtonsoft.Json; {{#models}} -{{#model}} -namespace {{package}} { + {{#model}} + namespace {{package}} { - /// - /// {{description}} - /// - [DataContract] - public class {{classname}} { - {{#vars}} - {{#description}}/* {{{description}}} */{{/description}} - [DataMember(Name="{{baseName}}", EmitDefaultValue=false)] - public {{{datatype}}} {{name}} { get; set; } + /// + + /// {{description}} + /// + + [DataContract] + public class {{classname}} { + {{#vars}} + {{#description}}/* {{{description}}} */{{/description}} + [DataMember(Name="{{baseName}}", EmitDefaultValue=false)] + public {{{datatype}}} {{name}} { get; set; } - {{/vars}} + {{/vars}} - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class {{classname}} {\n"); - {{#vars}} - sb.Append(" {{name}}: ").Append({{name}}).Append("\n"); - {{/vars}} - sb.Append("}\n"); - return sb.ToString(); - } + /// + + /// Get the string presentation of the object + /// + + /// + String presentation of the object + public override string ToString() { + var sb = new StringBuilder(); + sb.Append("class {{classname}} {\n"); + {{#vars}} + sb.Append(" {{name}}: ").Append({{name}}).Append("\n"); + {{/vars}} + sb.Append("}\n"); + return sb.ToString(); + } - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } + /// + + /// Get the JSON string presentation of the object + /// + + /// + JSON string presentation of the object + public string ToJson() { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } -} - {{/model}} - {{/models}} + } + {{/model}} +{{/models}} } diff --git a/modules/swagger-codegen/src/main/resources/flash/AirExecutorApp-app.xml b/modules/swagger-codegen/src/main/resources/flash/AirExecutorApp-app.xml index 1dbaf98e644..1eb5e43c7d7 100644 --- a/modules/swagger-codegen/src/main/resources/flash/AirExecutorApp-app.xml +++ b/modules/swagger-codegen/src/main/resources/flash/AirExecutorApp-app.xml @@ -1,87 +1,87 @@ - + xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/2.0 + The last segment of the namespace specifies the version + of the AIR runtime required for this application to run. - - AirExecutorApp + minimumPatchLevel - The minimum patch level of the AIR runtime required to run + the application. Optional. + --> - - AirExecutorApp + + AirExecutorApp - - AirExecutorApp + + AirExecutorApp - - v1 + + AirExecutorApp - - + + v1 - - + + - - + + - - - - - AirExecutorApp.swf - - - + + - - + + + + + AirExecutorApp.swf - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + + + + + + + @@ -90,57 +90,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiClientEvent.as b/modules/swagger-codegen/src/main/resources/flash/ApiClientEvent.as index 313da09ea78..f25f4563c07 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ApiClientEvent.as +++ b/modules/swagger-codegen/src/main/resources/flash/ApiClientEvent.as @@ -1,14 +1,10 @@ -package com.wordnik.swagger.event { -import com.wordnik.swagger.event.Response; - -import flash.events.Event; - +package io.swagger.event { /** * Event dispatched by the SDK to communicate success events and failure events. * If a custom dispatcher has been assigned by the consumer on the generated client then the dispatcher dispatches * the ApiClientEvent to indicate success or failure of the invocation using the Response */ -public class ApiClientEvent extends Event{ +public class ApiClientEvent extends Event { /** * Event type to indicate a unsuccessful invocation @@ -19,18 +15,17 @@ public class ApiClientEvent extends Event{ * Event type to indicate a successful invocation */ public static const SUCCESS_EVENT:String = "successfulInvocation"; - + + public function ApiClientEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false) { + super(type, bubbles, cancelable); + } /** * The Response object which contains response info */ - public var response: Response; + public var response:Response; /** * Any additional info */ public var message:String; - - public function ApiClientEvent(type:String,bubbles:Boolean = false,cancelable:Boolean = false) { - super(type, bubbles, cancelable); - } } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiError.as b/modules/swagger-codegen/src/main/resources/flash/ApiError.as index 13d09415829..7734d7f9979 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ApiError.as +++ b/modules/swagger-codegen/src/main/resources/flash/ApiError.as @@ -1,10 +1,7 @@ -package com.wordnik.swagger.exception -{ - public class ApiError extends Error - { - public function ApiError(id:*=0, message:*="") - { - super(message,id); - } - } +package io.swagger.exception { +public class ApiError extends Error { + public function ApiError(id:* = 0, message:* = "") { + super(message, id); + } +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiErrorCodes.as b/modules/swagger-codegen/src/main/resources/flash/ApiErrorCodes.as index abe12178361..9236e40acbc 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ApiErrorCodes.as +++ b/modules/swagger-codegen/src/main/resources/flash/ApiErrorCodes.as @@ -1,34 +1,32 @@ -package com.wordnik.swagger.exception -{ - public class ApiErrorCodes - { - /** - * System exception. - */ - public static const SYSTEM_EXCEPTION: Number = 0; - - /** - * With Arguments as current key. - */ - public static const API_KEY_NOT_VALID: Number = 1000; - /** - * With arguments as current token value - */ - public static const AUTH_TOKEN_NOT_VALID: Number = 1001; - /** - * With arguments as input JSON and output class anme - */ - public static const ERROR_CONVERTING_JSON_TO_JAVA: Number = 1002; - /** - * With arguments as JAVA class name - */ - public static const ERROR_CONVERTING_JAVA_TO_JSON: Number = 1003; - - public static const ERROR_FROM_WEBSERVICE_CALL: Number = 1004; - /** - * With arguments as current API server name - */ - public static const API_SERVER_NOT_VALID: Number = 1005; - - } +package io.swagger.exception { +public class ApiErrorCodes { + /** + * System exception. + */ + public static const SYSTEM_EXCEPTION:Number = 0; + + /** + * With Arguments as current key. + */ + public static const API_KEY_NOT_VALID:Number = 1000; + /** + * With arguments as current token value + */ + public static const AUTH_TOKEN_NOT_VALID:Number = 1001; + /** + * With arguments as input JSON and output class anme + */ + public static const ERROR_CONVERTING_JSON_TO_JAVA:Number = 1002; + /** + * With arguments as JAVA class name + */ + public static const ERROR_CONVERTING_JAVA_TO_JSON:Number = 1003; + + public static const ERROR_FROM_WEBSERVICE_CALL:Number = 1004; + /** + * With arguments as current API server name + */ + public static const API_SERVER_NOT_VALID:Number = 1005; + +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as b/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as index 40ad41af65f..98d94052ec4 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as +++ b/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as @@ -1,50 +1,17 @@ -package com.wordnik.swagger.common -{ -import asaxb.xml.bind.ASAXBContext; -import asaxb.xml.bind.Unmarshaller; - -import com.wordnik.swagger.event.ApiClientEvent; -import com.wordnik.swagger.event.Response; -import com.wordnik.swagger.common.ApiUserCredentials; - -import flash.events.EventDispatcher; -import flash.utils.Dictionary; -import flash.utils.describeType; -import flash.xml.XMLDocument; -import flash.xml.XMLNode; - -import mx.messaging.ChannelSet; -import mx.messaging.channels.HTTPChannel; -import mx.messaging.messages.HTTPRequestMessage; -import mx.rpc.AsyncToken; -import mx.rpc.events.FaultEvent; -import mx.rpc.events.ResultEvent; -import mx.rpc.http.HTTPService; -import mx.rpc.xml.SimpleXMLEncoder; -import mx.utils.ObjectUtil; - - -public class ApiInvoker extends EventDispatcher -{ +package io.swagger.common { +import io.swagger.event.ApiClientEvent; +import io.swagger.event.Response; - private var _apiUsageCredentials:ApiUserCredentials; - internal var _apiProxyServerUrl:String = ""; - private var _baseUrl: String = ""; - internal var _useProxyServer: Boolean = true; - private var _proxyHostName:String = ""; - private var _apiPath: String = ""; - private var _proxyPath: String = ""; - - public var _apiEventNotifier:EventDispatcher; +public class ApiInvoker extends EventDispatcher { private static const DELETE_DATA_DUMMY:String = "dummyDataRequiredForDeleteOverride"; private static const X_HTTP_OVERRIDE_KEY:String = "X-HTTP-Method-Override"; private static const CONTENT_TYPE_HEADER_KEY:String = "Content-Type"; - public function ApiInvoker(apiUsageCredentials: ApiUserCredentials, eventNotifier: EventDispatcher, useProxy: Boolean = true) { + public function ApiInvoker(apiUsageCredentials:ApiUserCredentials, eventNotifier:EventDispatcher, useProxy:Boolean = true) { _apiUsageCredentials = apiUsageCredentials; _useProxyServer = useProxy; - if(_apiUsageCredentials.hostName != null){ + if (_apiUsageCredentials.hostName != null) { _proxyHostName = _apiUsageCredentials.hostName; } _apiPath = _apiUsageCredentials.apiPath; @@ -52,25 +19,33 @@ public class ApiInvoker extends EventDispatcher _apiProxyServerUrl = _apiUsageCredentials.apiProxyServerUrl; _apiEventNotifier = eventNotifier; } + public var _apiEventNotifier:EventDispatcher; + internal var _apiProxyServerUrl:String = ""; + internal var _useProxyServer:Boolean = true; + private var _apiUsageCredentials:ApiUserCredentials; + private var _baseUrl:String = ""; + private var _proxyHostName:String = ""; + private var _apiPath:String = ""; + private var _proxyPath:String = ""; - public function invokeAPI(resourceURL: String, method: String, queryParams: Dictionary, postObject: Object, headerParams: Dictionary): AsyncToken { + public function invokeAPI(resourceURL:String, method:String, queryParams:Dictionary, postObject:Object, headerParams:Dictionary):AsyncToken { //make the communication - if(_useProxyServer) { + if (_useProxyServer) { resourceURL = _apiProxyServerUrl + resourceURL; } - else{ - resourceURL = "http://"+ _proxyHostName + _apiPath + resourceURL; + else { + resourceURL = "http://" + _proxyHostName + _apiPath + resourceURL; } - var counter: int = 0; - var symbol: String = "&"; - var paramValue: Object; + var counter:int = 0; + var symbol:String = "&"; + var paramValue:Object; for (var paramName:String in queryParams) { paramValue = queryParams[paramName]; //var key:String = paramName; // do stuff symbol = "&"; - if(counter == 0){ + if (counter == 0) { symbol = "?"; } resourceURL = resourceURL + symbol + paramName + "=" + paramValue.toString(); @@ -80,8 +55,8 @@ public class ApiInvoker extends EventDispatcher // trace(resourceURL); //create a httpservice and invoke the rest url waiting for response var requestHeader:Object = new Object(); - if(headerParams != null) { - for(var key: String in headerParams) { + if (headerParams != null) { + for (var key:String in headerParams) { requestHeader[key] = headerParams[key]; } } @@ -95,38 +70,98 @@ public class ApiInvoker extends EventDispatcher } - private function doRestCall( url : String, resultFunction : Function, faultFunction : Function = null, - restMethod : String = "GET", - bodyData : Object = null, headers: Object = null, contentType:String = "application/xml" ) : AsyncToken - { - var httpService : HTTPService = new HTTPService( ); + public function marshal(source:Object):Object { +// trace("marshal got - " + source) + if (source is String) { + return source; + } else if (source is Array && source.length > 0) { + var writer:XMLWriter = new XMLWriter(); + var sourceArray:Array = source as Array; + var arrayEnclosure:String = getArrayEnclosure(sourceArray); + writer.xml.setName(arrayEnclosure); + + for (var i:int = 0; i < sourceArray.length; i++) { + var o:Object = sourceArray[i]; + writer.xml.appendChild(marshal(o)); + } + return writer.xml; + } else + return marshalObject(source); + } + + public function marshalObject(source:Object):XML { + var writer:XMLWriter = new XMLWriter(); + var objDescriptor:XML = describeType(source); + var property:XML; + var propertyType:String; + var propertyValue:Object; + + var qualifiedClassName:String = objDescriptor.@name; + qualifiedClassName = qualifiedClassName.replace("::", "."); + var className:String = qualifiedClassName.substring(qualifiedClassName.lastIndexOf(".") + 1); + className = className().toLowerCase() + className.substring(1); + writer.xml.setName(className); + + for each(property in objDescriptor.elements("variable")) { + propertyValue = source[property.@name]; + if (propertyValue != null) { + if (ObjectUtil.isSimple(propertyValue)) { + writer.addProperty(property.@name, propertyValue.toString()); + } + else { + writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); + } + } + } + for each(property in objDescriptor.elements("accessor")) { + if (property.@access == "readonly") { + continue; + } + propertyValue = source[property.@name]; + if (source[property.@name] != null) { + if (ObjectUtil.isSimple(propertyValue)) { + writer.addProperty(property.@name, propertyValue.toString()); + } + else { + writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); + } + } + } + return writer.xml; + } + + public function escapeString(str:String):String { + return str; + } + + private function doRestCall(url:String, resultFunction:Function, faultFunction:Function = null, + restMethod:String = "GET", + bodyData:Object = null, headers:Object = null, contentType:String = "application/xml"):AsyncToken { + var httpService:HTTPService = new HTTPService(); - if(headers == null){ + if (headers == null) { headers = new Object(); } httpService.method = restMethod; - if ( restMethod.toUpperCase() != HTTPRequestMessage.GET_METHOD ) - { + if (restMethod.toUpperCase() != HTTPRequestMessage.GET_METHOD) { //httpService.method = HTTPRequestMessage.POST_METHOD; - not required as we're using the proxy - if( bodyData == null ) - { + if (bodyData == null) { bodyData = new Object(); } - if(restMethod == HTTPRequestMessage.DELETE_METHOD){ - headers[X_HTTP_OVERRIDE_KEY]= HTTPRequestMessage.DELETE_METHOD; + if (restMethod == HTTPRequestMessage.DELETE_METHOD) { + headers[X_HTTP_OVERRIDE_KEY] = HTTPRequestMessage.DELETE_METHOD; bodyData = DELETE_DATA_DUMMY; } - else if(restMethod == HTTPRequestMessage.PUT_METHOD){ - headers[X_HTTP_OVERRIDE_KEY]= HTTPRequestMessage.PUT_METHOD; + else if (restMethod == HTTPRequestMessage.PUT_METHOD) { + headers[X_HTTP_OVERRIDE_KEY] = HTTPRequestMessage.PUT_METHOD; } - else{ - headers[CONTENT_TYPE_HEADER_KEY]= contentType; + else { + headers[CONTENT_TYPE_HEADER_KEY] = contentType; } } - else - { + else { //if the request type is GET and content type is xml then the Flex HTTPService converts it to a POST ... yeah contentType = null; } @@ -135,148 +170,79 @@ public class ApiInvoker extends EventDispatcher httpService.contentType = contentType; httpService.resultFormat = "e4x"; httpService.headers = headers; - httpService.addEventListener( ResultEvent.RESULT, resultFunction ); - if( faultFunction != null ) - { - httpService.addEventListener( FaultEvent.FAULT, faultFunction ); + httpService.addEventListener(ResultEvent.RESULT, resultFunction); + if (faultFunction != null) { + httpService.addEventListener(FaultEvent.FAULT, faultFunction); } - if(_useProxyServer){ + if (_useProxyServer) { httpService.useProxy = true; - var channelSet: ChannelSet = new ChannelSet(); - var httpChannel: HTTPChannel = new HTTPChannel(); + var channelSet:ChannelSet = new ChannelSet(); + var httpChannel:HTTPChannel = new HTTPChannel(); httpChannel.uri = ApiUrlHelper.getProxyUrl(_proxyHostName, _proxyPath); channelSet.addChannel(httpChannel); httpService.channelSet = channelSet; } - return httpService.send( bodyData ); + return httpService.send(bodyData); } - private function onApiRequestResult(event:ResultEvent):void - { - var completionListener: Function = event.token.completionListener; - var result: Object = event.result; - var resultType: Class = event.token.returnType; + private function onApiRequestResult(event:ResultEvent):void { + var completionListener:Function = event.token.completionListener; + var result:Object = event.result; + var resultType:Class = event.token.returnType; var resultObject:Object; - if(resultType != null) { + if (resultType != null) { var context:ASAXBContext = ASAXBContext.newInstance(resultType); var unmarshaller:Unmarshaller = context.createUnmarshaller(); - var resultXML: XML = new XML(event.result); - try{ + var resultXML:XML = new XML(event.result); + try { resultObject = unmarshaller.unmarshal(resultXML); } - catch(error: TypeError){ - var errorResponse: Response = new Response(false, null, "Could not unmarshall response"); + catch (error:TypeError) { + var errorResponse:Response = new Response(false, null, "Could not unmarshall response"); if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher - var failureEvent: ApiClientEvent = new ApiClientEvent(event.token.completionEventType); + var failureEvent:ApiClientEvent = new ApiClientEvent(event.token.completionEventType); failureEvent.response = errorResponse; _apiEventNotifier.dispatchEvent(failureEvent); } } - if(resultObject is ListWrapper){ + if (resultObject is ListWrapper) { resultObject = ListWrapper(resultObject).getList(); } } - var response : Response = new Response(true, resultObject); + var response:Response = new Response(true, resultObject); response.requestId = event.token.requestId; - var successEventType: String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.SUCCESS_EVENT; + var successEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.SUCCESS_EVENT; if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher - var successEvent: ApiClientEvent = new ApiClientEvent(successEventType); + var successEvent:ApiClientEvent = new ApiClientEvent(successEventType); successEvent.response = response; _apiEventNotifier.dispatchEvent(successEvent); } } - private function onApiRequestFault(event:FaultEvent):void - { - var completionListener: Function = event.token.completionListener; - if(completionListener != null){ - completionListener.call( null, new Response( false, null, event.fault.faultString) ); + private function onApiRequestFault(event:FaultEvent):void { + var completionListener:Function = event.token.completionListener; + if (completionListener != null) { + completionListener.call(null, new Response(false, null, event.fault.faultString)); } - var failureEventType: String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.FAILURE_EVENT; + var failureEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.FAILURE_EVENT; if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher - var failureEvent: ApiClientEvent = new ApiClientEvent(failureEventType); - failureEvent.response = new Response( false, null, event.fault.faultString); + var failureEvent:ApiClientEvent = new ApiClientEvent(failureEventType); + failureEvent.response = new Response(false, null, event.fault.faultString); _apiEventNotifier.dispatchEvent(failureEvent); } } - - public function marshal(source:Object):Object { -// trace("marshal got - " + source) - if(source is String) { - return source; - } else if(source is Array && source.length > 0) { - var writer:XMLWriter=new XMLWriter(); - var sourceArray: Array = source as Array; - var arrayEnclosure: String = getArrayEnclosure(sourceArray); - writer.xml.setName(arrayEnclosure); - - for (var i:int = 0; i < sourceArray.length; i++) { - var o: Object = sourceArray[i]; - writer.xml.appendChild(marshal(o)); - } - return writer.xml; - } else - return marshalObject(source); - } - - public function marshalObject(source:Object):XML - { - var writer:XMLWriter=new XMLWriter(); - var objDescriptor:XML=describeType(source); - var property:XML; - var propertyType:String; - var propertyValue:Object; - - var qualifiedClassName:String=objDescriptor.@name; - qualifiedClassName=qualifiedClassName.replace("::","."); - var className: String = qualifiedClassName.substring(qualifiedClassName.lastIndexOf(".") + 1); - className = className().toLowerCase() + className.substring(1); - writer.xml.setName(className); - - for each(property in objDescriptor.elements("variable")){ - propertyValue=source[property.@name]; - if (propertyValue!=null){ - if (ObjectUtil.isSimple(propertyValue)){ - writer.addProperty(property.@name, propertyValue.toString()); - } - else { - writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); - } - } - } - for each(property in objDescriptor.elements("accessor")){ - if (property.@access=="readonly"){ - continue; - } - propertyValue=source[property.@name]; - if (source[property.@name]!=null){ - if (ObjectUtil.isSimple(propertyValue)){ - writer.addProperty(property.@name, propertyValue.toString()); - } - else { - writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); - } - } - } - return writer.xml; - } - - public function escapeString(str: String): String { - return str; - } - - private function getArrayEnclosure(arr: Array) : String { - if(arr != null && arr.length > 0) { - var className: String = flash.utils.getQualifiedClassName(arr[0]) - if(className.indexOf("::") > 0) + private function getArrayEnclosure(arr:Array):String { + if (arr != null && arr.length > 0) { + var className:String = flash.utils.getQualifiedClassName(arr[0]) + if (className.indexOf("::") > 0) className = className.substr(className.indexOf("::") + 2, className.length) return className.substring(0, 1).toLowerCase() + className.substring(1, className.length) + "s"; diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as b/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as index affa1eb0ff9..57c5bc00819 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as +++ b/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as @@ -1,6 +1,4 @@ -package com.wordnik.swagger.common { -import com.wordnik.swagger.common.ApiUserCredentials; - +package io.swagger.common { /** * @private * Internal class for the Rest client @@ -12,17 +10,17 @@ internal class ApiUrlHelper { private static const HTTP_URL_PREFIX:String = "http://"; - internal static function appendTokenInfo(restUrl:String, requestHeader: Object, credentials: ApiUserCredentials): String { + internal static function appendTokenInfo(restUrl:String, requestHeader:Object, credentials:ApiUserCredentials):String { //checks for the presence api credentials on client initialization and not repeated here - if(restUrl.indexOf("?") == -1){ + if (restUrl.indexOf("?") == -1) { restUrl += ( "?" + API_URL_KEY + "=" + credentials.apiToken ); } - else{ + else { restUrl += ( "&" + API_URL_KEY + "=" + credentials.apiToken ); } requestHeader.api_key = credentials.apiToken; - if(credentials.authToken != null && credentials.authToken != ""){ + if (credentials.authToken != null && credentials.authToken != "") { restUrl += ( "&" + AUTH_TOKEN_URL_KEY + "=" + credentials.authToken ); requestHeader.auth_token = credentials.authToken; } @@ -30,7 +28,7 @@ internal class ApiUrlHelper { return restUrl; } - internal static function getProxyUrl(hostName: String, proxyPath: String): String{ + internal static function getProxyUrl(hostName:String, proxyPath:String):String { if (hostName(hostName.length - 1) == "/") //remove trailing slash { hostName = hostName.substring(0, hostName.length - 1); diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiUserCredentials.as b/modules/swagger-codegen/src/main/resources/flash/ApiUserCredentials.as index a7536c213e2..8e03c99a17f 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ApiUserCredentials.as +++ b/modules/swagger-codegen/src/main/resources/flash/ApiUserCredentials.as @@ -1,10 +1,28 @@ -package com.wordnik.swagger.common { +package io.swagger.common { /** * Api account credentials. * */ public class ApiUserCredentials { + /** + * Constructor of ApiUserCredentials + * @param apiToken An apitoken that is passed along with the requests + * @param authToken A valid auth_token which could necessary for certain operations + * @param hostName The host name for the Rest API eg. api.companyName.com + * @param userId The userId which is required for certain operations - currently, get user lists + */ + public function ApiUserCredentials(hostName:String, apiPath:String, apiToken:String, + authToken:String = null, userId:Number = -1, apiProxyServerUrl:String = "", + proxyPath:String = null) { + this.hostName = hostName; + this.apiToken = apiToken; + this.authToken = authToken; + this.userId = userId; + this.apiPath = apiPath; + this.apiProxyServerUrl = apiProxyServerUrl; + this.proxyPath = proxyPath; + } /** * An apitoken that is passed along with the requests */ @@ -21,43 +39,21 @@ public class ApiUserCredentials { * The host name for the Rest API eg. api.companyName.com */ public var hostName:String; - - /** - * The base path to the api resources - used along with the hostname - * eg. /v4 - */ - public var apiPath: String; - - /** - * The base path to the blazeds proxy - * eg. /v4/messagebroker/restproxy - */ - public var proxyPath: String; - - /** - * If a proxy server has been set up for the services specify the URL here. This value is used when the Api is invoked with - * the value useProxy as true - */ - public var apiProxyServerUrl: String; - /** - * Constructor of ApiUserCredentials - * @param apiToken An apitoken that is passed along with the requests - * @param authToken A valid auth_token which could necessary for certain operations - * @param hostName The host name for the Rest API eg. api.companyName.com - * @param userId The userId which is required for certain operations - currently, get user lists + * The base path to the api resources - used along with the hostname + * eg. /v4 */ - public function ApiUserCredentials(hostName: String, apiPath: String, apiToken: String, - authToken: String = null, userId: Number = -1, apiProxyServerUrl: String="", - proxyPath: String = null) { - this.hostName = hostName; - this.apiToken = apiToken; - this.authToken = authToken; - this.userId = userId; - this.apiPath = apiPath; - this.apiProxyServerUrl = apiProxyServerUrl; - this.proxyPath = proxyPath; - } + public var apiPath:String; + /** + * The base path to the blazeds proxy + * eg. /v4/messagebroker/restproxy + */ + public var proxyPath:String; + /** + * If a proxy server has been set up for the services specify the URL here. This value is used when the Api is invoked with + * the value useProxy as true + */ + public var apiProxyServerUrl:String; } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/ListWrapper.as b/modules/swagger-codegen/src/main/resources/flash/ListWrapper.as index 1ea2ebead00..20ac7cb555f 100644 --- a/modules/swagger-codegen/src/main/resources/flash/ListWrapper.as +++ b/modules/swagger-codegen/src/main/resources/flash/ListWrapper.as @@ -1,9 +1,7 @@ -package com.wordnik.swagger.common -{ - public interface ListWrapper - { - - function getList(): Array; - - } +package io.swagger.common { +public interface ListWrapper { + + function getList():Array; + +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/Response.as b/modules/swagger-codegen/src/main/resources/flash/Response.as index 56cceb61959..b225ab9b6ce 100644 --- a/modules/swagger-codegen/src/main/resources/flash/Response.as +++ b/modules/swagger-codegen/src/main/resources/flash/Response.as @@ -1,4 +1,4 @@ -package com.wordnik.swagger.event { +package io.swagger.event { /** * Response contains info on the result of an API invocation. @@ -6,50 +6,47 @@ package com.wordnik.swagger.event { */ public class Response { + private static const API_ERROR_MSG:String = "Api error response: "; + + private static function getFriendlyMessage(errorMessage:String):String { + var result:String = errorMessage; + if (errorMessage == null) + return null; + var errorCode:String; + var errorCodeArray:Array = errorMessage.match(/(?<=HTTP\/1.1 )[0-9][0-9][0-9]/); + if (errorCodeArray != null && errorCodeArray.length == 1) { + errorCode = String(errorCodeArray[0]); + } + var msgArray:Array = errorMessage.match(/(?<=HTTP\/1.1 [0-9][0-9][0-9] )[^]*/); + if (msgArray != null && msgArray.length == 1) { + result = API_ERROR_MSG + String(msgArray[0]); + } + return result; + } + + public function Response(isSuccessful:Boolean, payload:Object = null, errorMessage:String = null, requestId:String = null) { + this.isSuccess = isSuccessful; + this.payload = payload; + this.errorMessage = getFriendlyMessage(errorMessage); + } /** * Indicates whether the invoked operation failed or succeeded */ public var isSuccess:Boolean; - /** * The payload of the succesful operation eg. a Word in a WordRequest */ public var payload:Object; - /** * Error message in case of failure */ public var errorMessage:String; - /** * A request Id that was passed in by the user as a param when invoking the operation */ public var requestId:String; - private static const API_ERROR_MSG:String = "Api error response: "; - - public function Response(isSuccessful: Boolean, payload: Object = null, errorMessage: String = null, requestId: String = null) { - this.isSuccess = isSuccessful; - this.payload = payload; - this.errorMessage = getFriendlyMessage(errorMessage); - } - - private static function getFriendlyMessage(errorMessage: String): String{ - var result: String = errorMessage; - if(errorMessage == null) - return null; - var errorCode: String; - var errorCodeArray: Array = errorMessage.match(/(?<=HTTP\/1.1 )[0-9][0-9][0-9]/); - if(errorCodeArray != null && errorCodeArray.length == 1){ - errorCode = String(errorCodeArray[0]); - } - var msgArray: Array = errorMessage.match(/(?<=HTTP\/1.1 [0-9][0-9][0-9] )[^]*/); - if(msgArray != null && msgArray.length == 1){ - result = API_ERROR_MSG + String(msgArray[0]); - } - return result; - } - public function toString(): String { + public function toString():String { return "Response (requestId:" + requestId + "; isSuccess:" + isSuccess + "; errorMessage:" + errorMessage + "; payload:" + payload + ")"; } } diff --git a/modules/swagger-codegen/src/main/resources/flash/SwaggerApi.as b/modules/swagger-codegen/src/main/resources/flash/SwaggerApi.as index a78f3105cb1..23b96ec17f2 100644 --- a/modules/swagger-codegen/src/main/resources/flash/SwaggerApi.as +++ b/modules/swagger-codegen/src/main/resources/flash/SwaggerApi.as @@ -1,75 +1,63 @@ -package com.wordnik.swagger.common -{ - import com.wordnik.swagger.common.ApiUserCredentials; - - import flash.events.EventDispatcher; - import flash.events.IEventDispatcher; - - import mx.utils.UIDUtil; - - public class SwaggerApi extends EventDispatcher - { - - protected var _apiUsageCredentials:ApiUserCredentials; - protected var _apiEventNotifier:EventDispatcher; - protected var _apiInvoker: ApiInvoker; - - protected var _useProxyServer: Boolean = false; +package io.swagger.common { +public class SwaggerApi extends EventDispatcher { - - /** - * Constructor for the api client - * @param apiCredentials Wrapper object for tokens and hostName required towards authentication - * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response - */ - public function SwaggerApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) { - super(); - _apiUsageCredentials = apiCredentials; - _apiEventNotifier = eventDispatcher; - } - - public function useProxyServer(value:Boolean, proxyServerUrl: String = null):void { - _useProxyServer = value; - } - - protected function getApiInvoker():ApiInvoker { - if(_apiInvoker == null){ - if(_apiEventNotifier == null){ - _apiEventNotifier = this; - } - _apiInvoker = new ApiInvoker(_apiUsageCredentials, _apiEventNotifier, _useProxyServer); - } - return _apiInvoker; - } - - protected function getUniqueId():String { - return UIDUtil.createUID(); - } - - /** - * Method for returning the path value - * For a string value an empty value is returned if the value is null - * @param value - * @return - */ - protected static function toPathValue(value: Object): String { - if(value is Array){ - return arrayToPathValue(value as Array); - } - return value == null ? "" : value.toString(); - } - - /** - * Method for returning a path value - * For a list of objects a comma separated string is returned - * @param objects - * @return - */ - protected static function arrayToPathValue(objects: Array): String { - var out: String = ""; - - return objects.join(","); - } - - } + /** + * Method for returning the path value + * For a string value an empty value is returned if the value is null + * @param value + * @return + */ + protected static function toPathValue(value:Object):String { + if (value is Array) { + return arrayToPathValue(value as Array); + } + return value == null ? "" : value.toString(); + } + + /** + * Method for returning a path value + * For a list of objects a comma separated string is returned + * @param objects + * @return + */ + protected static function arrayToPathValue(objects:Array):String { + var out:String = ""; + + return objects.join(","); + } + + /** + * Constructor for the api client + * @param apiCredentials Wrapper object for tokens and hostName required towards authentication + * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response + */ + public function SwaggerApi(apiCredentials:ApiUserCredentials, eventDispatcher:EventDispatcher = null) { + super(); + _apiUsageCredentials = apiCredentials; + _apiEventNotifier = eventDispatcher; + } + protected var _apiUsageCredentials:ApiUserCredentials; + protected var _apiEventNotifier:EventDispatcher; + protected var _apiInvoker:ApiInvoker; + protected var _useProxyServer:Boolean = false; + + public function useProxyServer(value:Boolean, proxyServerUrl:String = null):void { + _useProxyServer = value; + } + + protected function getApiInvoker():ApiInvoker { + if (_apiInvoker == null) { + if (_apiEventNotifier == null) { + _apiEventNotifier = this; + } + _apiInvoker = new ApiInvoker(_apiUsageCredentials, _apiEventNotifier, _useProxyServer); + } + return _apiInvoker; + } + + protected function getUniqueId():String { + return UIDUtil.createUID(); + } + +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/XMLWriter.as b/modules/swagger-codegen/src/main/resources/flash/XMLWriter.as index 067f49e6301..ec4ab73455b 100644 --- a/modules/swagger-codegen/src/main/resources/flash/XMLWriter.as +++ b/modules/swagger-codegen/src/main/resources/flash/XMLWriter.as @@ -1,28 +1,24 @@ -package com.wordnik.swagger.common -{ - public class XMLWriter - { - public var xml:XML; - - public function XMLWriter() - { - xml=; - } - - public function reset():void { - xml=new XML(); - } - - public function addProperty(propertyName:String, propertyValue:String):XML { - var xmlProperty:XML= - xmlProperty.setName(propertyName); - xmlProperty.appendChild(propertyValue); - xml.appendChild(xmlProperty); - return xmlProperty; - } - - public function addAttribute(propertyName:String, attribute:String, attributeValue:String):void { - xml.elements(propertyName)[0].@[attribute]=attributeValue; - } - } +package io.swagger.common { +public class XMLWriter { + public function XMLWriter() { + xml = ; + } + public var xml:XML; + + public function reset():void { + xml = new XML(); + } + + public function addProperty(propertyName:String, propertyValue:String):XML { + var xmlProperty:XML = + xmlProperty.setName(propertyName); + xmlProperty.appendChild(propertyValue); + xml.appendChild(xmlProperty); + return xmlProperty; + } + + public function addAttribute(propertyName:String, attribute:String, attributeValue:String):void { + xml.elements(propertyName)[0].@[attribute] = attributeValue; + } +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/api.mustache b/modules/swagger-codegen/src/main/resources/flash/api.mustache index 647ec763a24..b00f2ee2c8a 100644 --- a/modules/swagger-codegen/src/main/resources/flash/api.mustache +++ b/modules/swagger-codegen/src/main/resources/flash/api.mustache @@ -1,11 +1,11 @@ package {{package}} { -import com.wordnik.swagger.common.ApiInvoker; -import com.wordnik.swagger.exception.ApiErrorCodes; -import com.wordnik.swagger.exception.ApiError; -import com.wordnik.swagger.common.ApiUserCredentials; -import com.wordnik.swagger.event.Response; -import com.wordnik.swagger.common.SwaggerApi; +import io.swagger.common.ApiInvoker; +import io.swagger.exception.ApiErrorCodes; +import io.swagger.exception.ApiError; +import io.swagger.common.ApiUserCredentials; +import io.swagger.event.Response; +import io.swagger.common.SwaggerApi; {{#imports}}import {{import}}; {{/imports}} @@ -15,26 +15,26 @@ import flash.utils.Dictionary; import flash.events.EventDispatcher; {{#operations}} -public class {{classname}} extends SwaggerApi { + public class {{classname}} extends SwaggerApi { /** * Constructor for the {{classname}} api client * @param apiCredentials Wrapper object for tokens and hostName required towards authentication * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response */ public function {{classname}}(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) { - super(apiCredentials, eventDispatcher); + super(apiCredentials, eventDispatcher); } -{{#operation}} + {{#operation}} public static const event_{{nickname}}: String = "{{nickname}}"; -{{/operation}} + {{/operation}} -{{#operation}} + {{#operation}} - /* - * Returns {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} - */ - public function {{nickname}} ({{#allParams}}{{paramName}}: {{{dataType}}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): String { + /* + * Returns {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} + */ + public function {{nickname}} ({{#allParams}}{{paramName}}: {{{dataType}}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): String { // create path and map variables var path: String = "{{path}}".replace(/{format}/g,"xml"){{#pathParams}}.replace("{" + "{{paramName}}" + "}", getApiInvoker().escapeString({{{paramName}}})){{/pathParams}}; @@ -43,14 +43,14 @@ public class {{classname}} extends SwaggerApi { var headerParams: Dictionary = new Dictionary(); {{#requiredParamCount}} - // verify required params are set - if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) { - throw new ApiError(400, "missing required params"); + // verify required params are set + if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) { + throw new ApiError(400, "missing required params"); } {{/requiredParamCount}} {{#queryParams}}if("null" != String({{paramName}})) - queryParams["{{paramName}}"] = toPathValue({{paramName}}); + queryParams["{{paramName}}"] = toPathValue({{paramName}}); {{/queryParams}} {{#headerParams}}headerParams["{{paramName}}"] = toPathValue({{paramName}}); @@ -66,8 +66,8 @@ public class {{classname}} extends SwaggerApi { token.returnType = {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}null {{/returnType}}; return requestId; - } + } {{/operation}} -} - {{/operations}} + } +{{/operations}} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/build.xml b/modules/swagger-codegen/src/main/resources/flash/build.xml index 6861dd464ec..4f021b0b8b2 100644 --- a/modules/swagger-codegen/src/main/resources/flash/build.xml +++ b/modules/swagger-codegen/src/main/resources/flash/build.xml @@ -62,11 +62,11 @@ - - - - - + + + + + diff --git a/modules/swagger-codegen/src/main/resources/flash/facetValue.as b/modules/swagger-codegen/src/main/resources/flash/facetValue.as index c6bfa1f27d1..e421c0498dc 100644 --- a/modules/swagger-codegen/src/main/resources/flash/facetValue.as +++ b/modules/swagger-codegen/src/main/resources/flash/facetValue.as @@ -1,8 +1,8 @@ package com.wordnik.client.model { - public class FacetValue { - public var value: String = null; - public var count: Number = 0; - } +public class FacetValue { + public var value:String = null; + public var count:Number = 0; +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/flash/model.mustache b/modules/swagger-codegen/src/main/resources/flash/model.mustache index c3369514e80..8f81853fb6d 100644 --- a/modules/swagger-codegen/src/main/resources/flash/model.mustache +++ b/modules/swagger-codegen/src/main/resources/flash/model.mustache @@ -4,37 +4,37 @@ package {{package}} { {{/imports}} {{#models}} -{{#model}} - [XmlRootNode(name="{{classname}}")] - public class {{classname}} { - {{#vars}} - - {{#description}}/* {{description}} */ - {{/description}} - - {{#isList}} - // This declaration below of _{{name}}_obj_class is to force flash compiler to include this class - private var _{{name}}_obj_class: {{baseType}} = null; - [XmlElementWrapper(name="{{name}}")] - [XmlElements(name="{{nameSingular}}", type="{{baseType}}")] - {{/isList}} - {{#isNotContainer}}[XmlElement(name="{{name}}")] - {{/isNotContainer}} - public var {{name}}: {{{datatype}}} = {{{defaultValue}}}; - - {{/vars}} + {{#model}} + [XmlRootNode(name="{{classname}}")] + public class {{classname}} { + {{#vars}} + + {{#description}}/* {{description}} */ + {{/description}} + + {{#isList}} + // This declaration below of _{{name}}_obj_class is to force flash compiler to include this class + private var _{{name}}_obj_class: {{baseType}} = null; + [XmlElementWrapper(name="{{name}}")] + [XmlElements(name="{{nameSingular}}", type="{{baseType}}")] + {{/isList}} + {{#isNotContainer}}[XmlElement(name="{{name}}")] + {{/isNotContainer}} + public var {{name}}: {{{datatype}}} = {{{defaultValue}}}; + + {{/vars}} public function toString(): String { - var str: String = "{{classname}}: "; - {{#vars}} + var str: String = "{{classname}}: "; + {{#vars}} str += " ({{name}}: " + {{name}} + ")"; - {{/vars}} - return str; + {{/vars}} + return str; } -} -{{/model}} - {{/models}} + } + {{/model}} +{{/models}} } diff --git a/modules/swagger-codegen/src/main/resources/flash/modelList.mustache b/modules/swagger-codegen/src/main/resources/flash/modelList.mustache index b0c3bd73f83..423aaf8d961 100644 --- a/modules/swagger-codegen/src/main/resources/flash/modelList.mustache +++ b/modules/swagger-codegen/src/main/resources/flash/modelList.mustache @@ -1,23 +1,23 @@ package {{package}} { -import com.wordnik.swagger.common.ListWrapper; +import io.swagger.common.ListWrapper; {{#imports}}import {{import}}; {{/imports}} {{#models}} -{{#model}} - public class {{classname}}List implements ListWrapper { + {{#model}} + public class {{classname}}List implements ListWrapper { // This declaration below of _{{name}}_obj_class is to force flash compiler to include this class private var _{{classVarName}}_obj_class: {{package}}.{{classname}} = null; [XmlElements(name="{{classVarName}}", type="{{package}}.{{classname}}")] public var {{classVarName}}: Array = new Array(); public function getList(): Array{ - return {{classVarName}}; + return {{classVarName}}; } -} -{{/model}} - {{/models}} + } + {{/model}} +{{/models}} } diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache index 2fd81183a5b..b9adf4d8d92 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache @@ -1,3 +1,5 @@ -{{#isBodyParam}}
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
+{{#isBodyParam}} +
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
-
Body Parameter — {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}
{{/isBodyParam}} \ No newline at end of file +
Body Parameter — {{description}} {{#defaultValue}} + default: {{{defaultValue}}}{{/defaultValue}}
{{/isBodyParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache index 97f342e60d7..66770da842e 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache @@ -1,3 +1,5 @@ -{{#isFormParam}}
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
+{{#isFormParam}} +
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
-
Form Parameter — {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}
{{/isFormParam}} \ No newline at end of file +
Form Parameter — {{description}} {{#defaultValue}} + default: {{{defaultValue}}}{{/defaultValue}}
{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache index 903713493be..709b79e3738 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache @@ -1,3 +1,5 @@ -{{#isHeaderParam}}
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
+{{#isHeaderParam}} +
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
-
Header Parameter — {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}
{{/isHeaderParam}} \ No newline at end of file +
Header Parameter — {{description}} {{#defaultValue}} + default: {{{defaultValue}}}{{/defaultValue}}
{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache index ce881084bc2..09248273010 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache @@ -1,61 +1,76 @@ - - + + API Reference - - -

{{{appName}}}

-
{{{appDescription}}} for {{partner}}
- {{#infoUrl}}
More information: {{{infoUrl}}}
{{/infoUrl}} - {{#infoEmail}}
Contact Info: {{{infoEmail}}}
{{/infoEmail}} - {{#version}}
Version: {{{version}}}
{{/version}} -
{{{licenseInfo}}}
-
{{{licenseUrl}}}
-

Access

-
Customize this message as you see fit!
-

Methods

- {{#apiInfo}} - {{#apis}} - {{#operations}}{{#operation}} -
- 
{{httpMethod}}: {{path}}
-
{{#tags}}{{this}}{{/tags}}
-
{{nickname}} {{summary}}
-
{{notes}}
- -

Parameters

-
- {{#allParams}}{{>queryParam}}{{>pathParam}}{{>bodyParam}}{{>headerParam}}{{>formParam}} - {{/allParams}} -
-

Return type

- -
{{{returnType}}}
- - {{#examples}} -

Example data

-
Content-Type: {{{contentType}}}
- 
{{example}}
- {{/examples}} -
-
- {{/operation}}{{/operations}} - {{/apis}}{{/apiInfo}} - -

Models

- {{#models}} - {{#model}} -
-

{{classname}}

-
- {{#vars}}
{{name}} {{#isNotRequired}}(optional){{/isNotRequired}}
{{datatype}} {{description}}
- {{/vars}} -
-
- {{/model}} - {{/models}} - - + + +

{{{appName}}}

+ +
{{{appDescription}}} for {{partner}}
+{{#infoUrl}} +
More information: {{{infoUrl}}}
{{/infoUrl}} +{{#infoEmail}} +
Contact Info: {{{infoEmail}}}
{{/infoEmail}} +{{#version}} +
Version: {{{version}}}
{{/version}} +
{{{licenseInfo}}}
+
{{{licenseUrl}}}
+

Access

+ +
Customize this message as you see fit!
+

Methods

+{{#apiInfo}} + {{#apis}} + {{#operations}}{{#operation}} +
+
+ 
{{httpMethod}}: {{path}}
+
+
{{#tags}}{{this}}{{/tags}}
+
{{nickname}} {{summary}}
+
{{notes}}
+ +

Parameters

+ +
+ {{#allParams}}{{>queryParam}}{{>pathParam}}{{>bodyParam}}{{>headerParam}}{{>formParam}} + {{/allParams}} +
+ +

Return type

+ +
{{{returnType}}}
+ + {{#examples}} +

Example data

+ +
Content-Type: {{{contentType}}}
+ 
{{example}}
+ {{/examples}} +
+ +
+ {{/operation}}{{/operations}} + {{/apis}}{{/apiInfo}} + +

Models

+{{#models}} + {{#model}} +
+

{{classname}}

+ +
+ {{#vars}} +
{{name}} {{#isNotRequired}}(optional){{/isNotRequired}}
+
{{datatype}} {{description}}
+ {{/vars}} +
+ +
+ {{/model}} +{{/models}} + + \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache index b47805a4f04..6270f601c8a 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache @@ -1,3 +1,5 @@ -{{#isPathParam}}
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
+{{#isPathParam}} +
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
-
Path Parameter — {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}
{{/isPathParam}} \ No newline at end of file +
Path Parameter — {{description}} {{#defaultValue}} + default: {{{defaultValue}}}{{/defaultValue}}
{{/isPathParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache index 52147fbd718..323ace6a27e 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache @@ -1,3 +1,5 @@ -{{#isQueryParam}}
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
+{{#isQueryParam}} +
{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
-
Query Parameter — {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}
{{/isQueryParam}} \ No newline at end of file +
Query Parameter — {{description}} {{#defaultValue}} + default: {{{defaultValue}}}{{/defaultValue}}
{{/isQueryParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache index 14ab06a7f7e..d628ff11ff8 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache @@ -1,151 +1,151 @@ -body { - font-family: Trebuchet MS, sans-serif; - font-size: 15px; - color: #444; - margin-right: 24px; +body { +font-family: Trebuchet MS, sans-serif; +font-size: 15px; +color: #444; +margin-right: 24px; } -h1 { - font-size: 25px; +h1 { +font-size: 25px; } -h2 { - font-size: 20px; +h2 { +font-size: 20px; } -h3 { - font-size: 16px; - font-weight: bold; +h3 { +font-size: 16px; +font-weight: bold; } -hr { - height: 1px; - border: 0; - color: #ddd; - background-color: #ddd; - display: none; +hr { +height: 1px; +border: 0; +color: #ddd; +background-color: #ddd; +display: none; } .app-desc { - clear: both; - margin-left: 20px; +clear: both; +margin-left: 20px; } .param-name { - width: 100%; +width: 100%; } .license-info { - margin-left: 20px; +margin-left: 20px; } .license-url { - margin-left: 20px; +margin-left: 20px; } .model { - margin: 0 0 0px 20px; +margin: 0 0 0px 20px; } .method { - margin-left: 20px; +margin-left: 20px; } -.method-notes { - margin: 10px 0 20px 0; - font-size: 90%; - color: #555; +.method-notes { +margin: 10px 0 20px 0; +font-size: 90%; +color: #555; } pre { - padding: 10px; - margin-bottom: 2px; +padding: 10px; +margin-bottom: 2px; } pre.get { - background-color: #0f6ab4; +background-color: #0f6ab4; } pre.post { - background-color: #10a54a; +background-color: #10a54a; } pre.put { - background-color: #c5862b; +background-color: #c5862b; } pre.delete { - background-color: #a41e22; +background-color: #a41e22; } -.huge { - color: #fff; +.huge { +color: #fff; } pre.example { - background-color: #f3f3f3; - padding: 10px; - border: 1px solid #ddd; +background-color: #f3f3f3; +padding: 10px; +border: 1px solid #ddd; } code { - white-space: pre; +white-space: pre; } .nickname { - font-weight: bold; +font-weight: bold; } .method-path { - font-size: 1.5em; - background-color: #0f6ab4; +font-size: 1.5em; +background-color: #0f6ab4; } .parameter { - width: 500px; +width: 500px; } .param { - width: 500px; - padding: 10px 0 0 20px; - font-weight: bold; +width: 500px; +padding: 10px 0 0 20px; +font-weight: bold; } .param-desc { - width: 700px; - padding: 0 0 0 20px; - color: #777; +width: 700px; +padding: 0 0 0 20px; +color: #777; } .param-type { - font-style: italic; +font-style: italic; } .field-label { - padding: 0; - margin: 0; - clear: both; +padding: 0; +margin: 0; +clear: both; } -.field-items { - padding: 0 0 15px 0; - margin-bottom: 15px; +.field-items { +padding: 0 0 15px 0; +margin-bottom: 15px; } .return-type { - clear: both; - padding-bottom: 10px; +clear: both; +padding-bottom: 10px; } .param-header { - font-weight: bold; +font-weight: bold; } .method-tags { - text-align: right; +text-align: right; } .method-tag { - background: none repeat scroll 0% 0% #24A600; - border-radius: 3px; - padding: 2px 10px; - margin: 2px; - color: #FFF; - display: inline-block; - text-decoration: none; +background: none repeat scroll 0% 0% #24A600; +border-radius: 3px; +padding: 2px 10px; +margin: 2px; +color: #FFF; +display: inline-block; +text-decoration: none; } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/logback.xml b/modules/swagger-codegen/src/main/resources/logback.xml index c7d0db9d3a2..010fdca0cfe 100644 --- a/modules/swagger-codegen/src/main/resources/logback.xml +++ b/modules/swagger-codegen/src/main/resources/logback.xml @@ -1,12 +1,12 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + diff --git a/modules/swagger-codegen/src/main/resources/nodejs/README.mustache b/modules/swagger-codegen/src/main/resources/nodejs/README.mustache index a8da1d0a9ea..edeea0005c0 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/README.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/README.mustache @@ -5,7 +5,7 @@ This server was generated by the [swagger-codegen](https://github.com/swagger-ap This example uses the [expressjs](http://expressjs.com/) framework. To see how to make this your own, look here: -[README](https://github.com/wordnik/swagger-codegen/README.md) +[README](https://github.com/swagger-api/swagger-codegen/README.md) ### Running the server To run the server, follow these simple steps: diff --git a/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache b/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache index 85d1f3211a1..f0300e95656 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/controller.mustache @@ -4,22 +4,22 @@ var url = require('url'); {{#operations}} -var {{classname}} = require('./{{classname}}Service'); + var {{classname}} = require('./{{classname}}Service'); -{{#operation}} + {{#operation}} -module.exports.{{nickname}} = function {{nickname}} (req, res, next) { - {{#allParams}}var {{paramName}} = req.swagger.params['{{baseName}}'].value; - {{/allParams}} + 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}}); + 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(); -}; -{{/operation}} + if(typeof result !== 'undefined') { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify(result || {}, null, 2)); + } + else + res.end(); + }; + {{/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 0562c2f0c37..57d0ff040c9 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/index.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/index.mustache @@ -8,9 +8,9 @@ var serverPort = {{serverPort}}; // swaggerRouter configuration var options = { - swaggerUi: '/swagger.json', - controllers: './controllers', - useStubs: process.env.NODE_ENV === 'development' ? true : false // Conditionally turn on stubs (mock mode) +swaggerUi: '/swagger.json', +controllers: './controllers', +useStubs: process.env.NODE_ENV === 'development' ? true : false // Conditionally turn on stubs (mock mode) }; // The Swagger document (require it, build it programmatically, fetch it from a URL, ...) @@ -18,21 +18,21 @@ var swaggerDoc = require('./api/swagger.json'); // Initialize the Swagger middleware swaggerTools.initializeMiddleware(swaggerDoc, function (middleware) { - // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain - app.use(middleware.swaggerMetadata()); +// Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain +app.use(middleware.swaggerMetadata()); - // Validate Swagger requests - app.use(middleware.swaggerValidator()); +// Validate Swagger requests +app.use(middleware.swaggerValidator()); - // Route validated requests to appropriate controller - app.use(middleware.swaggerRouter(options)); +// Route validated requests to appropriate controller +app.use(middleware.swaggerRouter(options)); - // Serve the Swagger documents and Swagger UI - app.use(middleware.swaggerUi()); +// Serve the Swagger documents and Swagger UI +app.use(middleware.swaggerUi()); - // Start the server - http.createServer(app).listen({{serverPort}}, function () { - console.log('Your server is listening on port %d (http://localhost:%d)', {{serverPort}}, {{serverPort}}); - console.log('Swagger-ui is available on http://localhost:%d/docs', {{serverPort}}); - }); +// Start the server +http.createServer(app).listen({{serverPort}}, function () { +console.log('Your server is listening on port %d (http://localhost:%d)', {{serverPort}}, {{serverPort}}); +console.log('Swagger-ui is available on http://localhost:%d/docs', {{serverPort}}); +}); }); \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache index 7add6e813fe..ace5125d47a 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache @@ -1,15 +1,15 @@ { - "name": "{{projectName}}", - "version": "{{appVersion}}", - "description": "{{appDescription}}", - "main": "index.js", - "keywords": [ - "swagger" - ], - "license": "MIT", - "private": true, - "dependencies": { - "connect": "^3.2.0", - "swagger-tools": "0.8.*" - } +"name": "{{projectName}}", +"version": "{{appVersion}}", +"description": "{{appDescription}}", +"main": "index.js", +"keywords": [ +"swagger" +], +"license": "MIT", +"private": true, +"dependencies": { +"connect": "^3.2.0", +"swagger-tools": "0.8.*" +} } diff --git a/modules/swagger-codegen/src/main/resources/nodejs/service.mustache b/modules/swagger-codegen/src/main/resources/nodejs/service.mustache index d7c2ade5079..76d582a0356 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/service.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/service.mustache @@ -1,18 +1,18 @@ 'use strict'; {{#operations}} -{{#operation}} -exports.{{nickname}} = function({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { + {{#operation}} + exports.{{nickname}} = function({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { - var examples = {}; - {{#examples}} - examples['{{contentType}}'] = {{{example}}}; - {{/examples}} + var examples = {}; + {{#examples}} + examples['{{contentType}}'] = {{{example}}}; + {{/examples}} - {{#returnType}} - if(Object.keys(examples).length > 0) - return examples[Object.keys(examples)[0]]; - {{/returnType}} -} -{{/operation}} + {{#returnType}} + if(Object.keys(examples).length > 0) + return examples[Object.keys(examples)[0]]; + {{/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 8b4c8d33bdc..ed6a91567ad 100644 --- a/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache +++ b/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache @@ -1,42 +1,42 @@ { - "swagger": "2.0", - "info": { - "title": "{{appName}}", - "description": "{{appDescription}}", - "version": "{{apiVersion}}" - }, +"swagger": "2.0", +"info": { +"title": "{{appName}}", +"description": "{{appDescription}}", +"version": "{{apiVersion}}" +}, {{#apiInfo}} - "produces": ["application/json"], - "host": "localhost:{{serverPort}}", - "basePath": "{{contextPath}}", - "paths": { -{{#apis}} -{{#operations}} - {{#operation}} - "{{{path}}}": { - "{{httpMethod}}": { - "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}} -{{/operations}} -{{/apis}} + "produces": ["application/json"], + "host": "localhost:{{serverPort}}", + "basePath": "{{contextPath}}", + "paths": { + {{#apis}} + {{#operations}} + {{#operation}} + "{{{path}}}": { + "{{httpMethod}}": { + "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}} + {{/operations}} + {{/apis}} {{/apiInfo}} - }, "definitions": { - {{#models}}{{#model}}"{{classVarName}}": {{{modelJson}}}{{#hasMoreModels}},{{/hasMoreModels}}{{/model}}{{/models}} - } +}, "definitions": { +{{#models}}{{#model}}"{{classVarName}}": {{{modelJson}}}{{#hasMoreModels}},{{/hasMoreModels}}{{/model}}{{/models}} +} } diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache b/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache index 1e5e7135574..86ef0c702af 100644 --- a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache @@ -12,88 +12,88 @@ #pragma mark - Singletion Methods + (instancetype) sharedConfig { - static SWGConfiguration *shardConfig = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - shardConfig = [[self alloc] init]; - }); - return shardConfig; +static SWGConfiguration *shardConfig = nil; +static dispatch_once_t onceToken; +dispatch_once(&onceToken, ^{ +shardConfig = [[self alloc] init]; +}); +return shardConfig; } #pragma mark - Initialize Methods - (instancetype) init { - self = [super init]; - if (self) { - self.username = @""; - self.password = @""; - self.mutableApiKey = [NSMutableDictionary dictionary]; - self.mutableApiKeyPrefix = [NSMutableDictionary dictionary]; - } - return self; +self = [super init]; +if (self) { +self.username = @""; +self.password = @""; +self.mutableApiKey = [NSMutableDictionary dictionary]; +self.mutableApiKeyPrefix = [NSMutableDictionary dictionary]; +} +return self; } #pragma mark - Instance Methods - (NSString *) getApiKeyWithPrefix:(NSString *)key { - if ([self.apiKeyPrefix objectForKey:key] && [self.apiKey objectForKey:key]) { - return [NSString stringWithFormat:@"%@ %@", [self.apiKeyPrefix objectForKey:key], [self.apiKey objectForKey:key]]; - } - else if ([self.apiKey objectForKey:key]) { - return [NSString stringWithFormat:@"%@", [self.apiKey objectForKey:key]]; - } - else { - return @""; - } +if ([self.apiKeyPrefix objectForKey:key] && [self.apiKey objectForKey:key]) { +return [NSString stringWithFormat:@"%@ %@", [self.apiKeyPrefix objectForKey:key], [self.apiKey objectForKey:key]]; +} +else if ([self.apiKey objectForKey:key]) { +return [NSString stringWithFormat:@"%@", [self.apiKey objectForKey:key]]; +} +else { +return @""; +} } - (NSString *) getBasicAuthToken { - NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password]; - NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding]; - basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]]; - - return basicAuthCredentials; +NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password]; +NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding]; +basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]]; + +return basicAuthCredentials; } #pragma mark - Setter Methods - (void) setValue:(NSString *)value forApiKeyField:(NSString *)field { - [self.mutableApiKey setValue:value forKey:field]; +[self.mutableApiKey setValue:value forKey:field]; } - (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field { - [self.mutableApiKeyPrefix setValue:value forKey:field]; +[self.mutableApiKeyPrefix setValue:value forKey:field]; } #pragma mark - Getter Methods - (NSDictionary *) apiKey { - return [NSDictionary dictionaryWithDictionary:self.mutableApiKey]; +return [NSDictionary dictionaryWithDictionary:self.mutableApiKey]; } - (NSDictionary *) apiKeyPrefix { - return [NSDictionary dictionaryWithDictionary:self.mutableApiKeyPrefix]; +return [NSDictionary dictionaryWithDictionary:self.mutableApiKeyPrefix]; } #pragma mark - - (NSDictionary *) authSettings { - return @{ {{#authMethods}}{{#isApiKey}} - @"{{name}}": @{ - @"type": @"api_key", - @"in": {{#isKeyInHeader}}@"header"{{/isKeyInHeader}}{{#isKeyInQuery}}@"query"{{/isKeyInQuery}}, - @"key": @"{{keyParamName}}", - @"value": [self getApiKeyWithPrefix:@"{{keyParamName}}"] - }, - {{/isApiKey}}{{#isBasic}} - @"{{name}}": @{ - @"type": @"basic", - @"in": @"header", - @"key": @"Authorization", - @"value": [self getBasicAuthToken] - }, - {{/isBasic}}{{/authMethods}} - }; +return @{ {{#authMethods}}{{#isApiKey}} + @"{{name}}": @{ + @"type": @"api_key", + @"in": {{#isKeyInHeader}}@"header"{{/isKeyInHeader}}{{#isKeyInQuery}}@"query"{{/isKeyInQuery}}, + @"key": @"{{keyParamName}}", + @"value": [self getApiKeyWithPrefix:@"{{keyParamName}}"] + }, +{{/isApiKey}}{{#isBasic}} + @"{{name}}": @{ + @"type": @"basic", + @"in": @"header", + @"key": @"Authorization", + @"value": [self getBasicAuthToken] + }, +{{/isBasic}}{{/authMethods}} +}; } @end diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache b/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache index 33023ca3c6f..529e07aa81c 100644 --- a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache @@ -1,56 +1,57 @@ -#import +#import + @interface SWGConfiguration : NSObject /** - * Api key values for Api Key type Authentication - * - * To add or remove api key, use `setValue:forApiKeyField:`. - */ +* Api key values for Api Key type Authentication +* +* To add or remove api key, use `setValue:forApiKeyField:`. +*/ @property (readonly, nonatomic, strong) NSDictionary *apiKey; /** - * Api key prefix values to be prepend to the respective api key - * - * To add or remove prefix, use `setValue:forApiKeyPrefixField:`. - */ +* Api key prefix values to be prepend to the respective api key +* +* To add or remove prefix, use `setValue:forApiKeyPrefixField:`. +*/ @property (readonly, nonatomic, strong) NSDictionary *apiKeyPrefix; /** - * Usename and Password for Basic type Authentication - */ +* Usename and Password for Basic type Authentication +*/ @property (nonatomic) NSString *username; @property (nonatomic) NSString *password; /** - * Get configuration singleton instance - */ +* Get configuration singleton instance +*/ + (instancetype) sharedConfig; /** - * Sets field in `apiKey` - */ +* Sets field in `apiKey` +*/ - (void) setValue:(NSString *)value forApiKeyField:(NSString*)field; /** - * Sets field in `apiKeyPrefix` - */ +* Sets field in `apiKeyPrefix` +*/ - (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field; /** - * Get API key (with prefix if set) - */ +* Get API key (with prefix if set) +*/ - (NSString *) getApiKeyWithPrefix:(NSString *) key; /** - * Get Basic Auth token - */ +* Get Basic Auth token +*/ - (NSString *) getBasicAuthToken; /** - * Get Authentication Setings - */ +* Get Authentication Setings +*/ - (NSDictionary *) authSettings; @end diff --git a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache index 40d75bd806b..b01f59a6857 100644 --- a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache @@ -1,226 +1,226 @@ {{#operations}} -#import "{{classname}}.h" -#import "SWGFile.h" -#import "SWGQueryParamCollection.h" -{{#imports}}#import "{{import}}.h" -{{/imports}} -{{newline}} - -@interface {{classname}} () + #import "{{classname}}.h" + #import "SWGFile.h" + #import "SWGQueryParamCollection.h" + {{#imports}}#import "{{import}}.h" + {{/imports}} + {{newline}} + + @interface {{classname}} () @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders; -@end + @end -@implementation {{classname}} + @implementation {{classname}} -static NSString * basePath = @"{{basePath}}"; + static NSString * basePath = @"{{basePath}}"; -#pragma mark - Initialize methods + #pragma mark - Initialize methods -- (id) init { + - (id) init { self = [super init]; if (self) { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - self.defaultHeaders = [NSMutableDictionary dictionary]; + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -- (id) initWithApiClient:(SWGApiClient *)apiClient { + - (id) initWithApiClient:(SWGApiClient *)apiClient { self = [super init]; if (self) { - if (apiClient) { - self.apiClient = apiClient; - } - else { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - } - self.defaultHeaders = [NSMutableDictionary dictionary]; + if (apiClient) { + self.apiClient = apiClient; + } + else { + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + } + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -#pragma mark - + #pragma mark - -+({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { + +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { static {{classname}}* singletonAPI = nil; if (singletonAPI == nil) { - singletonAPI = [[{{classname}} alloc] init]; - [singletonAPI addHeader:headerValue forKey:key]; + singletonAPI = [[{{classname}} alloc] init]; + [singletonAPI addHeader:headerValue forKey:key]; } return singletonAPI; -} + } -+(void) setBasePath:(NSString*)path { + +(void) setBasePath:(NSString*)path { basePath = path; -} + } -+(NSString*) getBasePath { + +(NSString*) getBasePath { return basePath; -} + } --(void) addHeader:(NSString*)value forKey:(NSString*)key { + -(void) addHeader:(NSString*)value forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(void) setHeaderValue:(NSString*) value - forKey:(NSString*)key { + -(void) setHeaderValue:(NSString*) value + forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(unsigned long) requestQueueSize { + -(unsigned long) requestQueueSize { return [SWGApiClient requestQueueSize]; -} + } -{{#operation}} -/*! - * {{{summary}}} - * {{{notes}}} -{{#allParams}} * \param {{paramName}} {{{description}}} -{{/allParams}} * \returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - */ --(NSNumber*) {{nickname}}WithCompletionBlock{{^allParams}}: {{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}} + {{#operation}} + /*! + * {{{summary}}} + * {{{notes}}} + {{#allParams}} * \param {{paramName}} {{{description}}} + {{/allParams}} * \returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + */ + -(NSNumber*) {{nickname}}WithCompletionBlock{{^allParams}}: {{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}} {{/allParams}} {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock{{/returnBaseType}} {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock{{/returnBaseType}} { - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - NSAssert({{paramName}} != nil, @"Missing the required parameter `{{paramName}}` when calling {{nickname}}"); - {{/required}}{{/allParams}} + {{#allParams}}{{#required}} + // verify the required parameter '{{paramName}}' is set + NSAssert({{paramName}} != nil, @"Missing the required parameter `{{paramName}}` when calling {{nickname}}"); + {{/required}}{{/allParams}} - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@{{path}}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@{{path}}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - {{#pathParams}}[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"{{baseName}}", @"}"]] withString: [SWGApiClient escape:{{paramName}}]]; - {{/pathParams}} + {{#pathParams}}[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"{{baseName}}", @"}"]] withString: [SWGApiClient escape:{{paramName}}]]; + {{/pathParams}} - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - {{#queryParams}}if({{paramName}} != nil) { + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + {{#queryParams}}if({{paramName}} != nil) { {{#collectionFormat}} - queryParams[@"{{baseName}}"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"]; + queryParams[@"{{baseName}}"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"]; {{/collectionFormat}} {{^collectionFormat}}queryParams[@"{{baseName}}"] = {{paramName}};{{/collectionFormat}} - } - {{/queryParams}} - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + } + {{/queryParams}} + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - {{#headerParams}}if({{paramName}} != nil) + {{#headerParams}}if({{paramName}} != nil) headerParams[@"{{baseName}}"] = {{paramName}}; - {{/headerParams}} - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]]; - if ([headerParams[@"Accept"] length] == 0) { + {{/headerParams}} + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}]]; - // Authentication setting - NSArray *authSettings = @[{{#authMethods}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}}]; - - id bodyDictionary = nil; - {{#bodyParam}} - id __body = {{paramName}}; + // Authentication setting + NSArray *authSettings = @[{{#authMethods}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}}]; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + id bodyDictionary = nil; + {{#bodyParam}} + id __body = {{paramName}}; + + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - {{/bodyParam}} - {{^bodyParam}} - - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - - {{#formParams}} - {{#notFile}} - formParams[@"{{paramName}}"] = {{paramName}}; - {{/notFile}}{{#isFile}} - requestContentType = @"multipart/form-data"; - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - if({{paramName}} != nil) { - [bodyDictionary addObject:{{paramName}}]; - {{paramName}}.paramName = @"{{baseName}}"; - } - {{/isFile}} - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - [bodyDictionary addObject:formParams]; - {{/formParams}} - {{/bodyParam}} - - {{#requiredParamCount}} - {{#requiredParams}} - if({{paramName}} == nil) { - // error - } - {{/requiredParams}} - {{/requiredParamCount}} - - {{#returnContainer}} - // response is in a container - {{>apiBodyResponseWithContainer}}{{/returnContainer}} - - {{#returnSimpleType}} - // non container response - - {{#returnTypeIsPrimitive}} - // primitive response - {{>apiPrimitiveResponse}}{{/returnTypeIsPrimitive}} - - {{#returnBaseType}} - // complex response - {{>apiNonPrimitiveResponse}}{{/returnBaseType}} - {{/returnSimpleType}} - - {{^returnSimpleType}}{{^returnContainer}} - // it's void - {{>voidResponse}} - {{/returnContainer}}{{/returnSimpleType}} -} + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + {{/bodyParam}} + {{^bodyParam}} + + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + + {{#formParams}} + {{#notFile}} + formParams[@"{{paramName}}"] = {{paramName}}; + {{/notFile}}{{#isFile}} + requestContentType = @"multipart/form-data"; + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + if({{paramName}} != nil) { + [bodyDictionary addObject:{{paramName}}]; + {{paramName}}.paramName = @"{{baseName}}"; + } + {{/isFile}} + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + [bodyDictionary addObject:formParams]; + {{/formParams}} + {{/bodyParam}} + + {{#requiredParamCount}} + {{#requiredParams}} + if({{paramName}} == nil) { + // error + } + {{/requiredParams}} + {{/requiredParamCount}} + + {{#returnContainer}} + // response is in a container + {{>apiBodyResponseWithContainer}}{{/returnContainer}} + + {{#returnSimpleType}} + // non container response + + {{#returnTypeIsPrimitive}} + // primitive response + {{>apiPrimitiveResponse}}{{/returnTypeIsPrimitive}} + + {{#returnBaseType}} + // complex response + {{>apiNonPrimitiveResponse}}{{/returnBaseType}} + {{/returnSimpleType}} + + {{^returnSimpleType}}{{^returnContainer}} + // it's void + {{>voidResponse}} + {{/returnContainer}}{{/returnSimpleType}} + } -{{/operation}} + {{/operation}} -{{newline}} + {{newline}} {{/operations}} @end diff --git a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache index 65f4c39e0b3..74c55d3ffa4 100644 --- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache @@ -1,4 +1,5 @@ -#import +#import + {{#imports}}#import "{{import}}.h" {{/imports}} #import "SWGObject.h" @@ -6,36 +7,36 @@ {{newline}} {{#operations}} -@interface {{classname}}: NSObject - -@property(nonatomic, assign)SWGApiClient *apiClient; - --(instancetype) initWithApiClient:(SWGApiClient *)apiClient; --(void) addHeader:(NSString*)value forKey:(NSString*)key; --(unsigned long) requestQueueSize; -+({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; -+(void) setBasePath:(NSString*)basePath; -+(NSString*) getBasePath; -{{#operation}} -/** - - {{{summary}}} - {{#notes}}{{{notes}}}{{/notes}} - - {{#allParams}}@param {{paramName}} {{description}} - {{/allParams}} - - return type: {{{returnType}}} - */ --(NSNumber*) {{nickname}}WithCompletionBlock {{^allParams}}:{{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}:({{{dataType}}}) {{paramName}} {{#hasMore}} -{{/hasMore}}{{/allParams}} - {{#returnBaseType}}{{#hasParams}} - completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock;{{/returnBaseType}} - {{^returnBaseType}}{{#hasParams}} - completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock;{{/returnBaseType}} - -{{newline}} -{{/operation}} + @interface {{classname}}: NSObject + + @property(nonatomic, assign)SWGApiClient *apiClient; + + -(instancetype) initWithApiClient:(SWGApiClient *)apiClient; + -(void) addHeader:(NSString*)value forKey:(NSString*)key; + -(unsigned long) requestQueueSize; + +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; + +(void) setBasePath:(NSString*)basePath; + +(NSString*) getBasePath; + {{#operation}} + /** + + {{{summary}}} + {{#notes}}{{{notes}}}{{/notes}} + + {{#allParams}}@param {{paramName}} {{description}} + {{/allParams}} + + return type: {{{returnType}}} + */ + -(NSNumber*) {{nickname}}WithCompletionBlock {{^allParams}}:{{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}:({{{dataType}}}) {{paramName}} {{#hasMore}} + {{/hasMore}}{{/allParams}} + {{#returnBaseType}}{{#hasParams}} + completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock;{{/returnBaseType}} + {{^returnBaseType}}{{#hasParams}} + completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock;{{/returnBaseType}} + + {{newline}} + {{/operation}} {{/operations}} @end diff --git a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache b/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache index acaeaf2ddf5..48d49a2f1ca 100644 --- a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache @@ -1,38 +1,38 @@ - // {{returnContainer}} container response type - return [self.apiClient dictionary: requestUrl - method: @"{{httpMethod}}" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - {{#returnBaseType}}completionBlock(nil, error);{{/returnBaseType}}{{^returnBaseType}}completionBlock(error);{{/returnBaseType}} - return; - } - {{#isMapContainer}} - NSDictionary *result = nil; - if (data) { - result = [[NSDictionary alloc]initWithDictionary: data]; - } - completionBlock(data, nil); - {{/isMapContainer}}{{#isListContainer}} - {{#returnBaseType}}if([data isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]]; - for (NSDictionary* dict in (NSArray*)data) { - {{#returnTypeIsPrimitive}} - {{returnBaseType}}* d = [[{{{returnBaseType}}} alloc]initWithString: dict]; - {{/returnTypeIsPrimitive}} - {{^returnTypeIsPrimitive}} - {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc] initWithDictionary:dict error:nil]; - {{/returnTypeIsPrimitive}} - [objs addObject:d]; - } - completionBlock(({{{returnType}}})objs, nil); - } - {{/returnBaseType}} - {{/isListContainer}} - }]; +// {{returnContainer}} container response type +return [self.apiClient dictionary: requestUrl +method: @"{{httpMethod}}" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSDictionary *data, NSError *error) { +if (error) { +{{#returnBaseType}}completionBlock(nil, error);{{/returnBaseType}}{{^returnBaseType}}completionBlock(error);{{/returnBaseType}} +return; +} +{{#isMapContainer}} + NSDictionary *result = nil; + if (data) { + result = [[NSDictionary alloc]initWithDictionary: data]; + } + completionBlock(data, nil); +{{/isMapContainer}}{{#isListContainer}} + {{#returnBaseType}}if([data isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]]; + for (NSDictionary* dict in (NSArray*)data) { + {{#returnTypeIsPrimitive}} + {{returnBaseType}}* d = [[{{{returnBaseType}}} alloc]initWithString: dict]; + {{/returnTypeIsPrimitive}} + {{^returnTypeIsPrimitive}} + {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc] initWithDictionary:dict error:nil]; + {{/returnTypeIsPrimitive}} + [objs addObject:d]; + } + completionBlock(({{{returnType}}})objs, nil); + } + {{/returnBaseType}} +{{/isListContainer}} +}]; diff --git a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache index da8ea063bfb..d240c9f2f30 100644 --- a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache @@ -1,24 +1,24 @@ - {{^returnTypeIsPrimitive}} +{{^returnTypeIsPrimitive}} // comples response type return [self.apiClient dictionary: requestUrl - method: @"{{httpMethod}}" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - {{#returnBaseType}}completionBlock(nil, error);{{/returnBaseType}} - {{^returnBaseType}}completionBlock(error);{{/returnBaseType}} - return; - } - {{#returnType}}{{returnType}} result = nil; - if (data) { - result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}} initWithDictionary{{/isListContainer}}{{/returnContainer}}{{^returnContainer}} initWithDictionary{{/returnContainer}}:data error:nil]; - } - {{#returnType}}completionBlock(result , nil);{{/returnType}} - {{/returnType}} - }]; - {{/returnTypeIsPrimitive}} + method: @"{{httpMethod}}" + queryParams: queryParams + body: bodyDictionary + headerParams: headerParams + authSettings: authSettings + requestContentType: requestContentType + responseContentType: responseContentType + completionBlock: ^(NSDictionary *data, NSError *error) { + if (error) { + {{#returnBaseType}}completionBlock(nil, error);{{/returnBaseType}} + {{^returnBaseType}}completionBlock(error);{{/returnBaseType}} + return; + } + {{#returnType}}{{returnType}} result = nil; + if (data) { + result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}} initWithDictionary{{/isListContainer}}{{/returnContainer}}{{^returnContainer}} initWithDictionary{{/returnContainer}}:data error:nil]; + } + {{#returnType}}completionBlock(result , nil);{{/returnType}} + {{/returnType}} + }]; +{{/returnTypeIsPrimitive}} diff --git a/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache index d44d356526d..b60b4b54bbc 100644 --- a/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache @@ -1,36 +1,36 @@ - // primitive response type - {{#returnBaseType}}return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"{{httpMethod}}" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(nil, error); - return; - } - {{returnBaseType}} *result = data ? [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc]initWithString: data] : nil; - completionBlock(result, nil); - }]; - {{/returnBaseType}} - {{^returnBaseType}} +// primitive response type +{{#returnBaseType}}return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"{{httpMethod}}" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(nil, error); +return; +} +{{returnBaseType}} *result = data ? [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc]initWithString: data] : nil; +completionBlock(result, nil); +}]; +{{/returnBaseType}} +{{^returnBaseType}} // no return base type - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"{{httpMethod}}" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; - {{/returnBaseType}} + return [self.apiClient stringWithCompletionBlock: requestUrl + method: @"{{httpMethod}}" + queryParams: queryParams + body: bodyDictionary + headerParams: headerParams + requestContentType: requestContentType + responseContentType: responseContentType + completionBlock: ^(NSString *data, NSError *error) { + if (error) { + completionBlock(error); + return; + } + completionBlock(nil); + }]; +{{/returnBaseType}} diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache index b728e6bb06c..00c6297b71a 100644 --- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache @@ -1,26 +1,26 @@ {{#models}} -{{#model}} -#import "{{classname}}.h" + {{#model}} + #import "{{classname}}.h" -@implementation {{classname}} - -+ (JSONKeyMapper *)keyMapper -{ - return [[JSONKeyMapper alloc] initWithDictionary:@{ {{#vars}}@"{{baseName}}": @"{{name}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }]; -} + @implementation {{classname}} -+ (BOOL)propertyIsOptional:(NSString *)propertyName -{ - NSArray *optionalProperties = @[{{#vars}}{{^required}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/required}}{{/vars}}]; + + (JSONKeyMapper *)keyMapper + { + return [[JSONKeyMapper alloc] initWithDictionary:@{ {{#vars}}@"{{baseName}}": @"{{name}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }]; + } - if ([optionalProperties containsObject:propertyName]) { - return YES; - } - else { - return NO; - } -} + + (BOOL)propertyIsOptional:(NSString *)propertyName + { + NSArray *optionalProperties = @[{{#vars}}{{^required}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/required}}{{/vars}}]; -{{/model}} -@end + if ([optionalProperties containsObject:propertyName]) { + return YES; + } + else { + return NO; + } + } + + {{/model}} + @end {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache index 81ac19a0b73..12cb782a731 100644 --- a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache @@ -1,22 +1,23 @@ -#import +#import + #import "SWGObject.h" {{#imports}}#import "{{import}}.h" {{/imports}} {{newline}} {{#models}} -{{#model}} + {{#model}} -@protocol {{classname}} -@end - -@interface {{classname}} : SWGObject + @protocol {{classname}} + @end -{{#vars}} -{{#description}}/* {{{description}}} {{^required}}[optional]{{/required}} - */{{/description}} -@property(nonatomic) {{{ datatype }}} {{name}}; -{{/vars}} + @interface {{classname}} : SWGObject -@end -{{/model}} + {{#vars}} + {{#description}}/* {{{description}}} {{^required}}[optional]{{/required}} + */{{/description}} + @property(nonatomic) {{{ datatype }}} {{name}}; + {{/vars}} + + @end + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache index 7bbbc14c066..602bbcb807f 100644 --- a/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache +++ b/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache @@ -1,15 +1,15 @@ - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"{{httpMethod}}" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; +return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"{{httpMethod}}" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; +} +completionBlock(nil); +}]; diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache index 2bcdd6da690..f216d6bc3bc 100644 --- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache @@ -22,14 +22,14 @@ use WWW::{{invokerPackage}}::Configuration; sub new { - my $class = shift; - my (%args) = ( - 'ua' => LWP::UserAgent->new, - 'base_url' => '{{basePath}}', - @_ - ); - - return bless \%args, $class; +my $class = shift; +my (%args) = ( +'ua' => LWP::UserAgent->new, +'base_url' => '{{basePath}}', +@_ +); + +return bless \%args, $class; } # Set the user agent of the API client @@ -37,20 +37,20 @@ sub new # @param string $user_agent The user agent of the API client # sub set_user_agent { - my ($self, $user_agent) = @_; - $self->{http_user_agent}= $user_agent; +my ($self, $user_agent) = @_; +$self->{http_user_agent}= $user_agent; } # Set timeout # # @param integer $seconds Number of seconds before timing out [set to 0 for no timeout] -# +# sub set_timeout { - my ($self, $seconds) = @_; - if (!looks_like_number($seconds)) { - croak('Timeout variable must be numeric.'); - } - $self->{http_timeout} = $seconds; +my ($self, $seconds) = @_; +if (!looks_like_number($seconds)) { +croak('Timeout variable must be numeric.'); +} +$self->{http_timeout} = $seconds; } # make the HTTP request @@ -61,70 +61,70 @@ sub set_timeout { # @param array $headerParams parameters to be place in request header # @return mixed sub call_api { - my $self = shift; - my ($resource_path, $method, $query_params, $post_params, $header_params, $body_data, $auth_settings) = @_; - - # update parameters based on authentication settings - $self->update_params_for_auth($header_params, $query_params, $auth_settings); - - - my $_url = $self->{base_url} . $resource_path; - - # build query - if (%$query_params) { - $_url = ($_url . '?' . eval { URI::Query->new($query_params)->stringify }); - } - - - # body data - $body_data = to_json($body_data->to_hash) if defined $body_data && $body_data->can('to_hash'); # model to json string - my $_body_data = %$post_params ? $post_params : $body_data; - - # Make the HTTP request - my $_request; - if ($method eq 'POST') { - # multipart - $header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? - 'form-data' : $header_params->{'Content-Type'}; - - $_request = POST($_url, %$header_params, Content => $_body_data); - - } - elsif ($method eq 'PUT') { - # multipart - $header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? - 'form-data' : $header_params->{'Content-Type'}; - - $_request = PUT($_url, %$header_params, Content => $_body_data); - - } - elsif ($method eq 'GET') { - my $headers = HTTP::Headers->new(%$header_params); - $_request = GET($_url, %$header_params); - } - elsif ($method eq 'HEAD') { - my $headers = HTTP::Headers->new(%$header_params); - $_request = HEAD($_url,%$header_params); - } - elsif ($method eq 'DELETE') { #TODO support form data - my $headers = HTTP::Headers->new(%$header_params); - $_request = DELETE($_url, %$headers); - } - elsif ($method eq 'PATCH') { #TODO - } - else { - } - - $self->{ua}->timeout($self->{http_timeout} || $WWW::{{invokerPackage}}::Configuration::http_timeout); - $self->{ua}->agent($self->{http_user_agent} || $WWW::{{invokerPackage}}::Configuration::http_user_agent); - - my $_response = $self->{ua}->request($_request); - - unless ($_response->is_success) { - croak("API Exception(".$_response->code."): ".$_response->message); - } - - return $_response->content; +my $self = shift; +my ($resource_path, $method, $query_params, $post_params, $header_params, $body_data, $auth_settings) = @_; + +# update parameters based on authentication settings +$self->update_params_for_auth($header_params, $query_params, $auth_settings); + + +my $_url = $self->{base_url} . $resource_path; + +# build query +if (%$query_params) { +$_url = ($_url . '?' . eval { URI::Query->new($query_params)->stringify }); +} + + +# body data +$body_data = to_json($body_data->to_hash) if defined $body_data && $body_data->can('to_hash'); # model to json string +my $_body_data = %$post_params ? $post_params : $body_data; + +# Make the HTTP request +my $_request; +if ($method eq 'POST') { +# multipart +$header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? +'form-data' : $header_params->{'Content-Type'}; + +$_request = POST($_url, %$header_params, Content => $_body_data); + +} +elsif ($method eq 'PUT') { +# multipart +$header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? +'form-data' : $header_params->{'Content-Type'}; + +$_request = PUT($_url, %$header_params, Content => $_body_data); + +} +elsif ($method eq 'GET') { +my $headers = HTTP::Headers->new(%$header_params); +$_request = GET($_url, %$header_params); +} +elsif ($method eq 'HEAD') { +my $headers = HTTP::Headers->new(%$header_params); +$_request = HEAD($_url,%$header_params); +} +elsif ($method eq 'DELETE') { #TODO support form data +my $headers = HTTP::Headers->new(%$header_params); +$_request = DELETE($_url, %$headers); +} +elsif ($method eq 'PATCH') { #TODO +} +else { +} + +$self->{ua}->timeout($self->{http_timeout} || $WWW::{{invokerPackage}}::Configuration::http_timeout); +$self->{ua}->agent($self->{http_user_agent} || $WWW::{{invokerPackage}}::Configuration::http_user_agent); + +my $_response = $self->{ua}->request($_request); + +unless ($_response->is_success) { +croak("API Exception(".$_response->code."): ".$_response->message); +} + +return $_response->content; } @@ -133,8 +133,8 @@ sub call_api { # @param string $value a string which will be part of the path # @return string the serialized object sub to_path_value { - my ($self, $value) = @_; - return uri_escape($self->to_string($value)); +my ($self, $value) = @_; +return uri_escape($self->to_string($value)); } @@ -145,12 +145,12 @@ sub to_path_value { # @param object $object an object to be serialized to a string # @return string the serialized object sub to_query_value { - my ($self, $object) = @_; - if (is_array($object)) { - return implode(',', $object); - } else { - return $self->to_string($object); - } +my ($self, $object) = @_; +if (is_array($object)) { +return implode(',', $object); +} else { +return $self->to_string($object); +} } @@ -160,8 +160,8 @@ sub to_query_value { # @param string $value a string which will be part of the header # @return string the header string sub to_header_value { - my ($self, $value) = @_; - return $self->to_string($value); +my ($self, $value) = @_; +return $self->to_string($value); } # Take value and turn it into a string suitable for inclusion in @@ -170,8 +170,8 @@ sub to_header_value { # @param string $value the value of the form parameter # @return string the form string sub to_form_value { - my ($self, $value) = @_; - return $self->to_string($value); +my ($self, $value) = @_; +return $self->to_string($value); } # Take value and turn it into a string suitable for inclusion in @@ -180,50 +180,50 @@ sub to_form_value { # @param string $value the value of the parameter # @return string the header string sub to_string { - my ($self, $value) = @_; - if (ref($value) eq "DateTime") { # datetime in ISO8601 format - return $value->datetime(); - } - else { - return $value; - } +my ($self, $value) = @_; +if (ref($value) eq "DateTime") { # datetime in ISO8601 format +return $value->datetime(); +} +else { +return $value; +} } # Deserialize a JSON string into an object -# +# # @param string $class class name is passed as a string # @param string $data data of the body # @return object an instance of $class sub deserialize { - my ($self, $class, $data) = @_; - $log->debugf("deserializing %s for %s", $data, $class); - my $_result; - - if (not defined $data) { - return undef; - } elsif ( lc(substr($class, 0, 4)) eq 'map[') { #hash - $_result = \(json_decode $data); - } elsif ( lc(substr($class, 0, 6)) eq 'array[' ) { # array of data - return $data if $data eq '[]'; # return if empty array - - my $_sub_class = substr($class, 6, -1); - my @_json_data = json_decode $data; - my @_values = (); - foreach my $_value (@_json_data) { - push @_values, $self->deserialize($_sub_class, $_value); - } - $_result = \@_values; - } elsif ($class eq 'DateTime') { - $_result = DateTime->from_epoch(epoch => str2time($data)); - } elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) { #TODO revise the primitive type - $_result= $data; - } else { # model - my $_instance = use_module("WWW::{{invokerPackage}}::Object::$class")->new; - $_result = $_instance->from_hash(decode_json $data); - } - - return $_result; +my ($self, $class, $data) = @_; +$log->debugf("deserializing %s for %s", $data, $class); +my $_result; + +if (not defined $data) { +return undef; +} elsif ( lc(substr($class, 0, 4)) eq 'map[') { #hash +$_result = \(json_decode $data); +} elsif ( lc(substr($class, 0, 6)) eq 'array[' ) { # array of data +return $data if $data eq '[]'; # return if empty array + +my $_sub_class = substr($class, 6, -1); +my @_json_data = json_decode $data; +my @_values = (); +foreach my $_value (@_json_data) { +push @_values, $self->deserialize($_sub_class, $_value); +} +$_result = \@_values; +} elsif ($class eq 'DateTime') { +$_result = DateTime->from_epoch(epoch => str2time($data)); +} elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) { #TODO revise the primitive type +$_result= $data; +} else { # model +my $_instance = use_module("WWW::{{invokerPackage}}::Object::$class")->new; +$_result = $_instance->from_hash(decode_json $data); +} + +return $_result; } @@ -232,15 +232,15 @@ sub deserialize # @return String Accept (e.g. application/json) sub select_header_accept { - my ($self, @header) = @_; - - if (@header == 0 || (@header == 1 && $header[0] eq '')) { - return undef; - } elsif (grep(/^application\/json$/i, @header)) { - return 'application/json'; - } else { - return join(',', @header); - } +my ($self, @header) = @_; + +if (@header == 0 || (@header == 1 && $header[0] eq '')) { +return undef; +} elsif (grep(/^application\/json$/i, @header)) { +return 'application/json'; +} else { +return join(',', @header); +} } @@ -249,15 +249,15 @@ sub select_header_accept # @return String Content-Type (e.g. application/json) sub select_header_content_type { - my ($self, @header) = @_; - - if (@header == 0 || (@header == 1 && $header[0] eq '')) { - return 'application/json'; # default to application/json - } elsif (grep(/^application\/json$/i, @header)) { - return 'application/json'; - } else { - return join(',', @header); - } +my ($self, @header) = @_; + +if (@header == 0 || (@header == 1 && $header[0] eq '')) { +return 'application/json'; # default to application/json +} elsif (grep(/^application\/json$/i, @header)) { +return 'application/json'; +} else { +return join(',', @header); +} } @@ -266,38 +266,38 @@ sub select_header_content_type # @return string API key with the prefix sub get_api_key_with_prefix { - my ($self, $api_key) = @_; - if ($WWW::{{invokerPackage}}::Configuration::api_key_prefix->{$api_key}) { - return $WWW::{{invokerPackage}}::Configuration::api_key_prefix->{$api_key}." ".$WWW::{{invokerPackage}}::Configuration::api_key->{$api_key}; - } else { - return $WWW::{{invokerPackage}}::Configuration::api_key->{$api_key}; - } +my ($self, $api_key) = @_; +if ($WWW::{{invokerPackage}}::Configuration::api_key_prefix->{$api_key}) { +return $WWW::{{invokerPackage}}::Configuration::api_key_prefix->{$api_key}." ".$WWW::{{invokerPackage}}::Configuration::api_key->{$api_key}; +} else { +return $WWW::{{invokerPackage}}::Configuration::api_key->{$api_key}; +} } # update hearder 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) = @_; - - return if (!defined($auth_settings) || scalar(@$auth_settings) == 0); - - # one endpoint can have more than 1 auth settings - foreach my $auth (@$auth_settings) { - # determine which one to use - if (!defined($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::{{invokerPackage}}::Configuration::username.":".$WWW::{{invokerPackage}}::Configuration::password);{{/isBasic}} - {{#isOAuth}}# TODO support oauth{{/isOAuth}} - } - {{/authMethods}} - else { - # TODO show warning about security definition not found - } - } +my ($self, $header_params, $query_params, $auth_settings) = @_; + +return if (!defined($auth_settings) || scalar(@$auth_settings) == 0); + +# one endpoint can have more than 1 auth settings +foreach my $auth (@$auth_settings) { +# determine which one to use +if (!defined($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::{{invokerPackage}}::Configuration::username.":".$WWW::{{invokerPackage}}::Configuration::password);{{/isBasic}} +{{#isOAuth}}# TODO support oauth{{/isOAuth}} +} +{{/authMethods}} +else { +# TODO show warning about security definition not found +} +} } diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache index b4a7885a798..47c8052d033 100644 --- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache @@ -21,56 +21,56 @@ use DateTime; # return json string sub to_hash { - return decode_json(JSON->new->convert_blessed->encode( shift )); +return decode_json(JSON->new->convert_blessed->encode( shift )); } # used by JSON for serialization -sub TO_JSON { - my $self = shift; - my $_data = {}; - foreach my $_key (keys $self->get_attribute_map) { - if (defined $self->{$_key}) { - $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key}; - } - } - return $_data; +sub TO_JSON { +my $self = shift; +my $_data = {}; +foreach my $_key (keys $self->get_attribute_map) { +if (defined $self->{$_key}) { +$_data->{$self->get_attribute_map->{$_key}} = $self->{$_key}; +} +} +return $_data; } # from json string 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 ) { - if ($_type =~ /^array\[/i) { # array - my $_subclass = substr($_type, 6, -1); - my @_array = (); - foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) { - push @_array, $self->_deserialize($_subclass, $_element); - } - $self->{$_key} = \@_array; - } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime - $self->{$_key} = $self->_deserialize($_type, $hash->{$_key}); - } else { - $log->debugf("warning: %s not defined\n", $_key); - } - } +my ($self, $hash) = @_; +# loop through attributes and use swagger_types to deserialize the data +while ( my ($_key, $_type) = each $self->get_swagger_types ) { +if ($_type =~ /^array\[/i) { # array +my $_subclass = substr($_type, 6, -1); +my @_array = (); +foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) { +push @_array, $self->_deserialize($_subclass, $_element); +} +$self->{$_key} = \@_array; +} elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime +$self->{$_key} = $self->_deserialize($_type, $hash->{$_key}); +} else { +$log->debugf("warning: %s not defined\n", $_key); +} +} - return $self; +return $self; } - + # deserialize non-array data sub _deserialize { - my ($self, $type, $data) = @_; - $log->debugf("deserializing %s with %s",Dumper($data), $type); - - if ($type eq 'DateTime') { - return DateTime->from_epoch(epoch => str2time($data)); - } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) { - return $data; - } else { # hash(model) - my $_instance = eval "WWW::{{invokerPackage}}::Object::$type->new()"; - return $_instance->from_hash($data); - } +my ($self, $type, $data) = @_; +$log->debugf("deserializing %s with %s",Dumper($data), $type); + +if ($type eq 'DateTime') { +return DateTime->from_epoch(epoch => str2time($data)); +} elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) { +return $data; +} else { # hash(model) +my $_instance = eval "WWW::{{invokerPackage}}::Object::$type->new()"; +return $_instance->from_hash($data); +} } 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index 5adb50344de..c92aea5d4a6 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -1,5 +1,5 @@ # -# Copyright 2015 Reverb Technologies, Inc. +# 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. @@ -14,7 +14,7 @@ # limitations under the License. # # -# NOTE: This class is auto generated by the swagger code generator program. +# NOTE: This class is auto generated by the swagger code generator program. # Do not edit the class manually. # package WWW::{{invokerPackage}}::{{classname}}; @@ -22,7 +22,7 @@ package WWW::{{invokerPackage}}::{{classname}}; require 5.6.0; use strict; use warnings; -use utf8; +use utf8; use Exporter; use Carp qw( croak ); use Log::Any qw($log); @@ -31,111 +31,111 @@ use WWW::{{invokerPackage}}::ApiClient; use WWW::{{invokerPackage}}::Configuration; {{#operations}} -our @EXPORT_OK = qw( - {{#operation}}{{{nickname}}} - {{/operation}} -); + our @EXPORT_OK = qw( + {{#operation}}{{{nickname}}} + {{/operation}} + ); -sub new { + sub new { my $class = shift; my $default_api_client = $WWW::{{invokerPackage}}::Configuration::api_client ? $WWW::{{invokerPackage}}::Configuration::api_client : WWW::{{invokerPackage}}::ApiClient->new; my (%self) = ( - 'api_client' => $default_api_client, - @_ + 'api_client' => $default_api_client, + @_ ); #my $self = { # #api_client => $options->{api_client} # api_client => $default_api_client - #}; + #}; bless \%self, $class; -} + } {{#operation}} - # - # {{{nickname}}} - # - # {{{summary}}} - # - {{#allParams}} # @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}} - {{/allParams}} # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - # - sub {{nickname}} { - my ($self, %args) = @_; - - {{#allParams}}{{#required}} - # verify the required parameter '{{paramName}}' is set - unless (exists $args{'{{paramName}}'}) { - croak("Missing the required parameter '{{paramName}}' when calling {{nickname}}"); - } - {{/required}}{{/allParams}} - - # parse inputs - my $_resource_path = '{{path}}'; - $_resource_path =~ s/{format}/json/; # default format to json - - my $_method = '{{httpMethod}}'; - my $query_params = {}; - my $header_params = {}; - my $form_params = {}; - - # 'Accept' and 'Content-Type' header - my $_header_accept = $self->{api_client}->select_header_accept({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}); - if ($_header_accept) { + # + # {{{nickname}}} + # + # {{{summary}}} + # + {{#allParams}} # @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}} + {{/allParams}} # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + # + sub {{nickname}} { + my ($self, %args) = @_; + + {{#allParams}}{{#required}} + # verify the required parameter '{{paramName}}' is set + unless (exists $args{'{{paramName}}'}) { + croak("Missing the required parameter '{{paramName}}' when calling {{nickname}}"); + } + {{/required}}{{/allParams}} + + # parse inputs + my $_resource_path = '{{path}}'; + $_resource_path =~ s/{format}/json/; # default format to json + + my $_method = '{{httpMethod}}'; + my $query_params = {}; + my $header_params = {}; + my $form_params = {}; + + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; - } - $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}); + } + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}); - {{#queryParams}}# query params - if ( exists $args{'{{paramName}}'}) { + {{#queryParams}}# query params + if ( exists $args{'{{paramName}}'}) { $query_params->{'{{baseName}}'} = $self->{api_client}->to_query_value($args{'{{paramName}}'}); - }{{/queryParams}} - {{#headerParams}}# header params - if ( exists $args{'{{paramName}}'}) { + }{{/queryParams}} + {{#headerParams}}# header params + if ( exists $args{'{{paramName}}'}) { $header_params->{'{{baseName}}'} = $self->{api_client}->to_header_value($args{'{{paramName}}'}); - }{{/headerParams}} - {{#pathParams}}# path params - if ( exists $args{'{{paramName}}'}) { + }{{/headerParams}} + {{#pathParams}}# path params + if ( exists $args{'{{paramName}}'}) { my $_base_variable = "{" . "{{baseName}}" . "}"; my $_base_value = $self->{api_client}->to_path_value($args{'{{paramName}}'}); $_resource_path =~ s/$_base_variable/$_base_value/g; - }{{/pathParams}} - {{#formParams}}# form params - if ( exists $args{'{{paramName}}'} ) { + }{{/pathParams}} + {{#formParams}}# form params + if ( exists $args{'{{paramName}}'} ) { {{#isFile}}$form_params->{'{{baseName}}'} = [] unless defined $form_params->{'{{baseName}}'}; push $form_params->{'{{baseName}}'}, $args{'{{paramName}}'}; {{/isFile}} {{^isFile}}$form_params->{'{{baseName}}'} = $self->{api_client}->to_form_value($args{'{{paramName}}'}); {{/isFile}} - }{{/formParams}} - my $_body_data; - {{#bodyParams}}# body params - if ( exists $args{'{{paramName}}'}) { + }{{/formParams}} + my $_body_data; + {{#bodyParams}}# body params + if ( exists $args{'{{paramName}}'}) { $_body_data = $args{'{{paramName}}'}; - }{{/bodyParams}} + }{{/bodyParams}} - # authentication setting, if any - my $auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]; + # authentication setting, if any + my $auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]; - # make the API Call - {{#returnType}}my $response = $self->{api_client}->call_api($_resource_path, $_method, - $query_params, $form_params, - $header_params, $_body_data, $auth_settings); - if (!$response) { + # make the API Call + {{#returnType}}my $response = $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('{{returnType}}', $response); + return $_response_object;{{/returnType}} + {{^returnType}}$self->{api_client}->call_api($_resource_path, $_method, + $query_params, $form_params, + $header_params, $_body_data, $auth_settings); return; - } - my $_response_object = $self->{api_client}->deserialize('{{returnType}}', $response); - return $_response_object;{{/returnType}} - {{^returnType}}$self->{api_client}->call_api($_resource_path, $_method, - $query_params, $form_params, - $header_params, $_body_data, $auth_settings); - return; - {{/returnType}} - } - {{/operation}} -{{newline}} + {{/returnType}} + } + {{/operation}} + {{newline}} {{/operations}} 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache index c527957a9b1..2e76edc87b4 100644 --- a/modules/swagger-codegen/src/main/resources/perl/object.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache @@ -1,58 +1,58 @@ {{#models}} -{{#model}} -package WWW::{{invokerPackage}}::Object::{{classname}}; - -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::{{invokerPackage}}::Object::BaseObject"; - -# -#{{description}} -# -#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. -# - -my $swagger_types = { - {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, - {{/hasMore}}{{/vars}} -}; - -my $attribute_map = { - {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}}, - {{/hasMore}}{{/vars}} -}; - -# new object -sub new { - my ($class, %args) = @_; - my $self = { + {{#model}} + package WWW::{{invokerPackage}}::Object::{{classname}}; + + 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::{{invokerPackage}}::Object::BaseObject"; + + # + #{{description}} + # + #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. + # + + my $swagger_types = { + {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, + {{/hasMore}}{{/vars}} + }; + + my $attribute_map = { + {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}}, + {{/hasMore}}{{/vars}} + }; + + # new object + sub new { + my ($class, %args) = @_; + my $self = { {{#vars}}#{{#description}}{{{description}}}{{/description}} - '{{name}}' => $args{'{{baseName}}'}{{#hasMore}}, + '{{name}}' => $args{'{{baseName}}'}{{#hasMore}}, {{/hasMore}}{{/vars}} - }; + }; - return bless $self, $class; -} + return bless $self, $class; + } -# get swagger type of the attribute -sub get_swagger_types { - return $swagger_types; -} + # get swagger type of the attribute + sub get_swagger_types { + return $swagger_types; + } -# get attribute mappping -sub get_attribute_map { - return $attribute_map; -} + # get attribute mappping + sub get_attribute_map { + return $attribute_map; + } -1; -{{/model}} + 1; + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache index 476d3b625c2..f9a80ca07ca 100644 --- a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache +++ b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache @@ -1,6 +1,6 @@ host = '{{basePath}}'; - } else { - $this->host = $host; - } - } +} else { +$this->host = $host; +} +} - /** - * add default header - * - * @param string $header_name header name (e.g. Token) - * @param string $header_value header value (e.g. 1z8wp3) - */ - public function addDefaultHeader($header_name, $header_value) { - if (!is_string($header_name)) - throw new \InvalidArgumentException('Header name must be a string.'); +/** +* add default header +* +* @param string $header_name header name (e.g. Token) +* @param string $header_value header value (e.g. 1z8wp3) +*/ +public function addDefaultHeader($header_name, $header_value) { +if (!is_string($header_name)) +throw new \InvalidArgumentException('Header name must be a string.'); + +self::$default_header[$header_name] = $header_value; +} - self::$default_header[$header_name] = $header_value; - } +/** +* get the default header +* +* @return array default header +*/ +public function getDefaultHeader() { +return self::$default_header; +} - /** - * get the default header - * - * @return array default header - */ - public function getDefaultHeader() { - return self::$default_header; - } +/** +* delete the default header based on header name +* +* @param string $header_name header name (e.g. Token) +*/ +public function deleteDefaultHeader($header_name) { +unset(self::$default_header[$header_name]); +} - /** - * delete the default header based on header name - * - * @param string $header_name header name (e.g. Token) - */ - public function deleteDefaultHeader($header_name) { - unset(self::$default_header[$header_name]); - } +/** +* set the user agent of the api client +* +* @param string $user_agent the user agent of the api client +*/ +public function setUserAgent($user_agent) { +if (!is_string($user_agent)) +throw new \InvalidArgumentException('User-agent must be a string.'); + +$this->user_agent= $user_agent; +} - /** - * set the user agent of the api client - * - * @param string $user_agent the user agent of the api client - */ - public function setUserAgent($user_agent) { - if (!is_string($user_agent)) - throw new \InvalidArgumentException('User-agent must be a string.'); +/** +* get the user agent of the api client +* +* @return string user agent +*/ +public function getUserAgent($user_agent) { +return $this->user_agent; +} - $this->user_agent= $user_agent; - } +/** +* set the HTTP timeout value +* +* @param integer $seconds Number of seconds before timing out [set to 0 for no timeout] +*/ +public function setTimeout($seconds) { +if (!is_numeric($seconds) || $seconds < 0) +throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.'); + +$this->curl_timeout = $seconds; +} - /** - * get the user agent of the api client - * - * @return string user agent - */ - public function getUserAgent($user_agent) { - return $this->user_agent; - } +/** +* get the HTTP timeout value +* +* @return string HTTP timeout value +*/ +public function getTimeout() { +return $this->curl_timeout; +} - /** - * set the HTTP timeout value - * - * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout] - */ - public function setTimeout($seconds) { - if (!is_numeric($seconds) || $seconds < 0) - throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.'); - $this->curl_timeout = $seconds; - } +/** +* Get API key (with prefix if set) +* @param string key name +* @return string API key with the prefix +*/ +public function getApiKeyWithPrefix($apiKey) { +if (isset(Configuration::$apiKeyPrefix[$apiKey])) { +return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey]; +} else if (isset(Configuration::$apiKey[$apiKey])) { +return Configuration::$apiKey[$apiKey]; +} else { +return; +} +} - /** - * get the HTTP timeout value - * - * @return string HTTP timeout value - */ - public function getTimeout() { - return $this->curl_timeout; - } +/** +* update hearder 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']) +*/ +public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings) +{ +if (count($authSettings) == 0) +return; + +// one endpoint can have more than 1 auth settings +foreach($authSettings as $auth) { +// determine which one to use +switch($auth) { +{{#authMethods}} + case '{{name}}': + {{#isApiKey}}{{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode(Configuration::$username.":".Configuration::$password);{{/isBasic}} + {{#isOAuth}}//TODO support oauth{{/isOAuth}} + break; +{{/authMethods}} +default: +//TODO show warning about security definition not found +} +} +} +/** +* @param string $resourcePath path to method endpoint +* @param string $method method to call +* @param array $queryParams parameters to be place in query URL +* @param array $postData parameters to be placed in POST body +* @param array $headerParams parameters to be place in request header +* @return mixed +*/ +public function callApi($resourcePath, $method, $queryParams, $postData, +$headerParams, $authSettings) { + +$headers = array(); + +# determine authentication setting +$this->updateParamsForAuth($headerParams, $queryParams, $authSettings); + +# construct the http header +$headerParams = array_merge((array)self::$default_header, (array)$headerParams); + +foreach ($headerParams as $key => $val) { +$headers[] = "$key: $val"; +} - /** - * Get API key (with prefix if set) - * @param string key name - * @return string API key with the prefix - */ - public function getApiKeyWithPrefix($apiKey) { - if (isset(Configuration::$apiKeyPrefix[$apiKey])) { - return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey]; - } else if (isset(Configuration::$apiKey[$apiKey])) { - return Configuration::$apiKey[$apiKey]; - } else { - return; - } - } +// 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->sanitizeForSerialization($postData)); +} - /** - * update hearder 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']) - */ - public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings) - { - if (count($authSettings) == 0) - return; - - // one endpoint can have more than 1 auth settings - foreach($authSettings as $auth) { - // determine which one to use - switch($auth) { - {{#authMethods}} - case '{{name}}': - {{#isApiKey}}{{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode(Configuration::$username.":".Configuration::$password);{{/isBasic}} - {{#isOAuth}}//TODO support oauth{{/isOAuth}} - break; - {{/authMethods}} - default: - //TODO show warning about security definition not found - } - } - } - - /** - * @param string $resourcePath path to method endpoint - * @param string $method method to call - * @param array $queryParams parameters to be place in query URL - * @param array $postData parameters to be placed in POST body - * @param array $headerParams parameters to be place in request header - * @return mixed - */ - public function callApi($resourcePath, $method, $queryParams, $postData, - $headerParams, $authSettings) { - - $headers = array(); - - # determine authentication setting - $this->updateParamsForAuth($headerParams, $queryParams, $authSettings); - - # construct the http header - $headerParams = array_merge((array)self::$default_header, (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->sanitizeForSerialization($postData)); - } - - $url = $this->host . $resourcePath; - - $curl = curl_init(); - // set timeout, if needed - if ($this->curl_timeout != 0) { - curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout); - } - // return the result on success, rather than just TRUE - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - - curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); - - 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); - } else if ($method == self::$PATCH) { - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH"); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); - } else if ($method == self::$PUT) { - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); - } else if ($method == self::$DELETE) { - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); - } else if ($method != self::$GET) { - throw new ApiException('Method ' . $method . ' is not recognized.'); - } - curl_setopt($curl, CURLOPT_URL, $url); - - // Set user agent - curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent); - - // debugging for curl - if (Configuration::$debug) { - error_log("[DEBUG] HTTP Request body ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file); - - curl_setopt($curl, CURLOPT_VERBOSE, 1); - curl_setopt($curl, CURLOPT_STDERR, fopen(Configuration::$debug_file, '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 (Configuration::$debug) { - error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file); - } - - // 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 ) { - $data = json_decode($http_body); - if (json_last_error() > 0) { // if response is a string - $data = $http_body; - } - } else { - throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)", - $response_info['http_code'], $http_header, $http_body); - } - return $data; - } +$url = $this->host . $resourcePath; - /** - * Build a JSON POST object - */ - protected function sanitizeForSerialization($data) - { - if (is_scalar($data) || null === $data) { - $sanitized = $data; - } else if ($data instanceof \DateTime) { - $sanitized = $data->format(\DateTime::ISO8601); - } else if (is_array($data)) { - foreach ($data as $property => $value) { - $data[$property] = $this->sanitizeForSerialization($value); - } - $sanitized = $data; - } else if (is_object($data)) { - $values = array(); - foreach (array_keys($data::$swaggerTypes) as $property) { - if ($data->$property !== null) { - $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property); - } - } - $sanitized = $values; - } else { - $sanitized = (string)$data; - } - - return $sanitized; - } +$curl = curl_init(); +// set timeout, if needed +if ($this->curl_timeout != 0) { +curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout); +} +// return the result on success, rather than just TRUE +curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - /** - * Take value and turn it into a string suitable for inclusion in - * the path, by url-encoding. - * @param string $value a string which will be part of the path - * @return string the serialized object - */ - public static function toPathValue($value) { - return rawurlencode(self::toString($value)); - } +curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); - /** - * Take value and turn it into a string suitable for inclusion in - * the query, by imploding comma-separated if it's an object. - * If it's a string, pass through unchanged. It will be url-encoded - * later. - * @param object $object an object to be serialized to a string - * @return string the serialized object - */ - public static function toQueryValue($object) { - if (is_array($object)) { - return implode(',', $object); - } else { - return self::toString($object); - } - } +if (! empty($queryParams)) { +$url = ($url . '?' . http_build_query($queryParams)); +} - /** - * 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 - * @param string $value a string which will be part of the header - * @return string the header string - */ - public static function toHeaderValue($value) { - return self::toString($value); - } +if ($method == self::$POST) { +curl_setopt($curl, CURLOPT_POST, true); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method == self::$PATCH) { +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH"); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method == self::$PUT) { +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT"); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method == self::$DELETE) { +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE"); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method != self::$GET) { +throw new ApiException('Method ' . $method . ' is not recognized.'); +} +curl_setopt($curl, CURLOPT_URL, $url); - /** - * Take value and turn it into a string suitable for inclusion in - * the http body (form parameter). If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * @param string $value the value of the form parameter - * @return string the form string - */ - public static function toFormValue($value) { - return self::toString($value); - } +// Set user agent +curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent); - /** - * Take value and turn it into a string suitable for inclusion in - * the parameter. If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * @param string $value the value of the parameter - * @return string the header string - */ - public static function toString($value) { - if ($value instanceof \DateTime) { // datetime in ISO8601 format - return $value->format(\DateTime::ISO8601); - } - else { - return $value; - } - } +// debugging for curl +if (Configuration::$debug) { +error_log("[DEBUG] HTTP Request body ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file); - /** - * Deserialize a JSON string into an object - * - * @param object $object object or primitive to be deserialized - * @param string $class class name is passed as a string - * @return object an instance of $class - */ - public static function deserialize($data, $class) - { - if (null === $data) { - $deserialized = null; - } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int] - $inner = substr($class, 4, -1); - $deserialized = array(); - if(strrpos($inner, ",") !== false) { - $subClass_array = explode(',', $inner, 2); - $subClass = $subClass_array[1]; - foreach ($data as $key => $value) { - $deserialized[$key] = self::deserialize($value, $subClass); - } - } - } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) { - $subClass = substr($class, 6, -1); - $values = array(); - foreach ($data as $key => $value) { - $values[] = self::deserialize($value, $subClass); - } - $deserialized = $values; - } elseif ($class == 'DateTime') { - $deserialized = new \DateTime($data); - } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) { - settype($data, $class); - $deserialized = $data; - } else { - $class = "{{invokerPackage}}\\models\\".$class; - $instance = new $class(); - foreach ($instance::$swaggerTypes as $property => $type) { - $original_property_name = $instance::$attributeMap[$property]; - if (isset($original_property_name) && isset($data->$original_property_name)) { - $instance->$property = self::deserialize($data->$original_property_name, $type); - } - } - $deserialized = $instance; - } - - return $deserialized; - } +curl_setopt($curl, CURLOPT_VERBOSE, 1); +curl_setopt($curl, CURLOPT_STDERR, fopen(Configuration::$debug_file, 'a')); +} else { +curl_setopt($curl, CURLOPT_VERBOSE, 0); +} - /* - * return the header 'Accept' based on an array of Accept provided - * - * @param array[string] $accept Array of header - * @return string Accept (e.g. application/json) - */ - public static function selectHeaderAccept($accept) { - if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) { - return NULL; - } elseif (preg_grep("/application\/json/i", $accept)) { - return 'application/json'; - } else { - return implode(',', $accept); - } - } +// obtain the HTTP response headers +curl_setopt($curl, CURLOPT_HEADER, 1); - /* - * return the content type based on an array of content-type provided - * - * @param array[string] content_type_array Array fo content-type - * @return string Content-Type (e.g. application/json) - */ - public static function selectHeaderContentType($content_type) { - if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) { - return 'application/json'; - } elseif (preg_grep("/application\/json/i", $content_type)) { - return 'application/json'; - } else { - return implode(',', $content_type); - } - } +// 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 (Configuration::$debug) { +error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file); +} + +// 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 ) { +$data = json_decode($http_body); +if (json_last_error() > 0) { // if response is a string +$data = $http_body; +} +} else { +throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)", +$response_info['http_code'], $http_header, $http_body); +} +return $data; +} + +/** +* Build a JSON POST object +*/ +protected function sanitizeForSerialization($data) +{ +if (is_scalar($data) || null === $data) { +$sanitized = $data; +} else if ($data instanceof \DateTime) { +$sanitized = $data->format(\DateTime::ISO8601); +} else if (is_array($data)) { +foreach ($data as $property => $value) { +$data[$property] = $this->sanitizeForSerialization($value); +} +$sanitized = $data; +} else if (is_object($data)) { +$values = array(); +foreach (array_keys($data::$swaggerTypes) as $property) { +if ($data->$property !== null) { +$values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property); +} +} +$sanitized = $values; +} else { +$sanitized = (string)$data; +} + +return $sanitized; +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the path, by url-encoding. +* @param string $value a string which will be part of the path +* @return string the serialized object +*/ +public static function toPathValue($value) { +return rawurlencode(self::toString($value)); +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the query, by imploding comma-separated if it's an object. +* If it's a string, pass through unchanged. It will be url-encoded +* later. +* @param object $object an object to be serialized to a string +* @return string the serialized object +*/ +public static function toQueryValue($object) { +if (is_array($object)) { +return implode(',', $object); +} else { +return self::toString($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 +* @param string $value a string which will be part of the header +* @return string the header string +*/ +public static function toHeaderValue($value) { +return self::toString($value); +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the http body (form parameter). If it's a string, pass through unchanged +* If it's a datetime object, format it in ISO8601 +* @param string $value the value of the form parameter +* @return string the form string +*/ +public static function toFormValue($value) { +return self::toString($value); +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the parameter. If it's a string, pass through unchanged +* If it's a datetime object, format it in ISO8601 +* @param string $value the value of the parameter +* @return string the header string +*/ +public static function toString($value) { +if ($value instanceof \DateTime) { // datetime in ISO8601 format +return $value->format(\DateTime::ISO8601); +} +else { +return $value; +} +} + +/** +* Deserialize a JSON string into an object +* +* @param object $object object or primitive to be deserialized +* @param string $class class name is passed as a string +* @return object an instance of $class +*/ +public static function deserialize($data, $class) +{ +if (null === $data) { +$deserialized = null; +} elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int] +$inner = substr($class, 4, -1); +$deserialized = array(); +if(strrpos($inner, ",") !== false) { +$subClass_array = explode(',', $inner, 2); +$subClass = $subClass_array[1]; +foreach ($data as $key => $value) { +$deserialized[$key] = self::deserialize($value, $subClass); +} +} +} elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) { +$subClass = substr($class, 6, -1); +$values = array(); +foreach ($data as $key => $value) { +$values[] = self::deserialize($value, $subClass); +} +$deserialized = $values; +} elseif ($class == 'DateTime') { +$deserialized = new \DateTime($data); +} elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) { +settype($data, $class); +$deserialized = $data; +} else { +$class = "{{invokerPackage}}\\models\\".$class; +$instance = new $class(); +foreach ($instance::$swaggerTypes as $property => $type) { +$original_property_name = $instance::$attributeMap[$property]; +if (isset($original_property_name) && isset($data->$original_property_name)) { +$instance->$property = self::deserialize($data->$original_property_name, $type); +} +} +$deserialized = $instance; +} + +return $deserialized; +} + +/* +* return the header 'Accept' based on an array of Accept provided +* +* @param array[string] $accept Array of header +* @return string Accept (e.g. application/json) +*/ +public static function selectHeaderAccept($accept) { +if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) { +return NULL; +} elseif (preg_grep("/application\/json/i", $accept)) { +return 'application/json'; +} else { +return implode(',', $accept); +} +} + +/* +* return the content type based on an array of content-type provided +* +* @param array[string] content_type_array Array fo content-type +* @return string Content-Type (e.g. application/json) +*/ +public static function selectHeaderContentType($content_type) { +if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) { +return 'application/json'; +} elseif (preg_grep("/application\/json/i", $content_type)) { +return 'application/json'; +} else { +return implode(',', $content_type); +} +} } diff --git a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache index d108c3d2902..6ee6efc0805 100644 --- a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache +++ b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache @@ -1,6 +1,6 @@ response_headers = $responseHeaders; - $this->response_body = $responseBody; - } +$this->response_body = $responseBody; +} - /** - * Get the HTTP response header - * - * @return string HTTP response header - */ - public function getResponseHeaders() { - return $this->response_headers; - } +/** +* Get the HTTP response header +* +* @return string HTTP response header +*/ +public function getResponseHeaders() { +return $this->response_headers; +} - /** - * Get the HTTP response body - * - * @return string HTTP response body - */ - public function getResponseBody() { - return $this->response_body; - } +/** +* Get the HTTP response body +* +* @return string HTTP response body +*/ +public function getResponseBody() { +return $this->response_body; +} } diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache index 6b4e6e3db16..ced857098d9 100644 --- a/modules/swagger-codegen/src/main/resources/php/api.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api.mustache @@ -1,6 +1,6 @@ apiClient = Configuration::$apiClient; - } - else - $this->apiClient = Configuration::$apiClient; // use the default one - } else { - $this->apiClient = $apiClient; // use the one provided by the user - } - } +} +else +$this->apiClient = Configuration::$apiClient; // use the default one +} else { +$this->apiClient = $apiClient; // use the one provided by the user +} +} - private $apiClient; // instance of the ApiClient +private $apiClient; // instance of the ApiClient - /** - * get the API client - */ - public function getApiClient() { - return $this->apiClient; - } +/** +* get the API client +*/ +public function getApiClient() { +return $this->apiClient; +} - /** - * set the API client - */ - public function setApiClient($apiClient) { - $this->apiClient = $apiClient; - } +/** +* set the API client +*/ +public function setApiClient($apiClient) { +$this->apiClient = $apiClient; +} - {{#operation}} - /** - * {{{nickname}}} - * - * {{{summary}}} - * -{{#allParams}} * @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}} -{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - */ - public function {{nickname}}({{#allParams}}${{paramName}}{{#optional}}=null{{/optional}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - if (${{paramName}} === null) { +{{#operation}} + /** + * {{{nickname}}} + * + * {{{summary}}} + * + {{#allParams}} * @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}} + {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + */ + public function {{nickname}}({{#allParams}}${{paramName}}{{#optional}}=null{{/optional}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { + {{#allParams}}{{#required}} + // verify the required parameter '{{paramName}}' is set + if (${{paramName}} === null) { throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{nickname}}'); - } - {{/required}}{{/allParams}} + } + {{/required}}{{/allParams}} - // parse inputs - $resourcePath = "{{path}}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "{{httpMethod}}"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}})); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}})); + // parse inputs + $resourcePath = "{{path}}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "{{httpMethod}}"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}})); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}})); - {{#queryParams}}// query params - if(${{paramName}} !== null) { - $queryParams['{{baseName}}'] = $this->apiClient->toQueryValue(${{paramName}}); - }{{/queryParams}} - {{#headerParams}}// header params - if(${{paramName}} !== null) { - $headerParams['{{baseName}}'] = $this->apiClient->toHeaderValue(${{paramName}}); - }{{/headerParams}} - {{#pathParams}}// path params - if(${{paramName}} !== null) { - $resourcePath = str_replace("{" . "{{baseName}}" . "}", - $this->apiClient->toPathValue(${{paramName}}), $resourcePath); - }{{/pathParams}} - {{#formParams}}// form params - if (${{paramName}} !== null) { - $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->toFormValue(${{paramName}}); - }{{/formParams}} - {{#bodyParams}}// body params - $_tempBody = null; - if (isset(${{paramName}})) { - $_tempBody = ${{paramName}}; - }{{/bodyParams}} + {{#queryParams}}// query params + if(${{paramName}} !== null) { + $queryParams['{{baseName}}'] = $this->apiClient->toQueryValue(${{paramName}}); + }{{/queryParams}} + {{#headerParams}}// header params + if(${{paramName}} !== null) { + $headerParams['{{baseName}}'] = $this->apiClient->toHeaderValue(${{paramName}}); + }{{/headerParams}} + {{#pathParams}}// path params + if(${{paramName}} !== null) { + $resourcePath = str_replace("{" . "{{baseName}}" . "}", + $this->apiClient->toPathValue(${{paramName}}), $resourcePath); + }{{/pathParams}} + {{#formParams}}// form params + if (${{paramName}} !== null) { + $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->toFormValue(${{paramName}}); + }{{/formParams}} + {{#bodyParams}}// body params + $_tempBody = null; + if (isset(${{paramName}})) { + $_tempBody = ${{paramName}}; + }{{/bodyParams}} - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } - // authentication setting, if any - $authSettings = array({{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}); + // authentication setting, if any + $authSettings = array({{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}); - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); - {{#returnType}}if(! $response) { - return null; - } + {{#returnType}}if(! $response) { + return null; + } - $responseObject = $this->apiClient->deserialize($response,'{{returnType}}'); - return $responseObject;{{/returnType}} - } - {{/operation}} + $responseObject = $this->apiClient->deserialize($response,'{{returnType}}'); + return $responseObject;{{/returnType}} + } +{{/operation}} {{newline}} {{/operations}} } diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache index fb47a865834..07d94b86106 100644 --- a/modules/swagger-codegen/src/main/resources/php/composer.mustache +++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache @@ -1,32 +1,32 @@ { - "name": "{{invokerPackage}}/{{invokerPackage}}-php", - "description": "{{description}}", - "keywords": [ - "swagger", - "php", - "sdk", - "api" - ], - "homepage": "http://swagger.io", - "license": "Apache v2", - "authors": [ - { - "name": "Swagger and contributors", - "homepage": "https://github.com/swagger-api/swagger-codegen" - } - ], - "require": { - "php": ">=5.3.3", - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~0.6.1", - "squizlabs/php_codesniffer": "~2.0" - }, - "autoload": { - "psr-4": { "{{invokerPackage}}\\" : "lib/" } - } +"name": "{{invokerPackage}}/{{invokerPackage}}-php", +"description": "{{description}}", +"keywords": [ +"swagger", +"php", +"sdk", +"api" +], +"homepage": "http://swagger.io", +"license": "Apache v2", +"authors": [ +{ +"name": "Swagger and contributors", +"homepage": "https://github.com/swagger-api/swagger-codegen" +} +], +"require": { +"php": ">=5.3.3", +"ext-curl": "*", +"ext-json": "*", +"ext-mbstring": "*" +}, +"require-dev": { +"phpunit/phpunit": "~4.0", +"satooshi/php-coveralls": "~0.6.1", +"squizlabs/php_codesniffer": "~2.0" +}, +"autoload": { +"psr-4": { "{{invokerPackage}}\\" : "lib/" } +} } diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache index 7099a2cb234..d48a02d10e8 100644 --- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache @@ -1,6 +1,6 @@ '{{{datatype}}}'{{#hasMore}}, - {{/hasMore}}{{/vars}} - ); + {{/hasMore}}{{/vars}} + ); - static $attributeMap = array( - {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}}, - {{/hasMore}}{{/vars}} - ); + static $attributeMap = array( + {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}}, + {{/hasMore}}{{/vars}} + ); - {{#vars}}{{#description}} - /** - * {{{description}}} - */{{/description}} - public ${{name}}; /* {{{datatype}}} */{{/vars}} + {{#vars}}{{#description}} + /** + * {{{description}}} + */{{/description}} + public ${{name}}; /* {{{datatype}}} */{{/vars}} - public function __construct(array $data = null) { + public function __construct(array $data = null) { {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}} {{/hasMore}}{{/vars}} - } + } - public function offsetExists($offset) { + public function offsetExists($offset) { return isset($this->$offset); - } + } - public function offsetGet($offset) { + public function offsetGet($offset) { return $this->$offset; - } + } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) { $this->$offset = $value; - } + } - public function offsetUnset($offset) { + public function offsetUnset($offset) { unset($this->$offset); - } -} -{{/model}} + } + } + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/python/README.mustache b/modules/swagger-codegen/src/main/resources/python/README.mustache index 9c590a9a508..f4e99c9fbc9 100644 --- a/modules/swagger-codegen/src/main/resources/python/README.mustache +++ b/modules/swagger-codegen/src/main/resources/python/README.mustache @@ -67,8 +67,8 @@ If you want to run the tests in all the python platforms: ```sh $ make test-all [... tox creates a virtualenv for every platform and runs tests inside of each] - py27: commands succeeded - py34: commands succeeded - congratulations :) +py27: commands succeeded +py34: commands succeeded +congratulations :) ``` diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache index 7153ee2b040..fa5e539a280 100644 --- a/modules/swagger-codegen/src/main/resources/python/api.mustache +++ b/modules/swagger-codegen/src/main/resources/python/api.mustache @@ -3,19 +3,19 @@ """ {{classname}}.py -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ @@ -31,18 +31,18 @@ from .. import configuration from ..api_client import ApiClient {{#operations}} -class {{classname}}(object): + class {{classname}}(object): def __init__(self, api_client=None): - if api_client: - self.api_client = api_client - else: - if not configuration.api_client: - configuration.api_client = ApiClient('{{basePath}}') - self.api_client = configuration.api_client - + if api_client: + self.api_client = api_client + else: + if not configuration.api_client: + configuration.api_client = ApiClient('{{basePath}}') + self.api_client = configuration.api_client + {{#operation}} - def {{nickname}}(self, {{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}**kwargs): + def {{nickname}}(self, {{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}**kwargs): """ {{{summary}}} {{{notes}}} @@ -52,17 +52,17 @@ class {{classname}}(object): :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}} """ {{#allParams}}{{#required}} - # verify the required parameter '{{paramName}}' is set - if {{paramName}} is None: + # 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}}] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method {{nickname}}" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method {{nickname}}" % key) + params[key] = val del params['kwargs'] resource_path = '{{path}}'.replace('{format}', 'json') @@ -70,34 +70,34 @@ class {{classname}}(object): path_params = {} {{#pathParams}} - if '{{paramName}}' in params: - path_params['{{baseName}}'] = params['{{paramName}}'] + if '{{paramName}}' in params: + path_params['{{baseName}}'] = params['{{paramName}}'] {{/pathParams}} query_params = {} {{#queryParams}} - if '{{paramName}}' in params: + if '{{paramName}}' in params: query_params['{{baseName}}'] = params['{{paramName}}'] {{/queryParams}} header_params = {} {{#headerParams}} - if '{{paramName}}' in params: + if '{{paramName}}' in params: header_params['{{baseName}}'] = params['{{paramName}}'] {{/headerParams}} form_params = {} files = {} {{#formParams}} - if '{{paramName}}' in params: + if '{{paramName}}' in params: {{#notFile}}form_params['{{baseName}}'] = params['{{paramName}}']{{/notFile}}{{#isFile}}files['{{baseName}}'] = params['{{paramName}}']{{/isFile}} {{/formParams}} body_params = None {{#bodyParam}} - if '{{paramName}}' in params: + if '{{paramName}}' in params: body_params = params['{{paramName}}'] {{/bodyParam}} # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept([{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}]) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}]) @@ -106,10 +106,10 @@ class {{classname}}(object): auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response={{#returnType}}'{{returnType}}'{{/returnType}}{{^returnType}}None{{/returnType}}, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response={{#returnType}}'{{returnType}}'{{/returnType}}{{^returnType}}None{{/returnType}}, auth_settings=auth_settings) {{#returnType}} - return response + return response {{/returnType}}{{/operation}} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache index b8cc4cc2a84..fc0e7c60549 100644 --- a/modules/swagger-codegen/src/main/resources/python/api_client.mustache +++ b/modules/swagger-codegen/src/main/resources/python/api_client.mustache @@ -22,282 +22,282 @@ import random from six import iteritems try: - # for python3 - from urllib.parse import quote +# for python3 +from urllib.parse import quote except ImportError: - # for python2 - from urllib import quote +# for python2 +from urllib import quote from . import configuration class ApiClient(object): - """ - Generic API client for Swagger client library builds - - :param host: The base path for the server to call - :param header_name: a header to pass when making calls to the API - :param header_value: a header value to pass when making calls to the API - """ - def __init__(self, host=configuration.host, header_name=None, header_value=None): - self.default_headers = {} - if header_name is not None: - self.default_headers[header_name] = header_value - self.host = host - self.cookie = None - # Set default User-Agent. - self.user_agent = 'Python-Swagger' - - @property - def user_agent(self): - return self.default_headers['User-Agent'] - - @user_agent.setter - def user_agent(self, value): - self.default_headers['User-Agent'] = value - - def set_default_header(self, header_name, header_value): - self.default_headers[header_name] = header_value - - def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None, - body=None, post_params=None, files=None, response=None, auth_settings=None): - - # headers parameters - header_params = header_params or {} - header_params.update(self.default_headers) - if self.cookie: - header_params['Cookie'] = self.cookie - if header_params: - header_params = self.sanitize_for_serialization(header_params) - - # path parameters - if path_params: - path_params = self.sanitize_for_serialization(path_params) - for k, v in iteritems(path_params): - replacement = quote(str(self.to_path_value(v))) - resource_path = resource_path.replace('{' + k + '}', replacement) - - # query parameters - if query_params: - query_params = self.sanitize_for_serialization(query_params) - query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)} - - # post parameters - if post_params: - post_params = self.prepare_post_parameters(post_params, files) - post_params = self.sanitize_for_serialization(post_params) - - # auth setting - self.update_params_for_auth(header_params, query_params, auth_settings) - - # body - if body: - body = self.sanitize_for_serialization(body) - - # request url - url = self.host + resource_path - - # perform request and return response - response_data = self.request(method, url, query_params=query_params, headers=header_params, - post_params=post_params, body=body) - - # deserialize response data - if response: - return self.deserialize(response_data, response) - else: - return None - - def to_path_value(self, obj): - """ - Convert a string or object to a path-friendly value - - :param obj: object or string value - - :return string: quoted value - """ - if type(obj) == list: - return ','.join(obj) - else: - return str(obj) - - def sanitize_for_serialization(self, obj): - """ - Sanitize an object for Request. - - If obj is None, return None. - If obj is str, int, float, bool, return directly. - If obj is datetime.datetime, datetime.date convert to string in iso8601 format. - If obj is list, santize each element in the list. - If obj is dict, return the dict. - If obj is swagger model, return the properties dict. - """ - if isinstance(obj, type(None)): - return None - elif isinstance(obj, (str, int, float, bool, tuple)): - return obj - elif isinstance(obj, list): - return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj] - elif isinstance(obj, (datetime.datetime, datetime.date)): - return obj.isoformat() - else: - if isinstance(obj, dict): - obj_dict = obj - else: - # Convert model obj to dict except attributes `swagger_types`, `attribute_map` - # and attributes which value is not None. - # Convert attribute name to json key in model definition for request. - obj_dict = {obj.attribute_map[key]: val - for key, val in iteritems(obj.__dict__) - if key != 'swagger_types' and key != 'attribute_map' and val is not None} - return {key: self.sanitize_for_serialization(val) - for key, val in iteritems(obj_dict)} - - def deserialize(self, obj, obj_class): - """ - Derialize a JSON string into an object. - - :param obj: string or object to be deserialized - :param obj_class: class literal for deserialzied object, or string of class name - - :return object: deserialized object - """ - # Have to accept obj_class as string or actual type. Type could be a - # native Python type, or one of the model classes. - if type(obj_class) == str: - if 'list[' in obj_class: - match = re.match('list\[(.*)\]', obj_class) - sub_class = match.group(1) - return [self.deserialize(sub_obj, sub_class) for sub_obj in obj] - - if obj_class in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']: - obj_class = eval(obj_class) - else: # not a native type, must be model class - obj_class = eval('models.' + obj_class) - - if obj_class in [int, float, dict, list, str, bool]: - return obj_class(obj) - elif obj_class == datetime: - return self.__parse_string_to_datetime(obj) - - instance = obj_class() - - for attr, attr_type in iteritems(instance.swagger_types): - if obj is not None and instance.attribute_map[attr] in obj and type(obj) in [list, dict]: - value = obj[instance.attribute_map[attr]] - if attr_type in ['str', 'int', 'float', 'bool']: - attr_type = eval(attr_type) - try: - value = attr_type(value) - except UnicodeEncodeError: - value = unicode(value) - except TypeError: - value = value - setattr(instance, attr, value) - elif attr_type == 'datetime': - setattr(instance, attr, self.__parse_string_to_datetime(value)) - elif 'list[' in attr_type: - match = re.match('list\[(.*)\]', attr_type) - sub_class = match.group(1) - sub_values = [] - if not value: - setattr(instance, attr, None) - else: - for sub_value in value: - sub_values.append(self.deserialize(sub_value, sub_class)) - setattr(instance, attr, sub_values) - else: - setattr(instance, attr, self.deserialize(value, attr_type)) - - return instance - - def __parse_string_to_datetime(self, string): - """ - Parse datetime in string to datetime. - - The string should be in iso8601 datetime format. - """ - try: - from dateutil.parser import parse - return parse(string) - except ImportError: - return string - - def request(self, method, url, query_params=None, headers=None, post_params=None, body=None): - """ - Perform http request using RESTClient. - """ - if method == "GET": - return RESTClient.GET(url, query_params=query_params, headers=headers) - elif method == "HEAD": - return RESTClient.HEAD(url, query_params=query_params, headers=headers) - elif method == "POST": - return RESTClient.POST(url, headers=headers, post_params=post_params, body=body) - elif method == "PUT": - return RESTClient.PUT(url, headers=headers, post_params=post_params, body=body) - elif method == "PATCH": - return RESTClient.PATCH(url, headers=headers, post_params=post_params, body=body) - elif method == "DELETE": - return RESTClient.DELETE(url, query_params=query_params, headers=headers) - else: - raise ValueError("http method must be `GET`, `HEAD`, `POST`, `PATCH`, `PUT` or `DELETE`") - - def prepare_post_parameters(self, post_params=None, files=None): - params = {} - - if post_params: - params.update(post_params) - - if files: - for k, v in iteritems(files): - if v: - with open(v, 'rb') as f: - filename = os.path.basename(f.name) - filedata = f.read() - mimetype = mimetypes.guess_type(filename)[0] or 'application/octet-stream' - params[k] = tuple([filename, filedata, mimetype]) - - return params - - def select_header_accept(self, accepts): - """ - Return `Accept` based on an array of accepts provided - """ - if not accepts: - return - - accepts = list(map(lambda x: x.lower(), accepts)) - - if 'application/json' in accepts: - return 'application/json' - else: - return ', '.join(accepts) - - def select_header_content_type(self, content_types): - """ - Return `Content-Type` baseed on an array of content_types provided - """ - if not content_types: - return 'application/json' - - content_types = list(map(lambda x: x.lower(), content_types)) - - if 'application/json' in content_types: - return 'application/json' - else: - return content_types[0] - - def update_params_for_auth(self, headers, querys, auth_settings): - """ - Update header and query params based on authentication setting - """ - if not auth_settings: - return - - for auth in auth_settings: - auth_setting = configuration.auth_settings().get(auth) - if auth_setting: - if auth_setting['in'] == 'header': - headers[auth_setting['key']] = auth_setting['value'] - elif auth_setting['in'] == 'query': - querys[auth_setting['key']] = auth_setting['value'] - else: - raise ValueError('Authentication token must be in `query` or `header`') +""" +Generic API client for Swagger client library builds + +:param host: The base path for the server to call +:param header_name: a header to pass when making calls to the API +:param header_value: a header value to pass when making calls to the API +""" +def __init__(self, host=configuration.host, header_name=None, header_value=None): +self.default_headers = {} +if header_name is not None: +self.default_headers[header_name] = header_value +self.host = host +self.cookie = None +# Set default User-Agent. +self.user_agent = 'Python-Swagger' + +@property +def user_agent(self): +return self.default_headers['User-Agent'] + +@user_agent.setter +def user_agent(self, value): +self.default_headers['User-Agent'] = value + +def set_default_header(self, header_name, header_value): +self.default_headers[header_name] = header_value + +def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None, +body=None, post_params=None, files=None, response=None, auth_settings=None): + +# headers parameters +header_params = header_params or {} +header_params.update(self.default_headers) +if self.cookie: +header_params['Cookie'] = self.cookie +if header_params: +header_params = self.sanitize_for_serialization(header_params) + +# path parameters +if path_params: +path_params = self.sanitize_for_serialization(path_params) +for k, v in iteritems(path_params): +replacement = quote(str(self.to_path_value(v))) +resource_path = resource_path.replace('{' + k + '}', replacement) + +# query parameters +if query_params: +query_params = self.sanitize_for_serialization(query_params) +query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)} + +# post parameters +if post_params: +post_params = self.prepare_post_parameters(post_params, files) +post_params = self.sanitize_for_serialization(post_params) + +# auth setting +self.update_params_for_auth(header_params, query_params, auth_settings) + +# body +if body: +body = self.sanitize_for_serialization(body) + +# request url +url = self.host + resource_path + +# perform request and return response +response_data = self.request(method, url, query_params=query_params, headers=header_params, +post_params=post_params, body=body) + +# deserialize response data +if response: +return self.deserialize(response_data, response) +else: +return None + +def to_path_value(self, obj): +""" +Convert a string or object to a path-friendly value + +:param obj: object or string value + +:return string: quoted value +""" +if type(obj) == list: +return ','.join(obj) +else: +return str(obj) + +def sanitize_for_serialization(self, obj): +""" +Sanitize an object for Request. + +If obj is None, return None. +If obj is str, int, float, bool, return directly. +If obj is datetime.datetime, datetime.date convert to string in iso8601 format. +If obj is list, santize each element in the list. +If obj is dict, return the dict. +If obj is swagger model, return the properties dict. +""" +if isinstance(obj, type(None)): +return None +elif isinstance(obj, (str, int, float, bool, tuple)): +return obj +elif isinstance(obj, list): +return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj] +elif isinstance(obj, (datetime.datetime, datetime.date)): +return obj.isoformat() +else: +if isinstance(obj, dict): +obj_dict = obj +else: +# Convert model obj to dict except attributes `swagger_types`, `attribute_map` +# and attributes which value is not None. +# Convert attribute name to json key in model definition for request. +obj_dict = {obj.attribute_map[key]: val +for key, val in iteritems(obj.__dict__) +if key != 'swagger_types' and key != 'attribute_map' and val is not None} +return {key: self.sanitize_for_serialization(val) +for key, val in iteritems(obj_dict)} + +def deserialize(self, obj, obj_class): +""" +Derialize a JSON string into an object. + +:param obj: string or object to be deserialized +:param obj_class: class literal for deserialzied object, or string of class name + +:return object: deserialized object +""" +# Have to accept obj_class as string or actual type. Type could be a +# native Python type, or one of the model classes. +if type(obj_class) == str: +if 'list[' in obj_class: +match = re.match('list\[(.*)\]', obj_class) +sub_class = match.group(1) +return [self.deserialize(sub_obj, sub_class) for sub_obj in obj] + +if obj_class in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']: +obj_class = eval(obj_class) +else: # not a native type, must be model class +obj_class = eval('models.' + obj_class) + +if obj_class in [int, float, dict, list, str, bool]: +return obj_class(obj) +elif obj_class == datetime: +return self.__parse_string_to_datetime(obj) + +instance = obj_class() + +for attr, attr_type in iteritems(instance.swagger_types): +if obj is not None and instance.attribute_map[attr] in obj and type(obj) in [list, dict]: +value = obj[instance.attribute_map[attr]] +if attr_type in ['str', 'int', 'float', 'bool']: +attr_type = eval(attr_type) +try: +value = attr_type(value) +except UnicodeEncodeError: +value = unicode(value) +except TypeError: +value = value +setattr(instance, attr, value) +elif attr_type == 'datetime': +setattr(instance, attr, self.__parse_string_to_datetime(value)) +elif 'list[' in attr_type: +match = re.match('list\[(.*)\]', attr_type) +sub_class = match.group(1) +sub_values = [] +if not value: +setattr(instance, attr, None) +else: +for sub_value in value: +sub_values.append(self.deserialize(sub_value, sub_class)) +setattr(instance, attr, sub_values) +else: +setattr(instance, attr, self.deserialize(value, attr_type)) + +return instance + +def __parse_string_to_datetime(self, string): +""" +Parse datetime in string to datetime. + +The string should be in iso8601 datetime format. +""" +try: +from dateutil.parser import parse +return parse(string) +except ImportError: +return string + +def request(self, method, url, query_params=None, headers=None, post_params=None, body=None): +""" +Perform http request using RESTClient. +""" +if method == "GET": +return RESTClient.GET(url, query_params=query_params, headers=headers) +elif method == "HEAD": +return RESTClient.HEAD(url, query_params=query_params, headers=headers) +elif method == "POST": +return RESTClient.POST(url, headers=headers, post_params=post_params, body=body) +elif method == "PUT": +return RESTClient.PUT(url, headers=headers, post_params=post_params, body=body) +elif method == "PATCH": +return RESTClient.PATCH(url, headers=headers, post_params=post_params, body=body) +elif method == "DELETE": +return RESTClient.DELETE(url, query_params=query_params, headers=headers) +else: +raise ValueError("http method must be `GET`, `HEAD`, `POST`, `PATCH`, `PUT` or `DELETE`") + +def prepare_post_parameters(self, post_params=None, files=None): +params = {} + +if post_params: +params.update(post_params) + +if files: +for k, v in iteritems(files): +if v: +with open(v, 'rb') as f: +filename = os.path.basename(f.name) +filedata = f.read() +mimetype = mimetypes.guess_type(filename)[0] or 'application/octet-stream' +params[k] = tuple([filename, filedata, mimetype]) + +return params + +def select_header_accept(self, accepts): +""" +Return `Accept` based on an array of accepts provided +""" +if not accepts: +return + +accepts = list(map(lambda x: x.lower(), accepts)) + +if 'application/json' in accepts: +return 'application/json' +else: +return ', '.join(accepts) + +def select_header_content_type(self, content_types): +""" +Return `Content-Type` baseed on an array of content_types provided +""" +if not content_types: +return 'application/json' + +content_types = list(map(lambda x: x.lower(), content_types)) + +if 'application/json' in content_types: +return 'application/json' +else: +return content_types[0] + +def update_params_for_auth(self, headers, querys, auth_settings): +""" +Update header and query params based on authentication setting +""" +if not auth_settings: +return + +for auth in auth_settings: +auth_setting = configuration.auth_settings().get(auth) +if auth_setting: +if auth_setting['in'] == 'header': +headers[auth_setting['key']] = auth_setting['value'] +elif auth_setting['in'] == 'query': +querys[auth_setting['key']] = auth_setting['value'] +else: +raise ValueError('Authentication token must be in `query` or `header`') diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache index d3a7093a02a..967fabccd99 100644 --- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache @@ -3,44 +3,44 @@ import base64 import urllib3 def get_api_key_with_prefix(key): - global api_key - global api_key_prefix +global api_key +global api_key_prefix - if api_key.get(key) and api_key_prefix.get(key): - return api_key_prefix[key] + ' ' + api_key[key] - elif api_key.get(key): - return api_key[key] +if api_key.get(key) and api_key_prefix.get(key): +return api_key_prefix[key] + ' ' + api_key[key] +elif api_key.get(key): +return api_key[key] def get_basic_auth_token(): - global username - global password +global username +global password - return urllib3.util.make_headers(basic_auth=username + ':' + password).get('authorization') +return urllib3.util.make_headers(basic_auth=username + ':' + password).get('authorization') def auth_settings(): - return { {{#authMethods}}{{#isApiKey}} - '{{name}}': { - 'type': 'api_key', - 'in': {{#isKeyInHeader}}'header'{{/isKeyInHeader}}{{#isKeyInQuery}}'query'{{/isKeyInQuery}}, - 'key': '{{keyParamName}}', - 'value': get_api_key_with_prefix('{{keyParamName}}') - }, - {{/isApiKey}}{{#isBasic}} - '{{name}}': { - 'type': 'basic', - 'in': 'header', - 'key': 'Authorization', - 'value': get_basic_auth_token() - }, - {{/isBasic}}{{/authMethods}} - } +return { {{#authMethods}}{{#isApiKey}} + '{{name}}': { + 'type': 'api_key', + 'in': {{#isKeyInHeader}}'header'{{/isKeyInHeader}}{{#isKeyInQuery}}'query'{{/isKeyInQuery}}, + 'key': '{{keyParamName}}', + 'value': get_api_key_with_prefix('{{keyParamName}}') + }, +{{/isApiKey}}{{#isBasic}} + '{{name}}': { + 'type': 'basic', + 'in': 'header', + 'key': 'Authorization', + 'value': get_basic_auth_token() + }, +{{/isBasic}}{{/authMethods}} +} # Default Base url host = "{{basePath}}" # Default api client api_client = None - + # Authentication settings api_key = {} diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache index e9ede4cd221..629bc0342d3 100644 --- a/modules/swagger-codegen/src/main/resources/python/model.mustache +++ b/modules/swagger-codegen/src/main/resources/python/model.mustache @@ -2,30 +2,30 @@ # coding: utf-8 """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ {{#models}} -{{#model}} + {{#model}} -class {{classname}}(object): - """ - NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually. - """ + class {{classname}}(object): + """ + NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually. + """ - def __init__(self): + def __init__(self): """ Swagger model @@ -33,27 +33,27 @@ class {{classname}}(object): :param dict attributeMap: The key is attribute name and the value is json key in definition. """ self.swagger_types = { - {{#vars}}'{{name}}': '{{{datatype}}}'{{#hasMore}}, - {{/hasMore}}{{/vars}} + {{#vars}}'{{name}}': '{{{datatype}}}'{{#hasMore}}, + {{/hasMore}}{{/vars}} } self.attribute_map = { - {{#vars}}'{{name}}': '{{baseName}}'{{#hasMore}}, - {{/hasMore}}{{/vars}} + {{#vars}}'{{name}}': '{{baseName}}'{{#hasMore}}, + {{/hasMore}}{{/vars}} } {{#vars}} - {{#description}}# {{description}}{{/description}} - self.{{name}} = None # {{{datatype}}} + {{#description}}# {{description}}{{/description}} + self.{{name}} = None # {{{datatype}}} {{/vars}} - def __repr__(self): + def __repr__(self): properties = [] for p in self.__dict__: - if p != 'swaggerTypes' and p != 'attributeMap': - properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) + if p != 'swaggerTypes' and p != 'attributeMap': + properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) return '<{name} {props}>'.format(name=__name__, props=' '.join(properties)) -{{/model}} + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/python/rest.mustache b/modules/swagger-codegen/src/main/resources/python/rest.mustache index 508f3d6693a..d5c79d8395a 100644 --- a/modules/swagger-codegen/src/main/resources/python/rest.mustache +++ b/modules/swagger-codegen/src/main/resources/python/rest.mustache @@ -15,239 +15,239 @@ import certifi from six import iteritems try: - import urllib3 +import urllib3 except ImportError: - raise ImportError('Swagger python client requires urllib3.') +raise ImportError('Swagger python client requires urllib3.') try: - # for python3 - from urllib.parse import urlencode +# for python3 +from urllib.parse import urlencode except ImportError: - # for python2 - from urllib import urlencode +# for python2 +from urllib import urlencode class RESTResponse(io.IOBase): - def __init__(self, resp): - self.urllib3_response = resp - self.status = resp.status - self.reason = resp.reason - self.data = resp.data +def __init__(self, resp): +self.urllib3_response = resp +self.status = resp.status +self.reason = resp.reason +self.data = resp.data - def getheaders(self): - """ - Returns a dictionary of the response headers. - """ - return self.urllib3_response.getheaders() +def getheaders(self): +""" +Returns a dictionary of the response headers. +""" +return self.urllib3_response.getheaders() - def getheader(self, name, default=None): - """ - Returns a given response header. - """ - return self.urllib3_response.getheader(name, default) +def getheader(self, name, default=None): +""" +Returns a given response header. +""" +return self.urllib3_response.getheader(name, default) class RESTClientObject(object): - def __init__(self, pools_size=4): - # http pool manager - self.pool_manager = urllib3.PoolManager( - num_pools=pools_size - ) - - # https pool manager - # certificates validated using Mozilla’s root certificates - self.ssl_pool_manager = urllib3.PoolManager( - num_pools=pools_size, - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=certifi.where() - ) - - def agent(self, url): - """ - Return proper pool manager for the http\https schemes. - """ - url = urllib3.util.url.parse_url(url) - scheme = url.scheme - if scheme == 'https': - return self.ssl_pool_manager - else: - return self.pool_manager - - def request(self, method, url, query_params=None, headers=None, - body=None, post_params=None): - """ - :param method: http request method - :param url: http request url - :param query_params: query parameters in the url - :param headers: http request headers - :param body: request json body, for `application/json` - :param post_params: request post parameters, `application/x-www-form-urlencode` - and `multipart/form-data` - """ - method = method.upper() - assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH'] - - if post_params and body: - raise ValueError("body parameter cannot be used with post_params parameter.") - - post_params = post_params or {} - headers = headers or {} - - if 'Content-Type' not in headers: - headers['Content-Type'] = 'application/json' - - # For `POST`, `PUT`, `PATCH` - if method in ['POST', 'PUT', 'PATCH']: - if query_params: - url += '?' + urlencode(query_params) - if headers['Content-Type'] == 'application/json': - r = self.agent(url).request(method, url, - body=json.dumps(body), - headers=headers) - if headers['Content-Type'] == 'application/x-www-form-urlencoded': - r = self.agent(url).request(method, url, - fields=post_params, - encode_multipart=False, - headers=headers) - if headers['Content-Type'] == 'multipart/form-data': - # must del headers['Content-Type'], or the correct Content-Type - # which generated by urllib3 will be overwritten. - del headers['Content-Type'] - r = self.agent(url).request(method, url, - fields=post_params, - encode_multipart=True, - headers=headers) - # For `GET`, `HEAD`, `DELETE` - else: - r = self.agent(url).request(method, url, - fields=query_params, - headers=headers) - r = RESTResponse(r) - - if r.status not in range(200, 206): - raise ApiException(r) - - return self.process_response(r) - - def process_response(self, response): - # In the python 3, the response.data is bytes. - # we need to decode it to string. - if sys.version_info > (3,): - data = response.data.decode('utf8') - else: - data = response.data - try: - resp = json.loads(data) - except ValueError: - resp = data - - return resp - - def GET(self, url, headers=None, query_params=None): - return self.request("GET", url, headers=headers, query_params=query_params) - - def HEAD(self, url, headers=None, query_params=None): - return self.request("HEAD", url, headers=headers, query_params=query_params) - - def DELETE(self, url, headers=None, query_params=None): - return self.request("DELETE", url, headers=headers, query_params=query_params) - - def POST(self, url, headers=None, post_params=None, body=None): - return self.request("POST", url, headers=headers, post_params=post_params, body=body) - - def PUT(self, url, headers=None, post_params=None, body=None): - return self.request("PUT", url, headers=headers, post_params=post_params, body=body) - - def PATCH(self, url, headers=None, post_params=None, body=None): - return self.request("PATCH", url, headers=headers, post_params=post_params, body=body) +def __init__(self, pools_size=4): +# http pool manager +self.pool_manager = urllib3.PoolManager( +num_pools=pools_size +) + +# https pool manager +# certificates validated using Mozilla’s root certificates +self.ssl_pool_manager = urllib3.PoolManager( +num_pools=pools_size, +cert_reqs=ssl.CERT_REQUIRED, +ca_certs=certifi.where() +) + +def agent(self, url): +""" +Return proper pool manager for the http\https schemes. +""" +url = urllib3.util.url.parse_url(url) +scheme = url.scheme +if scheme == 'https': +return self.ssl_pool_manager +else: +return self.pool_manager + +def request(self, method, url, query_params=None, headers=None, +body=None, post_params=None): +""" +:param method: http request method +:param url: http request url +:param query_params: query parameters in the url +:param headers: http request headers +:param body: request json body, for `application/json` +:param post_params: request post parameters, `application/x-www-form-urlencode` +and `multipart/form-data` +""" +method = method.upper() +assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH'] + +if post_params and body: +raise ValueError("body parameter cannot be used with post_params parameter.") + +post_params = post_params or {} +headers = headers or {} + +if 'Content-Type' not in headers: +headers['Content-Type'] = 'application/json' + +# For `POST`, `PUT`, `PATCH` +if method in ['POST', 'PUT', 'PATCH']: +if query_params: +url += '?' + urlencode(query_params) +if headers['Content-Type'] == 'application/json': +r = self.agent(url).request(method, url, +body=json.dumps(body), +headers=headers) +if headers['Content-Type'] == 'application/x-www-form-urlencoded': +r = self.agent(url).request(method, url, +fields=post_params, +encode_multipart=False, +headers=headers) +if headers['Content-Type'] == 'multipart/form-data': +# must del headers['Content-Type'], or the correct Content-Type +# which generated by urllib3 will be overwritten. +del headers['Content-Type'] +r = self.agent(url).request(method, url, +fields=post_params, +encode_multipart=True, +headers=headers) +# For `GET`, `HEAD`, `DELETE` +else: +r = self.agent(url).request(method, url, +fields=query_params, +headers=headers) +r = RESTResponse(r) + +if r.status not in range(200, 206): +raise ApiException(r) + +return self.process_response(r) + +def process_response(self, response): +# In the python 3, the response.data is bytes. +# we need to decode it to string. +if sys.version_info > (3,): +data = response.data.decode('utf8') +else: +data = response.data +try: +resp = json.loads(data) +except ValueError: +resp = data + +return resp + +def GET(self, url, headers=None, query_params=None): +return self.request("GET", url, headers=headers, query_params=query_params) + +def HEAD(self, url, headers=None, query_params=None): +return self.request("HEAD", url, headers=headers, query_params=query_params) + +def DELETE(self, url, headers=None, query_params=None): +return self.request("DELETE", url, headers=headers, query_params=query_params) + +def POST(self, url, headers=None, post_params=None, body=None): +return self.request("POST", url, headers=headers, post_params=post_params, body=body) + +def PUT(self, url, headers=None, post_params=None, body=None): +return self.request("PUT", url, headers=headers, post_params=post_params, body=body) + +def PATCH(self, url, headers=None, post_params=None, body=None): +return self.request("PATCH", url, headers=headers, post_params=post_params, body=body) class ApiException(Exception): - """ - Non-2xx HTTP response - """ - - def __init__(self, http_resp): - self.status = http_resp.status - self.reason = http_resp.reason - self.body = http_resp.data - self.headers = http_resp.getheaders() - - # In the python 3, the self.body is bytes. - # we need to decode it to string. - if sys.version_info > (3,): - data = self.body.decode('utf8') - else: - data = self.body - - try: - self.body = json.loads(data) - except ValueError: - self.body = data - - def __str__(self): - """ - Custom error response messages - """ - return "({0})\n"\ - "Reason: {1}\n"\ - "HTTP response headers: {2}\n"\ - "HTTP response body: {3}\n".\ - format(self.status, self.reason, self.headers, self.body) +""" +Non-2xx HTTP response +""" + +def __init__(self, http_resp): +self.status = http_resp.status +self.reason = http_resp.reason +self.body = http_resp.data +self.headers = http_resp.getheaders() + +# In the python 3, the self.body is bytes. +# we need to decode it to string. +if sys.version_info > (3,): +data = self.body.decode('utf8') +else: +data = self.body + +try: +self.body = json.loads(data) +except ValueError: +self.body = data + +def __str__(self): +""" +Custom error response messages +""" +return "({0})\n"\ +"Reason: {1}\n"\ +"HTTP response headers: {2}\n"\ +"HTTP response body: {3}\n".\ +format(self.status, self.reason, self.headers, self.body) class RESTClient(object): - """ - A class with all class methods to perform JSON requests. - """ - - IMPL = RESTClientObject() - - @classmethod - def request(cls, *n, **kw): - """ - Perform a REST request and parse the response. - """ - return cls.IMPL.request(*n, **kw) - - @classmethod - def GET(cls, *n, **kw): - """ - Perform a GET request using `RESTClient.request()`. - """ - return cls.IMPL.GET(*n, **kw) - - @classmethod - def HEAD(cls, *n, **kw): - """ - Perform a HEAD request using `RESTClient.request()`. - """ - return cls.IMPL.GET(*n, **kw) - - @classmethod - def POST(cls, *n, **kw): - """ - Perform a POST request using `RESTClient.request()` - """ - return cls.IMPL.POST(*n, **kw) - - @classmethod - def PUT(cls, *n, **kw): - """ - Perform a PUT request using `RESTClient.request()` - """ - return cls.IMPL.PUT(*n, **kw) - - @classmethod - def PATCH(cls, *n, **kw): - """ - Perform a PATCH request using `RESTClient.request()` - """ - return cls.IMPL.PATCH(*n, **kw) - - @classmethod - def DELETE(cls, *n, **kw): - """ - Perform a DELETE request using `RESTClient.request()` - """ - return cls.IMPL.DELETE(*n, **kw) +""" +A class with all class methods to perform JSON requests. +""" + +IMPL = RESTClientObject() + +@classmethod +def request(cls, *n, **kw): +""" +Perform a REST request and parse the response. +""" +return cls.IMPL.request(*n, **kw) + +@classmethod +def GET(cls, *n, **kw): +""" +Perform a GET request using `RESTClient.request()`. +""" +return cls.IMPL.GET(*n, **kw) + +@classmethod +def HEAD(cls, *n, **kw): +""" +Perform a HEAD request using `RESTClient.request()`. +""" +return cls.IMPL.GET(*n, **kw) + +@classmethod +def POST(cls, *n, **kw): +""" +Perform a POST request using `RESTClient.request()` +""" +return cls.IMPL.POST(*n, **kw) + +@classmethod +def PUT(cls, *n, **kw): +""" +Perform a PUT request using `RESTClient.request()` +""" +return cls.IMPL.PUT(*n, **kw) + +@classmethod +def PATCH(cls, *n, **kw): +""" +Perform a PATCH request using `RESTClient.request()` +""" +return cls.IMPL.PATCH(*n, **kw) + +@classmethod +def DELETE(cls, *n, **kw): +""" +Perform a DELETE request using `RESTClient.request()` +""" +return cls.IMPL.DELETE(*n, **kw) diff --git a/modules/swagger-codegen/src/main/resources/python/setup.mustache b/modules/swagger-codegen/src/main/resources/python/setup.mustache index f1ba52d2930..59c8f7f428a 100644 --- a/modules/swagger-codegen/src/main/resources/python/setup.mustache +++ b/modules/swagger-codegen/src/main/resources/python/setup.mustache @@ -3,18 +3,18 @@ from setuptools import setup, find_packages {{#apiInfo}}{{#apis}}{{^hasMore}} -# To install the library, open a Terminal shell, then run this -# file by typing: -# -# python setup.py install -# -# You need to have the setuptools module installed. -# Try reading the setuptools documentation: -# http://pypi.python.org/pypi/setuptools - -REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi"] - -setup( + # To install the library, open a Terminal shell, then run this + # file by typing: + # + # python setup.py install + # + # You need to have the setuptools module installed. + # Try reading the setuptools documentation: + # http://pypi.python.org/pypi/setuptools + + REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi"] + + setup( name="{{module}}", version="{{version}}", description="{{appName}}", @@ -27,7 +27,7 @@ setup( long_description="""\ {{appDescription}} """ -) + ) {{/hasMore}}{{/apis}}{{/apiInfo}} diff --git a/modules/swagger-codegen/src/main/resources/python3/__init__.mustache b/modules/swagger-codegen/src/main/resources/python3/__init__.mustache index 4b41ee706c7..1ca7f06ecf2 100644 --- a/modules/swagger-codegen/src/main/resources/python3/__init__.mustache +++ b/modules/swagger-codegen/src/main/resources/python3/__init__.mustache @@ -5,5 +5,5 @@ import os __all__ = [] for module in os.listdir(os.path.dirname(__file__)): - if module != '__init__.py' and module[-3:] == '.py': - __all__.append(module[:-3]) +if module != '__init__.py' and module[-3:] == '.py': +__all__.append(module[:-3]) diff --git a/modules/swagger-codegen/src/main/resources/python3/api.mustache b/modules/swagger-codegen/src/main/resources/python3/api.mustache index cec4482a569..a40574ca3c2 100644 --- a/modules/swagger-codegen/src/main/resources/python3/api.mustache +++ b/modules/swagger-codegen/src/main/resources/python3/api.mustache @@ -1,19 +1,19 @@ #!/usr/bin/env python """ {{classname}}.py -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ @@ -24,20 +24,20 @@ from .models import * {{#operations}} -class {{classname}}(object): + class {{classname}}(object): def __init__(self, apiClient): - self.apiClient = apiClient + self.apiClient = apiClient {{newline}} {{#operation}} - def {{nickname}}(self, {{#requiredParams}}{{paramName}}{{#defaultValue}} = None{{/defaultValue}}, {{/requiredParams}}**kwargs): + def {{nickname}}(self, {{#requiredParams}}{{paramName}}{{#defaultValue}} = None{{/defaultValue}}, {{/requiredParams}}**kwargs): """{{{summary}}} {{{notes}}} Args: - {{#allParams}}{{paramName}}, {{dataType}}: {{{description}}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}} - {{/allParams}} + {{#allParams}}{{paramName}}, {{dataType}}: {{{description}}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}} + {{/allParams}} Returns: {{returnType}} """ @@ -46,9 +46,9 @@ class {{classname}}(object): params = locals() for (key, val) in params['kwargs'].items(): - if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method {{nickname}}" % key) - params[key] = val + if key not in allParams: + raise TypeError("Got an unexpected keyword argument '%s' to method {{nickname}}" % key) + params[key] = val del params['kwargs'] resourcePath = '{{path}}' @@ -59,37 +59,37 @@ class {{classname}}(object): headerParams = {} {{#queryParams}} - if ('{{paramName}}' in params): + if ('{{paramName}}' in params): queryParams['{{paramName}}'] = self.apiClient.toPathValue(params['{{paramName}}']) {{/queryParams}} {{#headerParams}} - if ('{{paramName}}' in params): + if ('{{paramName}}' in params): headerParams['{{paramName}}'] = params['{{paramName}}'] {{/headerParams}} {{#pathParams}} - if ('{{paramName}}' in params): + if ('{{paramName}}' in params): replacement = str(self.apiClient.toPathValue(params['{{paramName}}'])) resourcePath = resourcePath.replace('{' + '{{baseName}}' + '}', - replacement) + replacement) {{/pathParams}} postData = (params['body'] if 'body' in params else None) response = self.apiClient.callAPI(resourcePath, method, queryParams, - postData, headerParams) + postData, headerParams) {{#returnType}} - if not response: + if not response: return None - responseObject = self.apiClient.deserialize(response, '{{returnType}}') - return responseObject + responseObject = self.apiClient.deserialize(response, '{{returnType}}') + return responseObject {{/returnType}} {{newline}} {{newline}} {{/operation}} -{{newline}} + {{newline}} {{/operations}} {{newline}} diff --git a/modules/swagger-codegen/src/main/resources/python3/model.mustache b/modules/swagger-codegen/src/main/resources/python3/model.mustache index f6e95c72dc6..63d2bedc3da 100644 --- a/modules/swagger-codegen/src/main/resources/python3/model.mustache +++ b/modules/swagger-codegen/src/main/resources/python3/model.mustache @@ -1,40 +1,40 @@ #!/usr/bin/env python """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ {{#models}} -{{#model}} + {{#model}} -class {{classname}}: - """NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually.""" + class {{classname}}: + """NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually.""" - def __init__(self): + def __init__(self): self.swaggerTypes = { - {{#vars}} + {{#vars}} '{{name}}': '{{{datatype}}}'{{#hasMore}}, {{/hasMore}} - {{/vars}}{{newline}} + {{/vars}}{{newline}} } {{#vars}} - {{#description}}#{{description}} - {{/description}} - self.{{name}} = None # {{{datatype}}} + {{#description}}#{{description}} + {{/description}} + self.{{name}} = None # {{{datatype}}} {{/vars}} -{{/model}} + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/python3/swagger.mustache b/modules/swagger-codegen/src/main/resources/python3/swagger.mustache index f99f0d4d250..55834b3fd3a 100644 --- a/modules/swagger-codegen/src/main/resources/python3/swagger.mustache +++ b/modules/swagger-codegen/src/main/resources/python3/swagger.mustache @@ -16,215 +16,215 @@ from .models import * class ApiClient: - """Generic API client for Swagger client library builds""" - - def __init__(self, apiKey=None, apiServer=None): - if apiKey == None: - raise Exception('You must pass an apiKey when instantiating the ' - 'APIClient') - self.apiKey = apiKey - self.apiServer = apiServer - self.cookie = None - - def callAPI(self, resourcePath, method, queryParams, postData, - headerParams=None): - - url = self.apiServer + resourcePath - headers = {} - if headerParams: - for param, value in headerParams.items(): - headers[param] = value - - #headers['Content-type'] = 'application/json' - headers['api_key'] = self.apiKey - - if self.cookie: - headers['Cookie'] = self.cookie - - data = None - - if queryParams: - # Need to remove None values, these should not be sent - sentQueryParams = {} - for param, value in queryParams.items(): - if value != None: - sentQueryParams[param] = value - url = url + '?' + urllib.parse.urlencode(sentQueryParams) - - if method in ['GET']: - - #Options to add statements later on and for compatibility - pass - - elif method in ['PATCH', 'POST', 'PUT', 'DELETE']: - - if postData: - headers['Content-type'] = 'application/json' - data = self.sanitizeForSerialization(postData) - data = json.dumps(data) - - else: - raise Exception('Method ' + method + ' is not recognized.') - - if data: - data = data.encode('utf-8') - - requestParams = MethodRequest(method=method, url=url, - headers=headers, data=data) - - # Make the request - request = urllib.request.urlopen(requestParams) - encoding = request.headers.get_content_charset() - if not encoding: - encoding = 'iso-8859-1' - response = request.read().decode(encoding) - - try: - data = json.loads(response) - except ValueError: # PUT requests don't return anything - data = None - - return data - - def toPathValue(self, obj): - """Convert a string or object to a path-friendly value - Args: - obj -- object or string value - Returns: - string -- quoted value - """ - if type(obj) == list: - return urllib.parse.quote(','.join(obj)) - else: - return urllib.parse.quote(str(obj)) - - def sanitizeForSerialization(self, obj): - """Dump an object into JSON for POSTing.""" - - if type(obj) == type(None): - return None - elif type(obj) in [str, int, float, bool]: - return obj - elif type(obj) == list: - return [self.sanitizeForSerialization(subObj) for subObj in obj] - elif type(obj) == datetime.datetime: - return obj.isoformat() - else: - if type(obj) == dict: - objDict = obj - else: - objDict = obj.__dict__ - return {key: self.sanitizeForSerialization(val) - for (key, val) in objDict.items() - if key != 'swaggerTypes'} - - def _iso8601Format(self, timesep, microsecond, offset, zulu): - """Format for parsing a datetime string with given properties. - - Args: - timesep -- string separating time from date ('T' or 't') - microsecond -- microsecond portion of time ('.XXX') - offset -- time offset (+/-XX:XX) or None - zulu -- 'Z' or 'z' for UTC, or None for time offset (+/-XX:XX) - - Returns: - str - format string for datetime.strptime""" - - return '%Y-%m-%d{}%H:%M:%S{}{}'.format( - timesep, - '.%f' if microsecond else '', - zulu or ('%z' if offset else '')) - - # http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 - _iso8601Regex = re.compile( - r'^\d\d\d\d-\d\d-\d\d([Tt])\d\d:\d\d:\d\d(\.\d+)?(([Zz])|(\+|-)\d\d:?\d\d)?$') - - def _parseDatetime(self, d): - if d is None: - return None - m = ApiClient._iso8601Regex.match(d) - if not m: - raise Exception('datetime regex match failed "%s"' % d) - timesep, microsecond, offset, zulu, plusminus = m.groups() - format = self._iso8601Format(timesep, microsecond, offset, zulu) - if offset and not zulu: - d = d.rsplit(sep=plusminus, maxsplit=1)[0] + offset.replace(':', '') - return datetime.datetime.strptime(d, format) - - def deserialize(self, obj, objClass): - """Derialize a JSON string into an object. - - Args: - obj -- string or object to be deserialized - objClass -- class literal for deserialzied object, or string - of class name - Returns: - object -- deserialized object""" - - # Have to accept objClass as string or actual type. Type could be a - # native Python type, or one of the model classes. - if type(objClass) == str: - if 'list[' in objClass: - match = re.match('list\[(.*)\]', objClass) - subClass = match.group(1) - return [self.deserialize(subObj, subClass) for subObj in obj] - - if (objClass in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']): - objClass = eval(objClass) - else: # not a native type, must be model class - objClass = eval(objClass + '.' + objClass) - - if objClass in [int, float, dict, list, str, bool]: - return objClass(obj) - elif objClass == datetime: - return self._parseDatetime(obj) - - instance = objClass() - - for attr, attrType in instance.swaggerTypes.items(): - - if attr in obj: - value = obj[attr] - if attrType in ['str', 'int', 'float', 'bool']: - attrType = eval(attrType) - try: - value = attrType(value) - except UnicodeEncodeError: - value = unicode(value) - except TypeError: - value = value - setattr(instance, attr, value) - elif (attrType == 'datetime'): - setattr(instance, attr, self._parseDatetime(value)) - elif 'list[' in attrType: - match = re.match('list\[(.*)\]', attrType) - subClass = match.group(1) - subValues = [] - if not value: - setattr(instance, attr, None) - else: - for subValue in value: - subValues.append(self.deserialize(subValue, - subClass)) - setattr(instance, attr, subValues) - else: - setattr(instance, attr, self.deserialize(value, - attrType)) - - return instance +"""Generic API client for Swagger client library builds""" + +def __init__(self, apiKey=None, apiServer=None): +if apiKey == None: +raise Exception('You must pass an apiKey when instantiating the ' +'APIClient') +self.apiKey = apiKey +self.apiServer = apiServer +self.cookie = None + +def callAPI(self, resourcePath, method, queryParams, postData, +headerParams=None): + +url = self.apiServer + resourcePath +headers = {} +if headerParams: +for param, value in headerParams.items(): +headers[param] = value + +#headers['Content-type'] = 'application/json' +headers['api_key'] = self.apiKey + +if self.cookie: +headers['Cookie'] = self.cookie + +data = None + +if queryParams: +# Need to remove None values, these should not be sent +sentQueryParams = {} +for param, value in queryParams.items(): +if value != None: +sentQueryParams[param] = value +url = url + '?' + urllib.parse.urlencode(sentQueryParams) + +if method in ['GET']: + +#Options to add statements later on and for compatibility +pass + +elif method in ['PATCH', 'POST', 'PUT', 'DELETE']: + +if postData: +headers['Content-type'] = 'application/json' +data = self.sanitizeForSerialization(postData) +data = json.dumps(data) + +else: +raise Exception('Method ' + method + ' is not recognized.') + +if data: +data = data.encode('utf-8') + +requestParams = MethodRequest(method=method, url=url, +headers=headers, data=data) + +# Make the request +request = urllib.request.urlopen(requestParams) +encoding = request.headers.get_content_charset() +if not encoding: +encoding = 'iso-8859-1' +response = request.read().decode(encoding) + +try: +data = json.loads(response) +except ValueError: # PUT requests don't return anything +data = None + +return data + +def toPathValue(self, obj): +"""Convert a string or object to a path-friendly value +Args: +obj -- object or string value +Returns: +string -- quoted value +""" +if type(obj) == list: +return urllib.parse.quote(','.join(obj)) +else: +return urllib.parse.quote(str(obj)) + +def sanitizeForSerialization(self, obj): +"""Dump an object into JSON for POSTing.""" + +if type(obj) == type(None): +return None +elif type(obj) in [str, int, float, bool]: +return obj +elif type(obj) == list: +return [self.sanitizeForSerialization(subObj) for subObj in obj] +elif type(obj) == datetime.datetime: +return obj.isoformat() +else: +if type(obj) == dict: +objDict = obj +else: +objDict = obj.__dict__ +return {key: self.sanitizeForSerialization(val) +for (key, val) in objDict.items() +if key != 'swaggerTypes'} + +def _iso8601Format(self, timesep, microsecond, offset, zulu): +"""Format for parsing a datetime string with given properties. + +Args: +timesep -- string separating time from date ('T' or 't') +microsecond -- microsecond portion of time ('.XXX') +offset -- time offset (+/-XX:XX) or None +zulu -- 'Z' or 'z' for UTC, or None for time offset (+/-XX:XX) + +Returns: +str - format string for datetime.strptime""" + +return '%Y-%m-%d{}%H:%M:%S{}{}'.format( +timesep, +'.%f' if microsecond else '', +zulu or ('%z' if offset else '')) + +# http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 +_iso8601Regex = re.compile( +r'^\d\d\d\d-\d\d-\d\d([Tt])\d\d:\d\d:\d\d(\.\d+)?(([Zz])|(\+|-)\d\d:?\d\d)?$') + +def _parseDatetime(self, d): +if d is None: +return None +m = ApiClient._iso8601Regex.match(d) +if not m: +raise Exception('datetime regex match failed "%s"' % d) +timesep, microsecond, offset, zulu, plusminus = m.groups() +format = self._iso8601Format(timesep, microsecond, offset, zulu) +if offset and not zulu: +d = d.rsplit(sep=plusminus, maxsplit=1)[0] + offset.replace(':', '') +return datetime.datetime.strptime(d, format) + +def deserialize(self, obj, objClass): +"""Derialize a JSON string into an object. + +Args: +obj -- string or object to be deserialized +objClass -- class literal for deserialzied object, or string +of class name +Returns: +object -- deserialized object""" + +# Have to accept objClass as string or actual type. Type could be a +# native Python type, or one of the model classes. +if type(objClass) == str: +if 'list[' in objClass: +match = re.match('list\[(.*)\]', objClass) +subClass = match.group(1) +return [self.deserialize(subObj, subClass) for subObj in obj] + +if (objClass in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']): +objClass = eval(objClass) +else: # not a native type, must be model class +objClass = eval(objClass + '.' + objClass) + +if objClass in [int, float, dict, list, str, bool]: +return objClass(obj) +elif objClass == datetime: +return self._parseDatetime(obj) + +instance = objClass() + +for attr, attrType in instance.swaggerTypes.items(): + +if attr in obj: +value = obj[attr] +if attrType in ['str', 'int', 'float', 'bool']: +attrType = eval(attrType) +try: +value = attrType(value) +except UnicodeEncodeError: +value = unicode(value) +except TypeError: +value = value +setattr(instance, attr, value) +elif (attrType == 'datetime'): +setattr(instance, attr, self._parseDatetime(value)) +elif 'list[' in attrType: +match = re.match('list\[(.*)\]', attrType) +subClass = match.group(1) +subValues = [] +if not value: +setattr(instance, attr, None) +else: +for subValue in value: +subValues.append(self.deserialize(subValue, +subClass)) +setattr(instance, attr, subValues) +else: +setattr(instance, attr, self.deserialize(value, +attrType)) + +return instance class MethodRequest(urllib.request.Request): - def __init__(self, *args, **kwargs): - """Construct a MethodRequest. Usage is the same as for - `urllib.Request` except it also takes an optional `method` - keyword argument. If supplied, `method` will be used instead of - the default.""" +def __init__(self, *args, **kwargs): +"""Construct a MethodRequest. Usage is the same as for +`urllib.Request` except it also takes an optional `method` +keyword argument. If supplied, `method` will be used instead of +the default.""" - if 'method' in kwargs: - self.method = kwargs.pop('method') - return urllib.request.Request.__init__(self, *args, **kwargs) +if 'method' in kwargs: +self.method = kwargs.pop('method') +return urllib.request.Request.__init__(self, *args, **kwargs) - def get_method(self): - return getattr(self, 'method', urllib.request.Request.get_method(self)) +def get_method(self): +return getattr(self, 'method', urllib.request.Request.get_method(self)) diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache index b6341104188..88d1bce3563 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache @@ -2,180 +2,186 @@ #include "{{prefix}}Helpers.h" #include "{{prefix}}ModelFactory.h" -#include -#include - -namespace Swagger { -{{classname}}::{{classname}}() {} - -{{classname}}::~{{classname}}() {} - -{{classname}}::{{classname}}(QString host, QString basePath) { - this->host = host; - this->basePath = basePath; -} - -{{#operations}} -{{#operation}} -void -{{classname}}::{{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("{{path}}"); - - {{#pathParams}} - QString {{paramName}}PathParam("{"); {{paramName}}PathParam.append("{{paramName}}").append("}"); - fullPath.replace({{paramName}}PathParam, stringValue({{paramName}})); - {{/pathParams}} - - {{#queryParams}} - {{^collectionFormat}} - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append(QUrl::toPercentEncoding("{{paramName}}")) - .append("=") - .append(QUrl::toPercentEncoding(stringValue({{paramName}}))); - {{/collectionFormat}} - - {{#collectionFormat}} - - if({{{paramName}}}->size() > 0) { - if(QString("{{collectionFormat}}").indexOf("multi") == 0) { - foreach({{{baseType}}} t, *{{paramName}}) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("{{{paramName}}}=").append(stringValue(t)); - } - } - else if (QString("{{collectionFormat}}").indexOf("ssv") == 0) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("{{paramName}}="); - qint32 count = 0; - foreach({{{baseType}}} t, *{{paramName}}) { - if(count > 0) { - fullPath.append(" "); - } - fullPath.append(stringValue(t)); - } - } - else if (QString("{{collectionFormat}}").indexOf("tsv") == 0) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("{{paramName}}="); - qint32 count = 0; - foreach({{{baseType}}} t, *{{paramName}}) { - if(count > 0) { - fullPath.append("\t"); - } - fullPath.append(stringValue(t)); +#include + + #include + + + namespace Swagger { + {{classname}}::{{classname}}() {} + + {{classname}}::~{{classname}}() {} + + {{classname}}::{{classname}}(QString host, QString basePath) { + this->host = host; + this->basePath = basePath; } - } - } - - {{/collectionFormat}} - {{/queryParams}} - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "{{httpMethod}}"); - - {{#formParams}}{{^isFile}} - if({{paramName}} != NULL) { - input.add_var("{{paramName}}", *{{paramName}}); - } - {{/isFile}}{{/formParams}} - - {{#bodyParams}} - {{#isContainer}} - QJsonArray* {{paramName}}Array = new QJsonArray(); - toJsonArray((QList*){{paramName}}, {{paramName}}Array, QString("body"), QString("SWGUser*")); - - QJsonDocument doc(*{{paramName}}Array); - QByteArray bytes = doc.toJson(); - - input.request_body.append(bytes); - {{/isContainer}} - {{^isContainer}} - QString output = {{paramName}}.asJson(); - input.request_body.append(output); - {{/isContainer}}{{/bodyParams}} - - {{#headerParams}} - // TODO: add header support - {{/headerParams}} - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &{{classname}}::{{nickname}}Callback); - - worker->execute(&input); -} - -void -{{classname}}::{{nickname}}Callback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - {{#returnType}}{{#isListContainer}} - {{{returnType}}} output = {{{defaultResponse}}}; - QString json(worker->response); - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonArray jsonArray = doc.array(); - - foreach(QJsonValue obj, jsonArray) { - {{{returnBaseType}}}* o = new {{returnBaseType}}(); - QJsonObject jv = obj.toObject(); - QJsonObject * ptr = (QJsonObject*)&jv; - o->fromJsonObject(*ptr); - output->append(o); - } - {{/isListContainer}} - - {{^isListContainer}}{{#returnTypeIsPrimitive}} - {{{returnType}}} output; // TODO add primitive output support - {{/returnTypeIsPrimitive}} - {{#isMapContainer}} - {{{returnType}}} output = {{{defaultResponse}}}; - - QString json(worker->response); - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject obj = doc.object(); - - foreach(QString key, obj.keys()) { - qint32* val; - setValue(&val, obj[key], "{{returnBaseType}}", ""); - output->insert(key, *val); - } - - - {{/isMapContainer}} - {{^isMapContainer}} - {{^returnTypeIsPrimitive}}QString json(worker->response); - {{{returnType}}} output = static_cast<{{{returnType}}}>(create(json, QString("{{{returnBaseType}}}"))); - {{/returnTypeIsPrimitive}} - {{/isMapContainer}} - {{/isListContainer}}{{/returnType}} - - worker->deleteLater(); - - {{#returnType}}emit {{nickname}}Signal(output);{{/returnType}} - {{^returnType}}emit {{nickname}}Signal();{{/returnType}} -} -{{/operation}} -{{/operations}} -} /* namespace Swagger */ + + {{#operations}} + {{#operation}} + void + {{classname}}::{{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}} + , {{/hasMore}}{{/allParams}}) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("{{path}}"); + + {{#pathParams}} + QString {{paramName}}PathParam("{"); {{paramName}}PathParam.append("{{paramName}}").append("}"); + fullPath.replace({{paramName}}PathParam, stringValue({{paramName}})); + {{/pathParams}} + + {{#queryParams}} + {{^collectionFormat}} + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append(QUrl::toPercentEncoding("{{paramName}}")) + .append("=") + .append(QUrl::toPercentEncoding(stringValue({{paramName}}))); + {{/collectionFormat}} + + {{#collectionFormat}} + + if({{{paramName}}}->size() > 0) { + if(QString("{{collectionFormat}}").indexOf("multi") == 0) { + foreach({{{baseType}}} t, *{{paramName}}) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("{{{paramName}}}=").append(stringValue(t)); + } + } + else if (QString("{{collectionFormat}}").indexOf("ssv") == 0) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("{{paramName}}="); + qint32 count = 0; + foreach({{{baseType}}} t, *{{paramName}}) { + if(count > 0) { + fullPath.append(" "); + } + fullPath.append(stringValue(t)); + } + } + else if (QString("{{collectionFormat}}").indexOf("tsv") == 0) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("{{paramName}}="); + qint32 count = 0; + foreach({{{baseType}}} t, *{{paramName}}) { + if(count > 0) { + fullPath.append("\t"); + } + fullPath.append(stringValue(t)); + } + } + } + + {{/collectionFormat}} + {{/queryParams}} + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "{{httpMethod}}"); + + {{#formParams}}{{^isFile}} + if({{paramName}} != NULL) { + input.add_var("{{paramName}}", *{{paramName}}); + } + {{/isFile}}{{/formParams}} + + {{#bodyParams}} + {{#isContainer}} + QJsonArray* {{paramName}}Array = new QJsonArray(); + toJsonArray((QList + *){{paramName}}, {{paramName}}Array, QString("body"), QString("SWGUser*")); + + QJsonDocument doc(*{{paramName}}Array); + QByteArray bytes = doc.toJson(); + + input.request_body.append(bytes); + {{/isContainer}} + {{^isContainer}} + QString output = {{paramName}}.asJson(); + input.request_body.append(output); + {{/isContainer}}{{/bodyParams}} + + {{#headerParams}} + // TODO: add header support + {{/headerParams}} + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &{{classname}}::{{nickname}}Callback); + + worker->execute(&input); + } + + void + {{classname}}::{{nickname}}Callback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + {{#returnType}}{{#isListContainer}} + {{{returnType}}} output = {{{defaultResponse}}}; + QString json(worker->response); + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonArray jsonArray = doc.array(); + + foreach(QJsonValue obj, jsonArray) { + {{{returnBaseType}}}* o = new {{returnBaseType}}(); + QJsonObject jv = obj.toObject(); + QJsonObject * ptr = (QJsonObject*)&jv; + o->fromJsonObject(*ptr); + output->append(o); + } + {{/isListContainer}} + + {{^isListContainer}}{{#returnTypeIsPrimitive}} + {{{returnType}}} output; // TODO add primitive output support + {{/returnTypeIsPrimitive}} + {{#isMapContainer}} + {{{returnType}}} output = {{{defaultResponse}}}; + + QString json(worker->response); + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject obj = doc.object(); + + foreach(QString key, obj.keys()) { + qint32* val; + setValue(&val, obj[key], "{{returnBaseType}}", ""); + output->insert(key, *val); + } + + + {{/isMapContainer}} + {{^isMapContainer}} + {{^returnTypeIsPrimitive}}QString json(worker->response); + {{{returnType}}} output = static_cast<{{{returnType}}}>(create(json, + QString("{{{returnBaseType}}}"))); + {{/returnTypeIsPrimitive}} + {{/isMapContainer}} + {{/isListContainer}}{{/returnType}} + + worker->deleteLater(); + + {{#returnType}}emit {{nickname}}Signal(output);{{/returnType}} + {{^returnType}}emit {{nickname}}Signal();{{/returnType}} + } + {{/operation}} + {{/operations}} + } /* namespace Swagger */ diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/api-header.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/api-header.mustache index 4260ba6ff86..ffee582a4fc 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/api-header.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/api-header.mustache @@ -6,14 +6,15 @@ {{#imports}}{{{import}}} {{/imports}} -#include +#include + -namespace Swagger { + namespace Swagger { -class {{classname}}: public QObject { + class {{classname}}: public QObject { Q_OBJECT -public: + public: {{classname}}(); {{classname}}(QString host, QString basePath); ~{{classname}}(); @@ -21,14 +22,15 @@ public: QString host; QString basePath; - {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); + {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}} + , {{/hasMore}}{{/allParams}}); {{/operation}}{{/operations}} -private: + private: {{#operations}}{{#operation}}void {{nickname}}Callback (HttpRequestWorker * worker); {{/operation}}{{/operations}} -signals: + signals: {{#operations}}{{#operation}}void {{nickname}}Signal({{#returnType}}{{{returnType}}} summary{{/returnType}}); {{/operation}}{{/operations}} -}; -} -#endif \ No newline at end of file + }; + } + #endif \ No newline at end of file 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..0cc60d91b90 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache @@ -1,166 +1,201 @@ #include "SWGHelpers.h" #include "SWGModelFactory.h" #include "SWGObject.h" -#import -#import -#import +#import + + #import + + #import + -namespace Swagger { + namespace Swagger { -void -setValue(void* value, QJsonValue obj, QString type, QString complexType) { - if(value == NULL) { - // can't set value with a null pointer - return; - } - if(QStringLiteral("bool").compare(type) == 0) { - bool * val = static_cast(value); - *val = obj.toBool(); - } - else if(QStringLiteral("qint32").compare(type) == 0) { - qint32 *val = static_cast(value); - *val = obj.toInt(); - } - else if(QStringLiteral("qint64").compare(type) == 0) { - qint64 *val = static_cast(value); - *val = obj.toVariant().toLongLong(); - } - else if (QStringLiteral("QString").compare(type) == 0) { - QString **val = static_cast(value); + void + setValue(void* value, QJsonValue obj, QString type, QString complexType) { + if(value == NULL) { + // can't set value with a null pointer + return; + } + if(QStringLiteral("bool").compare(type) == 0) { + bool * val = static_cast + (value); + *val = obj.toBool(); + } + else if(QStringLiteral("qint32").compare(type) == 0) { + qint32 *val = static_cast + (value); + *val = obj.toInt(); + } + else if(QStringLiteral("qint64").compare(type) == 0) { + qint64 *val = static_cast + (value); + *val = obj.toVariant().toLongLong(); + } + else if (QStringLiteral("QString").compare(type) == 0) { + QString **val = static_cast + (value); - if(val != NULL) { + if(val != NULL) { if(!obj.isNull()) { - // create a new value and return - delete *val; - *val = new QString(obj.toString()); - return; + // create a new value and return + delete *val; + *val = new QString(obj.toString()); + return; } else { - // set target to NULL - delete *val; - *val = NULL; + // set target to NULL + delete *val; + *val = NULL; + } } - } - else { + else { qDebug() << "Can't set value because the target pointer is NULL"; - } - } - else if(type.startsWith("SWG") && obj.isObject()) { - // complex type - QJsonObject jsonObj = obj.toObject(); - SWGObject * so = (SWGObject*)Swagger::create(type); - if(so != NULL) { + } + } + else if(type.startsWith("SWG") && obj.isObject()) { + // complex type + QJsonObject jsonObj = obj.toObject(); + SWGObject * so = (SWGObject*)Swagger::create(type); + if(so != NULL) { so->fromJsonObject(jsonObj); - SWGObject **val = static_cast(value); + SWGObject **val = static_cast + (value); delete *val; *val = so; - } - } - else if(type.startsWith("QList") && QString("").compare(complexType) != 0 && obj.isArray()) { - // list of values - QList* output = new QList(); - QJsonArray arr = obj.toArray(); - foreach (const QJsonValue & jval, arr) { + } + } + else if(type.startsWith("QList") && QString("").compare(complexType) != 0 && obj.isArray()) { + // list of values + QList + * output = new QList + (); + QJsonArray arr = obj.toArray(); + foreach (const QJsonValue & jval, arr) { if(complexType.startsWith("SWG")) { - // it's an object - SWGObject * val = (SWGObject*)create(complexType); - QJsonObject t = jval.toObject(); + // it's an object + SWGObject * val = (SWGObject*)create(complexType); + QJsonObject t = jval.toObject(); - val->fromJsonObject(t); - output->append(val); + val->fromJsonObject(t); + output->append(val); } else { - // primitives - if(QStringLiteral("qint32").compare(complexType) == 0) { - qint32 val; - setValue(&val, jval, QStringLiteral("qint32"), QStringLiteral("")); - output->append((void*)&val); - } - else if(QStringLiteral("qint64").compare(complexType) == 0) { - qint64 val; - setValue(&val, jval, QStringLiteral("qint64"), QStringLiteral("")); - output->append((void*)&val); - } - else if(QStringLiteral("bool").compare(complexType) == 0) { - bool val; - setValue(&val, jval, QStringLiteral("bool"), QStringLiteral("")); - output->append((void*)&val); - } - } - } - QList **val = static_cast**>(value); - delete *val; - *val = output; - } -} + // primitives + if(QStringLiteral("qint32").compare(complexType) == 0) { + qint32 val; + setValue(&val, jval, QStringLiteral("qint32"), QStringLiteral("")); + output->append((void*)&val); + } + else if(QStringLiteral("qint64").compare(complexType) == 0) { + qint64 val; + setValue(&val, jval, QStringLiteral("qint64"), QStringLiteral("")); + output->append((void*)&val); + } + else if(QStringLiteral("bool").compare(complexType) == 0) { + bool val; + setValue(&val, jval, QStringLiteral("bool"), QStringLiteral("")); + output->append((void*)&val); + } + } + } + QList + **val = static_cast + **>(value); + delete *val; + *val = output; + } + } -void -toJsonValue(QString name, void* value, QJsonObject* output, QString type) { - if(value == NULL) { - return; - } - if(type.startsWith("SWG")) { - SWGObject *swgObject = reinterpret_cast(value); - if(swgObject != NULL) { - QJsonObject* o = (*swgObject).asJsonObject(); - if(name != NULL) { + void + toJsonValue(QString name, void* value, QJsonObject* output, QString type) { + if(value == NULL) { + return; + } + if(type.startsWith("SWG")) { + SWGObject *swgObject = reinterpret_cast + (value); + if(swgObject != NULL) { + QJsonObject* o = (*swgObject).asJsonObject(); + if(name != NULL) { output->insert(name, *o); delete o; - } - else { + } + else { output->empty(); foreach(QString key, o->keys()) { - output->insert(key, o->value(key)); - } - } - } - } - else if(QStringLiteral("QString").compare(type) == 0) { - QString* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } - else if(QStringLiteral("qint32").compare(type) == 0) { - qint32* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } - else if(QStringLiteral("qint64").compare(type) == 0) { - qint64* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } - else if(QStringLiteral("bool").compare(type) == 0) { - bool* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } -} + output->insert(key, o->value(key)); + } + } + } + } + else if(QStringLiteral("QString").compare(type) == 0) { + QString* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + else if(QStringLiteral("qint32").compare(type) == 0) { + qint32* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + else if(QStringLiteral("qint64").compare(type) == 0) { + qint64* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + else if(QStringLiteral("bool").compare(type) == 0) { + bool* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + } -void -toJsonArray(QList* value, QJsonArray* output, QString innerName, QString innerType) { - foreach(void* obj, *value) { - QJsonObject element; + void + toJsonArray(QList + * value, QJsonArray* output, QString innerName, QString innerType) { + foreach(void* obj, *value) { + QJsonObject element; - toJsonValue(NULL, obj, &element, innerType); - output->append(element); - } -} + toJsonValue(NULL, obj, &element, innerType); + output->append(element); + } + } -QString -stringValue(QString* value) { - QString* str = static_cast(value); - return QString(*str); -} + QString + stringValue(QString* value) { + QString* str = static_cast + (value); + return QString(*str); + } -QString -stringValue(qint32 value) { - return QString::number(value); -} + QString + stringValue(qint32 value) { + return QString::number(value); + } -QString -stringValue(qint64 value) { - return QString::number(value); -} + QString + stringValue(qint64 value) { + return QString::number(value); + } -QString -stringValue(bool value) { - return QString(value ? "true" : "false"); -} -} /* namespace Swagger */ + QString + stringValue(bool value) { + return QString(value ? "true" : "false"); + } + } /* namespace Swagger */ diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache index 3a02c0952d5..52bba0455bc 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache @@ -1,17 +1,20 @@ #ifndef SWGHELPERS_H #define SWGHELPERS_H -#include +#include + -namespace Swagger { + namespace Swagger { void setValue(void* value, QJsonValue obj, QString type, QString complexType); - void toJsonArray(QList* value, QJsonArray* output, QString innerName, QString innerType); + void toJsonArray(QList + * value, QJsonArray* output, QString innerName, QString innerType); void toJsonValue(QString name, void* value, QJsonObject* output, QString type); bool isCompatibleJsonValue(QString type); QString stringValue(QString* value); QString stringValue(qint32 value); QString stringValue(qint64 value); QString stringValue(bool value); -} + } -#endif // SWGHELPERS_H + #endif // SWGHELPERS_H diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache index 705cb852108..641457082c3 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache @@ -1,109 +1,114 @@ {{#models}}{{#model}} -#include "{{classname}}.h" + #include "{{classname}}.h" -#include "SWGHelpers.h" + #include "SWGHelpers.h" -#include -#include -#include -#include + #include + + #include + + #include + + #include + -namespace Swagger { + namespace Swagger { -{{classname}}::{{classname}}(QString* json) { - init(); - this->fromJson(*json); -} + {{classname}}::{{classname}}(QString* json) { + init(); + this->fromJson(*json); + } -{{classname}}::{{classname}}() { - init(); -} + {{classname}}::{{classname}}() { + init(); + } -{{classname}}::~{{classname}}() { - this->cleanup(); -} + {{classname}}::~{{classname}}() { + this->cleanup(); + } -void -{{classname}}::init() { + void + {{classname}}::init() { {{#vars}}{{name}} = {{{defaultValue}}}; {{/vars}} -} + } -void -{{classname}}::cleanup() { + void + {{classname}}::cleanup() { {{#vars}}{{#complexType}}if({{name}} != NULL) { - {{#isContainer}}QList<{{complexType}}*>* arr = {{name}}; + {{#isContainer}}QList<{{complexType}}*>* arr = {{name}}; foreach({{complexType}}* o, *arr) { - delete o; + delete o; } - {{/isContainer}}delete {{name}}; - }{{/complexType}} + {{/isContainer}}delete {{name}}; + }{{/complexType}} {{/vars}} -} - -{{classname}}* -{{classname}}::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -{{classname}}::fromJsonObject(QJsonObject &pJson) { + } + + {{classname}}* + {{classname}}::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; + } + + void + {{classname}}::fromJsonObject(QJsonObject &pJson) { {{#vars}}setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}"); {{/vars}} -} - -QString -{{classname}}::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - return QString(bytes); -} - -QJsonObject* -{{classname}}::asJsonObject() { - QJsonObject* obj = new QJsonObject(); + } + + QString + {{classname}}::asJson () + { + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + return QString(bytes); + } + + QJsonObject* + {{classname}}::asJsonObject() { + QJsonObject* obj = new QJsonObject(); {{#vars}}{{#complexType}} - {{^isContainer}}{{#complexType}} - toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}")); - {{/complexType}}{{^complexType}} - else if({{name}} != NULL && *{{name}} != NULL) { - obj->insert("{{name}}", QJsonValue(*{{name}})); - }{{/complexType}} - {{/isContainer}}{{#isContainer}} - QList<{{complexType}}*>* {{name}}List = {{name}}; - QJsonArray {{name}}JsonArray; - toJsonArray((QList*){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}"); - - obj->insert("{{name}}", {{name}}JsonArray); - {{/isContainer}} + {{^isContainer}}{{#complexType}} + toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}")); + {{/complexType}}{{^complexType}} + else if({{name}} != NULL && *{{name}} != NULL) { + obj->insert("{{name}}", QJsonValue(*{{name}})); + }{{/complexType}} + {{/isContainer}}{{#isContainer}} + QList<{{complexType}}*>* {{name}}List = {{name}}; + QJsonArray {{name}}JsonArray; + toJsonArray((QList + *){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}"); + + obj->insert("{{name}}", {{name}}JsonArray); + {{/isContainer}} {{/complexType}}{{^complexType}}obj->insert("{{name}}", QJsonValue({{name}}));{{/complexType}} {{/vars}} - return obj; -} + return obj; + } -{{#vars}} -{{{datatype}}} -{{classname}}::{{getter}}() { - return {{name}}; -} -void -{{classname}}::{{setter}}({{{datatype}}} {{name}}) { - this->{{name}} = {{name}}; -} + {{#vars}} + {{{datatype}}} + {{classname}}::{{getter}}() { + return {{name}}; + } + void + {{classname}}::{{setter}}({{{datatype}}} {{name}}) { + this->{{name}} = {{name}}; + } -{{/vars}} + {{/vars}} -} /* namespace Swagger */ + } /* namespace Swagger */ {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache index 7b0b6cdcc1b..7a63ce9564a 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache @@ -1,47 +1,48 @@ {{#models}}{{#model}}/* - * {{classname}}.h - * - * {{description}} - */ +* {{classname}}.h +* +* {{description}} +*/ #ifndef {{classname}}_H_ #define {{classname}}_H_ -#include +#include + {{/model}}{{/models}} {{#imports}}{{{import}}} {{/imports}} -#include "SWGObject.h" + #include "SWGObject.h" {{#models}}{{#model}} -namespace Swagger { + namespace Swagger { -class {{classname}}: public SWGObject { -public: + class {{classname}}: public SWGObject { + public: {{classname}}(); {{classname}}(QString* json); - virtual ~{{classname}}(); - void init(); - void cleanup(); + virtual ~{{classname}}(); + void init(); + void cleanup(); - QString asJson (); - QJsonObject* asJsonObject(); - void fromJsonObject(QJsonObject &json); + QString asJson (); + QJsonObject* asJsonObject(); + void fromJsonObject(QJsonObject &json); {{classname}}* fromJson(QString &jsonString); {{#vars}}{{{datatype}}} {{getter}}(); - void {{setter}}({{{datatype}}} {{name}}); + void {{setter}}({{{datatype}}} {{name}}); {{/vars}} -private: + private: {{#vars}}{{{datatype}}} {{name}}; {{/vars}} -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* {{classname}}_H_ */ + #endif /* {{classname}}_H_ */ {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model.mustache index 1a2a831f5ac..de2eb05066a 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/model.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/model.mustache @@ -1,58 +1,62 @@ {{#models}}{{#model}}/* - * {{classname}}.h - * - * {{description}} - */ +* {{classname}}.h +* +* {{description}} +*/ #ifndef {{classname}}_H_ #define {{classname}}_H_ -#include -#include -#include -#include -#include "{{prefix}}Helpers.h" -#include "{{prefix}}Object.h" +#include + + #include + + #include + + #include + + #include "{{prefix}}Helpers.h" + #include "{{prefix}}Object.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; {{/model}}{{/models}} {{#imports}}{{{import}}} {{/imports}} {{#models}}{{#model}} -namespace Swagger { + namespace Swagger { -class {{classname}}: public {{prefix}}Object { -public: + class {{classname}}: public {{prefix}}Object { + public: {{classname}}(); {{classname}}(String* json); - virtual ~{{classname}}(); + virtual ~{{classname}}(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); {{classname}}* fromJson(String* obj); {{#vars}} - {{datatype}} {{getter}}(); - void {{setter}}({{datatype}} {{name}}); + {{datatype}} {{getter}}(); + void {{setter}}({{datatype}} {{name}}); {{/vars}} -private: + private: {{#vars}}{{datatype}} {{name}}; {{/vars}} -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* {{classname}}_H_ */ + #endif /* {{classname}}_H_ */ {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/modelFactory.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/modelFactory.mustache index 4ec9e6f7411..3a29a7ad1f5 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/modelFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/modelFactory.mustache @@ -2,28 +2,29 @@ #define ModelFactory_H_ {{#models}}{{#model}} -#include "{{classname}}.h"{{/model}}{{/models}} + #include "{{classname}}.h"{{/model}}{{/models}} namespace Swagger { - inline void* create(QString type) { - {{#models}}{{#model}}if(QString("{{classname}}").compare(type) == 0) { - return new {{classname}}(); - } - {{/model}}{{/models}} - return NULL; - } +inline void* create(QString type) { +{{#models}}{{#model}}if(QString("{{classname}}").compare(type) == 0) { +return new {{classname}}(); +} +{{/model}}{{/models}} +return NULL; +} - inline void* create(QString json, QString type) { - void* val = create(type); - if(val != NULL) { - SWGObject* obj = static_cast(val); - return obj->fromJson(json); - } - if(type.startsWith("QString")) { - return new QString(); - } - return NULL; - } +inline void* create(QString json, QString type) { +void* val = create(type); +if(val != NULL) { +SWGObject* obj = static_cast +(val); +return obj->fromJson(json); +} +if(type.startsWith("QString")) { +return new QString(); +} +return NULL; +} } /* namespace Swagger */ #endif /* ModelFactory_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/object.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/object.mustache index 62914cb5162..f4194b68578 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/object.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/object.mustache @@ -1,24 +1,25 @@ #ifndef _{{prefix}}_OBJECT_H_ #define _{{prefix}}_OBJECT_H_ -#include +#include + -class {{prefix}}Object { - public: + class {{prefix}}Object { + public: virtual QJsonObject* asJsonObject() { - return NULL; + return NULL; } virtual ~SWGObject() {} virtual SWGObject* fromJson(QString &jsonString) { - Q_UNUSED(jsonString); - return NULL; + Q_UNUSED(jsonString); + return NULL; } virtual void fromJsonObject(QJsonObject &json) { - Q_UNUSED(json); + Q_UNUSED(json); } virtual QString asJson() { - return QString(""); + return QString(""); } -}; + }; -#endif /* _{{prefix}}_OBJECT_H_ */ + #endif /* _{{prefix}}_OBJECT_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/retrofit/api.mustache index a916f363ff5..38d436fe735 100644 --- a/modules/swagger-codegen/src/main/resources/retrofit/api.mustache +++ b/modules/swagger-codegen/src/main/resources/retrofit/api.mustache @@ -10,20 +10,20 @@ import java.util.*; {{/imports}} {{#operations}} -public interface {{classname}} { - {{#operation}} - /** - * {{summary}} - * {{notes}} -{{#allParams}} * @param {{paramName}} {{description}} -{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - */ - {{#formParams}}{{#-first}} - {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} - @{{httpMethod}}("{{path}}") - {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}} - {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{^hasMore}} - );{{/hasMore}}{{/allParams}} - {{/operation}} -} + public interface {{classname}} { + {{#operation}} + /** + * {{summary}} + * {{notes}} + {{#allParams}} * @param {{paramName}} {{description}} + {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + */ + {{#formParams}}{{#-first}} + {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} + @{{httpMethod}}("{{path}}") + {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}} + {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{^hasMore}} + );{{/hasMore}}{{/allParams}} + {{/operation}} + } {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/retrofit/model.mustache b/modules/swagger-codegen/src/main/resources/retrofit/model.mustache index f4446d5a1ef..8764e59fdeb 100644 --- a/modules/swagger-codegen/src/main/resources/retrofit/model.mustache +++ b/modules/swagger-codegen/src/main/resources/retrofit/model.mustache @@ -3,48 +3,48 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; {{#models}} -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} -@ApiModel(description = "{{{description}}}") -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { + {{#model}}{{#description}} + /** + * {{description}} + **/{{/description}} + @ApiModel(description = "{{{description}}}") + public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{#vars}}{{#isEnum}} - public enum {{datatypeWithEnum}} { + public enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} - };{{/isEnum}} + };{{/isEnum}} /**{{#description}} - * {{{description}}}{{/description}}{{#minimum}} - * minimum: {{minimum}}{{/minimum}}{{#maximum}} - * maximum: {{maximum}}{{/maximum}} - **/ - @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") - @SerializedName("{{baseName}}"){{#isEnum}} - private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} - private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} + * {{{description}}}{{/description}}{{#minimum}} + * minimum: {{minimum}}{{/minimum}}{{#maximum}} + * maximum: {{maximum}}{{/maximum}} + **/ + @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + @SerializedName("{{baseName}}"){{#isEnum}} + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} + private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} - {{#vars}} - public {{{datatypeWithEnum}}} {{getter}}() { + {{#vars}} + public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - } - public void {{setter}}({{{datatypeWithEnum}}} {{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(" " + super.toString()).append("\n");{{/parent}} - {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); - {{/vars}}sb.append("}\n"); - return sb.toString(); + StringBuilder sb = new StringBuilder(); + sb.append("class {{classname}} {\n"); + {{#parent}}sb.append(" " + super.toString()).append("\n");{{/parent}} + {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); + {{/vars}}sb.append("}\n"); + return sb.toString(); + } } -} -{{/model}} + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache b/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache index fd631871054..24307d97152 100644 --- a/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache @@ -1,143 +1,146 @@ - 4.0.0 - {{groupId}} - {{artifactId}} - jar - {{artifactId}} - {{artifactVersion}} - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.google.code.gson - gson - ${gson-version} - compile - - - com.squareup.retrofit - retrofit - ${retrofit-version} - compile - + + 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.google.code.gson + gson + ${gson-version} + compile + + + com.squareup.retrofit + retrofit + ${retrofit-version} + compile + - - - junit - junit - ${junit-version} - test - - - - 1.5.3-M1 - 2.3.1 - 1.9.0 - 1.0.0 - 4.12 - + + + junit + junit + ${junit-version} + test + + + + 1.5.0 + 2.3.1 + 1.9.0 + 1.0.0 + 4.12 + diff --git a/modules/swagger-codegen/src/main/resources/retrofit/service.mustache b/modules/swagger-codegen/src/main/resources/retrofit/service.mustache index 218a9304071..3350f79ed48 100644 --- a/modules/swagger-codegen/src/main/resources/retrofit/service.mustache +++ b/modules/swagger-codegen/src/main/resources/retrofit/service.mustache @@ -6,18 +6,18 @@ import retrofit.RestAdapter; import retrofit.converter.GsonConverter; public class ServiceGenerator { - // No need to instantiate this class. - private ServiceGenerator() { } +// No need to instantiate this class. +private ServiceGenerator() { } - public static S createService(Class serviceClass) { +public static S createService(Class serviceClass) { Gson gson = new GsonBuilder() - .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") - .create(); + .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") + .create(); RestAdapter adapter = new RestAdapter.Builder() - .setEndpoint("{{basePath}}") - .setConverter(new GsonConverter(gson)) - .build(); + .setEndpoint("{{basePath}}") + .setConverter(new GsonConverter(gson)) + .build(); return adapter.create(serviceClass); - } -} + } + } diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache index 3e1ac14014e..88c6f4b676a 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache @@ -2,60 +2,60 @@ require "uri" module {{moduleName}} {{#operations}} - class {{classname}} + class {{classname}} basePath = "{{basePath}}" # apiInvoker = APIInvoker -{{#operation}} -{{newline}} - # {{summary}} - # {{notes}} -{{#allParams}}{{#required}} # @param {{paramName}} {{description}} -{{/required}}{{/allParams}} # @param [Hash] opts the optional parameters -{{#allParams}}{{^required}} # @option opts [{{dataType}}] :{{paramName}} {{description}} -{{/required}}{{/allParams}} # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}nil{{/returnType}}] - def self.{{nickname}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}opts = {}) - {{#allParams}}{{#required}} - # verify the required parameter '{{paramName}}' is set - raise "Missing the required parameter '{{paramName}}' when calling {{nickname}}" if {{{paramName}}}.nil? - {{/required}}{{/allParams}} - - # resource path - path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}} - - # query parameters - query_params = {}{{#queryParams}}{{#required}} - query_params[:'{{{baseName}}}'] = {{{paramName}}}{{/required}}{{/queryParams}}{{#queryParams}}{{^required}} - query_params[:'{{{baseName}}}'] = opts[:'{{{paramName}}}'] if opts[:'{{{paramName}}}']{{/required}}{{/queryParams}} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = [{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}] - header_params['Content-Type'] = Swagger::Request.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}} - - # form parameters - form_params = {}{{#formParams}}{{#required}} - form_params["{{baseName}}"] = {{paramName}}{{/required}}{{/formParams}}{{#formParams}}{{^required}} - form_params["{{baseName}}"] = opts[:'{{paramName}}'] if opts[:'{{paramName}}']{{/required}}{{/formParams}} - - # http body (model) - {{^bodyParam}}post_body = nil - {{/bodyParam}}{{#bodyParam}}post_body = Swagger::Request.object_to_http_body({{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}}) - {{/bodyParam}} - - auth_names = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}] - {{#returnType}}response = Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - {{#returnContainer}}response.map {|response| {{/returnContainer}}obj = {{returnBaseType}}.new() and obj.build_from_hash(response){{#returnContainer}} }{{/returnContainer}}{{/returnType}}{{^returnType}}Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil{{/returnType}} + {{#operation}} + {{newline}} + # {{summary}} + # {{notes}} + {{#allParams}}{{#required}} # @param {{paramName}} {{description}} + {{/required}}{{/allParams}} # @param [Hash] opts the optional parameters + {{#allParams}}{{^required}} # @option opts [{{dataType}}] :{{paramName}} {{description}} + {{/required}}{{/allParams}} # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}nil{{/returnType}}] + def self.{{nickname}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}opts = {}) + {{#allParams}}{{#required}} + # verify the required parameter '{{paramName}}' is set + raise "Missing the required parameter '{{paramName}}' when calling {{nickname}}" if {{{paramName}}}.nil? + {{/required}}{{/allParams}} + + # resource path + path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}} + + # query parameters + query_params = {}{{#queryParams}}{{#required}} + query_params[:'{{{baseName}}}'] = {{{paramName}}}{{/required}}{{/queryParams}}{{#queryParams}}{{^required}} + query_params[:'{{{baseName}}}'] = opts[:'{{{paramName}}}'] if opts[:'{{{paramName}}}']{{/required}}{{/queryParams}} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = [{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}] + header_params['Content-Type'] = Swagger::Request.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}} + + # form parameters + form_params = {}{{#formParams}}{{#required}} + form_params["{{baseName}}"] = {{paramName}}{{/required}}{{/formParams}}{{#formParams}}{{^required}} + form_params["{{baseName}}"] = opts[:'{{paramName}}'] if opts[:'{{paramName}}']{{/required}}{{/formParams}} + + # http body (model) + {{^bodyParam}}post_body = nil + {{/bodyParam}}{{#bodyParam}}post_body = Swagger::Request.object_to_http_body({{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}}) + {{/bodyParam}} + + auth_names = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}] + {{#returnType}}response = Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + {{#returnContainer}}response.map {|response| {{/returnContainer}}obj = {{returnBaseType}}.new() and obj.build_from_hash(response){{#returnContainer}} }{{/returnContainer}}{{/returnType}}{{^returnType}}Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil{{/returnType}} + end + {{/operation}} end -{{/operation}} - end {{/operations}} end 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 c0e563a0bb7..70c7afdb889 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache @@ -1,83 +1,83 @@ module {{moduleName}} - # base class containing fundamental method such as to_hash, build_from_hash and more - class BaseObject +# base class containing fundamental method such as to_hash, build_from_hash and more +class BaseObject - # return the object in the form of hash - def to_body - body = {} - self.class.attribute_map.each_pair do |key, value| - body[value] = self.send(key) unless self.send(key).nil? - end - body - end +# return the object in the form of hash +def to_body +body = {} +self.class.attribute_map.each_pair do |key, value| +body[value] = self.send(key) unless self.send(key).nil? +end +body +end - # build the object from hash - def build_from_hash(attributes) - return nil unless attributes.is_a?(Hash) - self.class.swagger_types.each_pair do |key, type| - if type =~ /^array\[(.*)\]/i - if attributes[self.class.attribute_map[key]].is_a?(Array) - self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } ) - else - #TODO show warning in debug mode - end - elsif !attributes[self.class.attribute_map[key]].nil? - self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) - else - # data not found in attributes(hash), not an issue as the data can be optional - end - end +# build the object from hash +def build_from_hash(attributes) +return nil unless attributes.is_a?(Hash) +self.class.swagger_types.each_pair do |key, type| +if type =~ /^array\[(.*)\]/i +if attributes[self.class.attribute_map[key]].is_a?(Array) +self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } ) +else +#TODO show warning in debug mode +end +elsif !attributes[self.class.attribute_map[key]].nil? +self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) +else +# data not found in attributes(hash), not an issue as the data can be optional +end +end - self - end +self +end - def _deserialize(type, value) - case type.to_sym - when :DateTime - DateTime.parse(value) - when :string - value.to_s - when :int - value.to_i - when :double - value.to_f - when :boolean - if value =~ /^(true|t|yes|y|1)$/i - true - else - false - end - else # model - _model = {{moduleName}}.const_get(type).new - _model.build_from_hash(value) - end - end +def _deserialize(type, value) +case type.to_sym +when :DateTime +DateTime.parse(value) +when :string +value.to_s +when :int +value.to_i +when :double +value.to_f +when :boolean +if value =~ /^(true|t|yes|y|1)$/i +true +else +false +end +else # model +_model = {{moduleName}}.const_get(type).new +_model.build_from_hash(value) +end +end - # to_body is an alias to to_body (backward compatibility) - def to_hash - hash = {} - self.class.attribute_map.each_pair do |key, value| - if self.send(key).is_a?(Array) - next if self.send(key).empty? - hash[value] = self.send(key).select{|v| !v.nil?}.map{ |v| _to_hash v} unless self.send(key).nil? - else - unless (_tmp_value = _to_hash self.send(key)).nil? - hash[value] = _tmp_value - end - end - end - hash - end +# to_body is an alias to to_body (backward compatibility) +def to_hash +hash = {} +self.class.attribute_map.each_pair do |key, value| +if self.send(key).is_a?(Array) +next if self.send(key).empty? +hash[value] = self.send(key).select{|v| !v.nil?}.map{ |v| _to_hash v} unless self.send(key).nil? +else +unless (_tmp_value = _to_hash self.send(key)).nil? +hash[value] = _tmp_value +end +end +end +hash +end - # 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 - value.to_hash - else - value - end - end +# 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 +value.to_hash +else +value +end +end - end +end end diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache index d0d4e787756..ca817247130 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache @@ -1,40 +1,40 @@ module {{moduleName}} {{#models}} # {{description}} {{#model}} class {{classname}} < BaseObject - attr_accessor {{#vars}}:{{{name}}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{newline}} - # attribute mapping from ruby-style variable name to JSON key - def self.attribute_map - { - {{#vars}} - # {{description}} - :'{{{name}}}' => :'{{{baseName}}}'{{#hasMore}},{{/hasMore}} - {{/vars}} - } - end +attr_accessor {{#vars}}:{{{name}}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{newline}} +# attribute mapping from ruby-style variable name to JSON key +def self.attribute_map +{ +{{#vars}} + # {{description}} + :'{{{name}}}' => :'{{{baseName}}}'{{#hasMore}},{{/hasMore}} +{{/vars}} +} +end - # attribute type - def self.swagger_types - { - {{#vars}}:'{{{name}}}' => :'{{{datatype}}}'{{#hasMore}},{{/hasMore}} - {{/vars}} - } - end +# attribute type +def self.swagger_types +{ +{{#vars}}:'{{{name}}}' => :'{{{datatype}}}'{{#hasMore}},{{/hasMore}} +{{/vars}} +} +end - def initialize(attributes = {}) - return if !attributes.is_a?(Hash) || attributes.empty? +def initialize(attributes = {}) +return if !attributes.is_a?(Hash) || attributes.empty? - # convert string to symbol for hash key - attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} +# convert string to symbol for hash key +attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} - {{#vars}} - if attributes[:'{{{baseName}}}'] - {{#isContainer}}if (value = attributes[:'{{{baseName}}}']).is_a?(Array) - @{{{name}}} = value - end{{/isContainer}}{{^isContainer}}@{{{name}}} = attributes[:'{{{baseName}}}']{{/isContainer}} - end - {{/vars}} +{{#vars}} + if attributes[:'{{{baseName}}}'] + {{#isContainer}}if (value = attributes[:'{{{baseName}}}']).is_a?(Array) + @{{{name}}} = value + end{{/isContainer}}{{^isContainer}}@{{{name}}} = attributes[:'{{{baseName}}}']{{/isContainer}} end - end +{{/vars}} +end +end {{/model}} {{/models}} end diff --git a/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache b/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache index 28932890af9..f400813974f 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache @@ -1,90 +1,90 @@ # module Swagger - class Object - - unless Object.method_defined? :blank? - def blank? - respond_to?(:empty?) ? empty? : !self - end - end - - unless Object.method_defined? :present? - def present? - !blank? - end - end +class Object - end +unless Object.method_defined? :blank? +def blank? +respond_to?(:empty?) ? empty? : !self +end +end - class String +unless Object.method_defined? :present? +def present? +!blank? +end +end - unless String.method_defined? :underscore - def underscore - self.gsub(/::/, '/'). - gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). - gsub(/([a-z\d])([A-Z])/,'\1_\2'). - tr("-", "_"). - downcase - end - end - - unless String.method_defined? :camelize - def camelize(first_letter_in_uppercase = true) - if first_letter_in_uppercase != :lower - self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } - else - self.to_s[0].chr.downcase + camelize(self)[1..-1] - end - end - end +end - end +class String - class Hash +unless String.method_defined? :underscore +def underscore +self.gsub(/::/, '/'). +gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). +gsub(/([a-z\d])([A-Z])/,'\1_\2'). +tr("-", "_"). +downcase +end +end - unless Hash.method_defined? :stringify_keys - def stringify_keys - inject({}) do |options, (key, value)| - options[key.to_s] = value - options - end - end - end - - unless Hash.method_defined? :stringify_keys! - def stringify_keys! - self.replace(self.stringify_keys) - end - end +unless String.method_defined? :camelize +def camelize(first_letter_in_uppercase = true) +if first_letter_in_uppercase != :lower +self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } +else +self.to_s[0].chr.downcase + camelize(self)[1..-1] +end +end +end - unless Hash.method_defined? :symbolize_keys - def symbolize_keys - inject({}) do |options, (key, value)| - options[(key.to_sym rescue key) || key] = value - options - end - end - end - - unless Hash.method_defined? :symbolize_keys! - def symbolize_keys! - self.replace(self.symbolize_keys) - end - end +end - unless Hash.method_defined? :symbolize_and_underscore_keys - def symbolize_and_underscore_keys - inject({}) do |options, (key, value)| - options[(key.to_s.underscore.to_sym rescue key) || key] = value - options - end - end - end +class Hash - unless Hash.method_defined? :symbolize_and_underscore_keys! - def symbolize_and_underscore_keys! - self.replace(self.symbolize_and_underscore_keys) - end - end - - end +unless Hash.method_defined? :stringify_keys +def stringify_keys +inject({}) do |options, (key, value)| +options[key.to_s] = value +options +end +end +end + +unless Hash.method_defined? :stringify_keys! +def stringify_keys! +self.replace(self.stringify_keys) +end +end + +unless Hash.method_defined? :symbolize_keys +def symbolize_keys +inject({}) do |options, (key, value)| +options[(key.to_sym rescue key) || key] = value +options +end +end +end + +unless Hash.method_defined? :symbolize_keys! +def symbolize_keys! +self.replace(self.symbolize_keys) +end +end + +unless Hash.method_defined? :symbolize_and_underscore_keys +def symbolize_and_underscore_keys +inject({}) do |options, (key, value)| +options[(key.to_s.underscore.to_sym rescue key) || key] = value +options +end +end +end + +unless Hash.method_defined? :symbolize_and_underscore_keys! +def symbolize_and_underscore_keys! +self.replace(self.symbolize_and_underscore_keys) +end +end + +end # end \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache index dd2f630a8c9..829ecbe0b1e 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache @@ -2,77 +2,77 @@ require 'logger' require 'json' module {{moduleName}} - module Swagger - class << self - attr_accessor :logger - - # A Swagger configuration object. Must act like a hash and return sensible - # values for all Swagger configuration options. See Swagger::Configuration. - attr_accessor :configuration - - attr_accessor :resources - - # Call this method to modify defaults in your initializers. - # - # @example - # Swagger.configure do |config| - # config.api_key['api_key'] = '1234567890abcdef' # api key authentication - # config.username = 'wordlover' # http basic authentication - # config.password = 'i<3words' # http basic authentication - # config.format = 'json' # optional, defaults to 'json' - # end - # - def configure - yield(configuration) if block_given? - - # Configure logger. Default to use Rails - self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT)) - - # remove :// from scheme - configuration.scheme.sub!(/:\/\//, '') - - # remove http(s):// and anything after a slash - configuration.host.sub!(/https?:\/\//, '') - configuration.host = configuration.host.split('/').first - - # Add leading and trailing slashes to base_path - configuration.base_path = "/#{configuration.base_path}".gsub(/\/+/, '/') - configuration.base_path = "" if configuration.base_path == "/" - end - - def authenticated? - Swagger.configuration.auth_token.present? - end - - def de_authenticate - Swagger.configuration.auth_token = nil - end - - def authenticate - return if Swagger.authenticated? - - if Swagger.configuration.username.blank? || Swagger.configuration.password.blank? - raise ClientError, "Username and password are required to authenticate." - end - - request = Swagger::Request.new( - :get, - "account/authenticate/{username}", - :params => { - :username => Swagger.configuration.username, - :password => Swagger.configuration.password - } - ) - - response_body = request.response.body - Swagger.configuration.auth_token = response_body['token'] - end - end - end - - class ServerError < StandardError - end - - class ClientError < StandardError - end +module Swagger +class << self +attr_accessor :logger + +# A Swagger configuration object. Must act like a hash and return sensible +# values for all Swagger configuration options. See Swagger::Configuration. +attr_accessor :configuration + +attr_accessor :resources + +# Call this method to modify defaults in your initializers. +# +# @example +# Swagger.configure do |config| +# config.api_key['api_key'] = '1234567890abcdef' # api key authentication +# config.username = 'wordlover' # http basic authentication +# config.password = 'i<3words' # http basic authentication +# config.format = 'json' # optional, defaults to 'json' +# end +# +def configure +yield(configuration) if block_given? + +# Configure logger. Default to use Rails +self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT)) + +# remove :// from scheme +configuration.scheme.sub!(/:\/\//, '') + +# remove http(s):// and anything after a slash +configuration.host.sub!(/https?:\/\//, '') +configuration.host = configuration.host.split('/').first + +# Add leading and trailing slashes to base_path +configuration.base_path = "/#{configuration.base_path}".gsub(/\/+/, '/') +configuration.base_path = "" if configuration.base_path == "/" +end + +def authenticated? +Swagger.configuration.auth_token.present? +end + +def de_authenticate +Swagger.configuration.auth_token = nil +end + +def authenticate +return if Swagger.authenticated? + +if Swagger.configuration.username.blank? || Swagger.configuration.password.blank? +raise ClientError, "Username and password are required to authenticate." +end + +request = Swagger::Request.new( +:get, +"account/authenticate/{username}", +:params => { +:username => Swagger.configuration.username, +:password => Swagger.configuration.password +} +) + +response_body = request.response.body +Swagger.configuration.auth_token = response_body['token'] +end +end +end + +class ServerError < StandardError +end + +class ClientError < StandardError +end end diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache index e9a8af9c162..a6ad16d376a 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache @@ -1,29 +1,29 @@ module {{moduleName}} - module Swagger - class Configuration - attr_accessor :format, :api_key, :api_key_prefix, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params, :user_agent, :verify_ssl +module Swagger +class Configuration +attr_accessor :format, :api_key, :api_key_prefix, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params, :user_agent, :verify_ssl - # Defaults go in here.. - def initialize - @format = 'json' - @scheme = '{{scheme}}' - @host = '{{host}}' - @base_path = '{{contextPath}}' - @user_agent = "ruby-swagger-#{Swagger::VERSION}" - @inject_format = false - @force_ending_format = false - @camelize_params = true +# Defaults go in here.. +def initialize +@format = 'json' +@scheme = '{{scheme}}' +@host = '{{host}}' +@base_path = '{{contextPath}}' +@user_agent = "ruby-swagger-#{Swagger::VERSION}" +@inject_format = false +@force_ending_format = false +@camelize_params = true - # keys for API key authentication (param-name => api-key) - @api_key = {} - # api-key prefix for API key authentication, e.g. "Bearer" (param-name => api-key-prefix) - @api_key_prefix = {} +# keys for API key authentication (param-name => api-key) +@api_key = {} +# api-key prefix for API key authentication, e.g. "Bearer" (param-name => api-key-prefix) +@api_key_prefix = {} - # whether to verify SSL certificate, default to true - # Note: do NOT set it to false in production code, otherwise you would - # face multiple types of cryptographic attacks - @verify_ssl = true - end - end - end +# whether to verify SSL certificate, default to true +# Note: do NOT set it to false in production code, otherwise you would +# face multiple types of cryptographic attacks +@verify_ssl = true +end +end +end end diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache index 99b58d58be8..2c7d985f134 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache @@ -1,272 +1,272 @@ module {{moduleName}} - module Swagger - class Request - require 'uri' - require 'addressable/uri' - require 'typhoeus' - - attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names - - # All requests must have an HTTP method and a path - # Optionals parameters are :params, :headers, :body, :format, :host - def initialize(http_method, path, attributes={}) - attributes[:format] ||= Swagger.configuration.format - attributes[:params] ||= {} - - # Set default headers - default_headers = { - 'Content-Type' => "application/#{attributes[:format].downcase}", - 'User-Agent' => Swagger.configuration.user_agent - } - - # Merge argument headers into defaults - attributes[:headers] = default_headers.merge(attributes[:headers] || {}) - - # Stick in the auth token if there is one - if Swagger.authenticated? - attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token}) - end - - self.http_method = http_method.to_sym - self.path = path - attributes.each do |name, value| - send("#{name.to_s.underscore.to_sym}=", value) - end - - update_params_for_auth! - end - - # Update hearder and query params based on authentication settings. - def update_params_for_auth! - (@auth_names || []).each do |auth_name| - case auth_name - {{#authMethods}}when '{{name}}' - {{#isApiKey}}{{#isKeyInHeader}}@headers ||= {} - @headers['{{keyParamName}}'] = get_api_key_with_prefix('{{keyParamName}}'){{/isKeyInHeader}}{{#isKeyInQuery}}@params ||= {} - @params['{{keyParamName}}'] = get_api_key_with_prefix('{{keyParamName}}'){{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}@headers ||= {} - http_auth_header = 'Basic ' + ["#{Swagger.configuration.username}:#{Swagger.configuration.password}"].pack('m').delete("\r\n") - @headers['Authorization'] = http_auth_header{{/isBasic}}{{#isOAuth}}# TODO: support oauth{{/isOAuth}} - {{/authMethods}} - end - end - end - - # Get API key (with prefix if set). - # @param [String] param_name the parameter name of API key auth - def get_api_key_with_prefix(param_name) - if Swagger.configuration.api_key_prefix[param_name].present? - "#{Swagger.configuration.api_key_prefix[param_name]} #{Swagger.configuration.api_key[param_name]}" - else - Swagger.configuration.api_key[param_name] - end - end - - # Construct a base URL - def url(options = {}) - u = Addressable::URI.new( - :scheme => Swagger.configuration.scheme, - :host => Swagger.configuration.host, - :path => self.interpreted_path, - :query => self.query_string.sub(/\?/, '') - ).to_s - - # Drop trailing question mark, if present - u.sub! /\?$/, '' - - u - end - - # Iterate over the params hash, injecting any path values into the path string - # e.g. /word.{format}/{word}/entries => /word.json/cat/entries - def interpreted_path - p = self.path.dup - - # Stick a .{format} placeholder into the path if there isn't - # one already or an actual format like json or xml - # e.g. /words/blah => /words.{format}/blah - if Swagger.configuration.inject_format - unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } - p = p.sub(/^(\/?\w+)/, "\\1.#{format}") - end - end - - # Stick a .{format} placeholder on the end of the path if there isn't - # one already or an actual format like json or xml - # e.g. /words/blah => /words/blah.{format} - if Swagger.configuration.force_ending_format - unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } - p = "#{p}.#{format}" - end - end - - p = p.sub("{format}", self.format.to_s) - - URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/') - end - - # Massage the request body into a state of readiness - # If body is a hash, camelize all keys then convert to a json string - def body=(value) - if value.is_a?(Hash) - value = value.inject({}) do |memo, (k,v)| - memo[k.to_s.camelize(:lower).to_sym] = v - memo - end - end - @body = value - end - - # If body is an object, JSONify it before making the actual request. - # For form parameters, remove empty value - def outgoing_body - # http form - if headers['Content-Type'] == 'application/x-www-form-urlencoded' - data = form_params.dup - data.each do |key, value| - data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter - end - data - elsif @body # http body is JSON - @body.is_a?(String) ? @body : @body.to_json - else - nil - end - end - - # Construct a query string from the query-string-type params - def query_string - # Iterate over all params, - # .. removing the ones that are part of the path itself. - # .. stringifying values so Addressable doesn't blow up. - query_values = {} - self.params.each_pair do |key, value| - next if self.path.include? "{#{key}}" # skip path params - next if value.blank? && value.class != FalseClass # skip empties - if Swagger.configuration.camelize_params - key = key.to_s.camelize(:lower).to_sym - end - query_values[key] = value.to_s - end - - # We don't want to end up with '?' as our query string - # if there aren't really any params - return "" if query_values.blank? - - # Addressable requires query_values to be set after initialization.. - qs = Addressable::URI.new - qs.query_values = query_values - qs.to_s - end - - def make - #TODO use configuration setting to determine if debugging - #logger = Logger.new STDOUT - #logger.debug self.url - - request_options = { - :ssl_verifypeer => Swagger.configuration.verify_ssl, - :headers => self.headers.stringify_keys - } - response = case self.http_method.to_sym - when :get,:GET - Typhoeus::Request.get( - self.url, - request_options - ) - - when :post,:POST - Typhoeus::Request.post( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - - when :patch,:PATCH - Typhoeus::Request.patch( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - - when :put,:PUT - Typhoeus::Request.put( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - - when :delete,:DELETE - Typhoeus::Request.delete( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - end - Response.new(response) - end - - def response - self.make - end - - def response_code_pretty - return unless @response.present? - @response.code.to_s - end - - def response_headers_pretty - return unless @response.present? - # JSON.pretty_generate(@response.headers).gsub(/\n/, '
') # <- This was for RestClient - @response.headers.gsub(/\n/, '
') # <- This is for Typhoeus - end - - # return 'Accept' based on an array of accept provided - # @param [Array] header_accept_array Array fo 'Accept' - # @return String Accept (e.g. application/json) - def self.select_header_accept header_accept_array - if header_accept_array.empty? - return - elsif header_accept_array.any?{ |s| s.casecmp('application/json')==0 } - 'application/json' # look for json data by default - else - header_accept_array.join(',') - end - end - - # return the content type based on an array of content-type provided - # @param [Array] content_type_array Array fo content-type - # @return String Content-Type (e.g. application/json) - def self.select_header_content_type content_type_array - if content_type_array.empty? - 'application/json' # use application/json by default - elsif content_type_array.any?{ |s| s.casecmp('application/json')==0 } - 'application/json' # use application/json if it's included - else - content_type_array[0]; # otherwise, use the first one - end - end - - # static method to convert object (array, hash, object, etc) to JSON string - # @param model object to be converted into JSON string - # @return string JSON string representation of the object - def self.object_to_http_body model - return if model.nil? - _body = nil - if model.is_a?(Array) - _body = model.map{|m| object_to_hash(m) } - else - _body = object_to_hash(model) - end - _body.to_json - end - - # static method to convert object(non-array) to hash - # @param obj object to be converted into JSON string - # @return string JSON string representation of the object - def self.object_to_hash obj - if obj.respond_to?(:to_hash) - obj.to_hash - else - obj - end - end - - end - end +module Swagger +class Request +require 'uri' +require 'addressable/uri' +require 'typhoeus' + +attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names + +# All requests must have an HTTP method and a path +# Optionals parameters are :params, :headers, :body, :format, :host +def initialize(http_method, path, attributes={}) +attributes[:format] ||= Swagger.configuration.format +attributes[:params] ||= {} + +# Set default headers +default_headers = { +'Content-Type' => "application/#{attributes[:format].downcase}", +'User-Agent' => Swagger.configuration.user_agent +} + +# Merge argument headers into defaults +attributes[:headers] = default_headers.merge(attributes[:headers] || {}) + +# Stick in the auth token if there is one +if Swagger.authenticated? +attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token}) +end + +self.http_method = http_method.to_sym +self.path = path +attributes.each do |name, value| +send("#{name.to_s.underscore.to_sym}=", value) +end + +update_params_for_auth! +end + +# Update hearder and query params based on authentication settings. +def update_params_for_auth! +(@auth_names || []).each do |auth_name| +case auth_name +{{#authMethods}}when '{{name}}' +{{#isApiKey}}{{#isKeyInHeader}}@headers ||= {} +@headers['{{keyParamName}}'] = get_api_key_with_prefix('{{keyParamName}}'){{/isKeyInHeader}}{{#isKeyInQuery}}@params ||= {} +@params['{{keyParamName}}'] = get_api_key_with_prefix('{{keyParamName}}'){{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}@headers ||= {} +http_auth_header = 'Basic ' + ["#{Swagger.configuration.username}:#{Swagger.configuration.password}"].pack('m').delete("\r\n") +@headers['Authorization'] = http_auth_header{{/isBasic}}{{#isOAuth}}# TODO: support oauth{{/isOAuth}} +{{/authMethods}} +end +end +end + +# Get API key (with prefix if set). +# @param [String] param_name the parameter name of API key auth +def get_api_key_with_prefix(param_name) +if Swagger.configuration.api_key_prefix[param_name].present? +"#{Swagger.configuration.api_key_prefix[param_name]} #{Swagger.configuration.api_key[param_name]}" +else +Swagger.configuration.api_key[param_name] +end +end + +# Construct a base URL +def url(options = {}) +u = Addressable::URI.new( +:scheme => Swagger.configuration.scheme, +:host => Swagger.configuration.host, +:path => self.interpreted_path, +:query => self.query_string.sub(/\?/, '') +).to_s + +# Drop trailing question mark, if present +u.sub! /\?$/, '' + +u +end + +# Iterate over the params hash, injecting any path values into the path string +# e.g. /word.{format}/{word}/entries => /word.json/cat/entries +def interpreted_path +p = self.path.dup + +# Stick a .{format} placeholder into the path if there isn't +# one already or an actual format like json or xml +# e.g. /words/blah => /words.{format}/blah +if Swagger.configuration.inject_format +unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } +p = p.sub(/^(\/?\w+)/, "\\1.#{format}") +end +end + +# Stick a .{format} placeholder on the end of the path if there isn't +# one already or an actual format like json or xml +# e.g. /words/blah => /words/blah.{format} +if Swagger.configuration.force_ending_format +unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } +p = "#{p}.#{format}" +end +end + +p = p.sub("{format}", self.format.to_s) + +URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/') +end + +# Massage the request body into a state of readiness +# If body is a hash, camelize all keys then convert to a json string +def body=(value) +if value.is_a?(Hash) +value = value.inject({}) do |memo, (k,v)| +memo[k.to_s.camelize(:lower).to_sym] = v +memo +end +end +@body = value +end + +# If body is an object, JSONify it before making the actual request. +# For form parameters, remove empty value +def outgoing_body +# http form +if headers['Content-Type'] == 'application/x-www-form-urlencoded' +data = form_params.dup +data.each do |key, value| +data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter +end +data +elsif @body # http body is JSON +@body.is_a?(String) ? @body : @body.to_json +else +nil +end +end + +# Construct a query string from the query-string-type params +def query_string +# Iterate over all params, +# .. removing the ones that are part of the path itself. +# .. stringifying values so Addressable doesn't blow up. +query_values = {} +self.params.each_pair do |key, value| +next if self.path.include? "{#{key}}" # skip path params +next if value.blank? && value.class != FalseClass # skip empties +if Swagger.configuration.camelize_params +key = key.to_s.camelize(:lower).to_sym +end +query_values[key] = value.to_s +end + +# We don't want to end up with '?' as our query string +# if there aren't really any params +return "" if query_values.blank? + +# Addressable requires query_values to be set after initialization.. +qs = Addressable::URI.new +qs.query_values = query_values +qs.to_s +end + +def make +#TODO use configuration setting to determine if debugging +#logger = Logger.new STDOUT +#logger.debug self.url + +request_options = { +:ssl_verifypeer => Swagger.configuration.verify_ssl, +:headers => self.headers.stringify_keys +} +response = case self.http_method.to_sym +when :get,:GET +Typhoeus::Request.get( +self.url, +request_options +) + +when :post,:POST +Typhoeus::Request.post( +self.url, +request_options.merge(:body => self.outgoing_body) +) + +when :patch,:PATCH +Typhoeus::Request.patch( +self.url, +request_options.merge(:body => self.outgoing_body) +) + +when :put,:PUT +Typhoeus::Request.put( +self.url, +request_options.merge(:body => self.outgoing_body) +) + +when :delete,:DELETE +Typhoeus::Request.delete( +self.url, +request_options.merge(:body => self.outgoing_body) +) +end +Response.new(response) +end + +def response +self.make +end + +def response_code_pretty +return unless @response.present? +@response.code.to_s +end + +def response_headers_pretty +return unless @response.present? +# JSON.pretty_generate(@response.headers).gsub(/\n/, '
') # <- This was for RestClient +@response.headers.gsub(/\n/, '
') # <- This is for Typhoeus +end + +# return 'Accept' based on an array of accept provided +# @param [Array] header_accept_array Array fo 'Accept' +# @return String Accept (e.g. application/json) +def self.select_header_accept header_accept_array +if header_accept_array.empty? +return +elsif header_accept_array.any?{ |s| s.casecmp('application/json')==0 } +'application/json' # look for json data by default +else +header_accept_array.join(',') +end +end + +# return the content type based on an array of content-type provided +# @param [Array] content_type_array Array fo content-type +# @return String Content-Type (e.g. application/json) +def self.select_header_content_type content_type_array +if content_type_array.empty? +'application/json' # use application/json by default +elsif content_type_array.any?{ |s| s.casecmp('application/json')==0 } +'application/json' # use application/json if it's included +else +content_type_array[0]; # otherwise, use the first one +end +end + +# static method to convert object (array, hash, object, etc) to JSON string +# @param model object to be converted into JSON string +# @return string JSON string representation of the object +def self.object_to_http_body model +return if model.nil? +_body = nil +if model.is_a?(Array) +_body = model.map{|m| object_to_hash(m) } +else +_body = object_to_hash(model) +end +_body.to_json +end + +# static method to convert object(non-array) to hash +# @param obj object to be converted into JSON string +# @return string JSON string representation of the object +def self.object_to_hash obj +if obj.respond_to?(:to_hash) +obj.to_hash +else +obj +end +end + +end +end end diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache index e7bb482fb66..7f9ad4f3281 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache @@ -1,70 +1,70 @@ module {{moduleName}} - module Swagger - class Response - require 'json' +module Swagger +class Response +require 'json' - attr_accessor :raw +attr_accessor :raw - def initialize(raw) - self.raw = raw +def initialize(raw) +self.raw = raw - case self.code - when 500..510 then raise(ServerError, self.error_message) - when 299..426 then raise(ClientError, self.error_message) - end - end +case self.code +when 500..510 then raise(ServerError, self.error_message) +when 299..426 then raise(ClientError, self.error_message) +end +end - def code - raw.code - end +def code +raw.code +end - # Account for error messages that take different forms... - def error_message - body['message'] - rescue - body - end +# Account for error messages that take different forms... +def error_message +body['message'] +rescue +body +end - # If body is JSON, parse it - # Otherwise return raw string - def body - JSON.parse(raw.body, :symbolize_names => true) - rescue - raw.body - end +# If body is JSON, parse it +# Otherwise return raw string +def body +JSON.parse(raw.body, :symbolize_names => true) +rescue +raw.body +end - # `headers_hash` is a Typhoeus-specific extension of Hash, - # so simplify it back into a regular old Hash. - def headers - h = {} - raw.headers_hash.each {|k,v| h[k] = v } - h - end +# `headers_hash` is a Typhoeus-specific extension of Hash, +# so simplify it back into a regular old Hash. +def headers +h = {} +raw.headers_hash.each {|k,v| h[k] = v } +h +end - # Extract the response format from the header hash - # e.g. {'Content-Type' => 'application/json'} - def format - headers['Content-Type'].split("/").last.downcase - end +# Extract the response format from the header hash +# e.g. {'Content-Type' => 'application/json'} +def format +headers['Content-Type'].split("/").last.downcase +end - def json? - format == 'json' - end +def json? +format == 'json' +end - def xml? - format == 'xml' - end +def xml? +format == 'xml' +end - def pretty_body - return unless body.present? - case format - when 'json' then JSON.pretty_generate(body).gsub(/\n/, '
') - end - end +def pretty_body +return unless body.present? +case format +when 'json' then JSON.pretty_generate(body).gsub(/\n/, '
') +end +end - def pretty_headers - JSON.pretty_generate(headers).gsub(/\n/, '
') - end - end - end +def pretty_headers +JSON.pretty_generate(headers).gsub(/\n/, '
') +end +end +end end diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache index 332a5e66f45..a3c42972c3d 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache @@ -1,5 +1,5 @@ module {{moduleName}} - module Swagger - VERSION = "{{appVersion}}" - end +module Swagger +VERSION = "{{appVersion}}" +end end diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache index 9f84d88d4e1..26b0a040cbd 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache @@ -3,30 +3,30 @@ $:.push File.expand_path("../lib", __FILE__) require "{{gemName}}/swagger/version" Gem::Specification.new do |s| - s.name = "{{gemName}}" - s.version = {{moduleName}}::Swagger::VERSION - s.platform = Gem::Platform::RUBY - s.authors = ["Zeke Sikelianos", "Tony Tam"] - s.email = ["zeke@wordnik.com", "tony@wordnik.com"] - s.homepage = "http://developer.wordnik.com" - s.summary = %q{A ruby wrapper for the swagger APIs} - s.description = %q{This gem maps to a swagger API} - s.license = "Apache-2.0" +s.name = "{{gemName}}" +s.version = {{moduleName}}::Swagger::VERSION +s.platform = Gem::Platform::RUBY +s.authors = ["Zeke Sikelianos", "Tony Tam"] +s.email = ["zeke@wordnik.com", "fehguy@gmail.com"] +s.homepage = "http://swagger.io" +s.summary = %q{A ruby wrapper for the swagger APIs} +s.description = %q{This gem maps to a swagger API} +s.license = "Apache-2.0" - s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1' - s.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.4' - s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6' +s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1' +s.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.4' +s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6' - s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0' - s.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.3' - s.add_development_dependency 'webmock', '~> 1.6', '>= 1.6.2' - s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6' - s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2' - s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16' - s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.10' +s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0' +s.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.3' +s.add_development_dependency 'webmock', '~> 1.6', '>= 1.6.2' +s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6' +s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2' +s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16' +s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.10' - s.files = `find *`.split("\n").uniq.sort.select{|f| !f.empty? } - s.test_files = `find spec/*`.split("\n") - s.executables = [] - s.require_paths = ["lib"] +s.files = `find *`.split("\n").uniq.sort.select{|f| !f.empty? } +s.test_files = `find spec/*`.split("\n") +s.executables = [] +s.require_paths = ["lib"] end diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache index df675ddf26e..5268a42657f 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache @@ -9,17 +9,17 @@ require '{{gemName}}/swagger/version' # Models require '{{modelPackage}}/base_object' {{#models}} -require '{{importPath}}' + require '{{importPath}}' {{/models}} # APIs {{#apiInfo}} -{{#apis}} -require '{{importPath}}' -{{/apis}} + {{#apis}} + require '{{importPath}}' + {{/apis}} {{/apiInfo}} module {{moduleName}} - # Initialize the default configuration - Swagger.configuration ||= Swagger::Configuration.new +# Initialize the default configuration +Swagger.configuration ||= Swagger::Configuration.new end diff --git a/modules/swagger-codegen/src/main/resources/scala/api.mustache b/modules/swagger-codegen/src/main/resources/scala/api.mustache index 87b04b5900f..de96bb528f4 100644 --- a/modules/swagger-codegen/src/main/resources/scala/api.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache @@ -16,77 +16,77 @@ import java.util.Date import scala.collection.mutable.HashMap {{#operations}} -class {{classname}}(val defBasePath: String = "{{basePath}}", - defApiInvoker: ApiInvoker = ApiInvoker) { - var basePath = defBasePath - var apiInvoker = defApiInvoker - - def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - {{#operation}} - /** - * {{summary}} - * {{notes}} -{{#allParams}} * @param {{paramName}} {{description}} -{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} - */ - def {{nickname}} ({{#allParams}}{{paramName}}: {{dataType}}{{#defaultValue}} /* = {{{defaultValue}}} */{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#returnType}}: Option[{{returnType}}]{{/returnType}} = { - // create path and map variables - val path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}",apiInvoker.escape({{paramName}})) - - {{/pathParams}} - - val contentTypes = List({{#consumes}}"{{mediaType}}", {{/consumes}}"application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - {{#requiredParamCount}} - // verify required params are set - (List({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}).filter(_ != null)).size match { - case {{requiredParamCount}} => // all required values set - case _ => throw new Exception("missing required params") - } - {{/requiredParamCount}} - - {{#queryParams}}if(String.valueOf({{paramName}}) != "null") queryParams += "{{baseName}}" -> {{paramName}}.toString - {{/queryParams}} - - {{#headerParams}}headerParams += "{{baseName}}" -> {{paramName}} - {{/headerParams}} - - var postBody: AnyRef = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}} - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - {{#formParams}}{{#notFile}} - mp.field("{{baseName}}", {{paramName}}.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) - {{/notFile}}{{#isFile}} - mp.field("{{baseName}}", file.getName) - mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE)) - {{/isFile}}{{/formParams}} - postBody = mp - } - else { - {{#formParams}}{{#notFile}}formParams += "{{baseName}}" -> {{paramName}}.toString(){{/notFile}} - {{/formParams}} - } - - try { - apiInvoker.invokeApi(basePath, path, "{{httpMethod}}", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + class {{classname}}(val defBasePath: String = "{{basePath}}", + defApiInvoker: ApiInvoker = ApiInvoker) { + var basePath = defBasePath + var apiInvoker = defApiInvoker + + def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value + + {{#operation}} + /** + * {{summary}} + * {{notes}} + {{#allParams}} * @param {{paramName}} {{description}} + {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} + */ + def {{nickname}} ({{#allParams}}{{paramName}}: {{dataType}}{{#defaultValue}} /* = {{{defaultValue}}} */{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#returnType}}: Option[{{returnType}}]{{/returnType}} = { + // create path and map variables + val path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}",apiInvoker.escape({{paramName}})) + + {{/pathParams}} + + val contentTypes = List({{#consumes}}"{{mediaType}}", {{/consumes}}"application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + {{#requiredParamCount}} + // verify required params are set + (List({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}).filter(_ != null)).size match { + case {{requiredParamCount}} => // all required values set + case _ => throw new Exception("missing required params") + } + {{/requiredParamCount}} + + {{#queryParams}}if(String.valueOf({{paramName}}) != "null") queryParams += "{{baseName}}" -> {{paramName}}.toString + {{/queryParams}} + + {{#headerParams}}headerParams += "{{baseName}}" -> {{paramName}} + {{/headerParams}} + + var postBody: AnyRef = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}} + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + {{#formParams}}{{#notFile}} + mp.field("{{baseName}}", {{paramName}}.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) + {{/notFile}}{{#isFile}} + mp.field("{{baseName}}", file.getName) + mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE)) + {{/isFile}}{{/formParams}} + postBody = mp + } + else { + {{#formParams}}{{#notFile}}formParams += "{{baseName}}" -> {{paramName}}.toString(){{/notFile}} + {{/formParams}} + } + + try { + apiInvoker.invokeApi(basePath, path, "{{httpMethod}}", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - {{#returnType}} Some(ApiInvoker.deserialize(s, "{{returnContainer}}", classOf[{{returnBaseType}}]).asInstanceOf[{{returnType}}]) - {{/returnType}} + {{#returnType}} Some(ApiInvoker.deserialize(s, "{{returnContainer}}", classOf[{{returnBaseType}}]).asInstanceOf[{{returnType}}]) + {{/returnType}} case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + {{/operation}} } - } - {{/operation}} -} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache index f432c2dc59e..d1ac430f6ad 100644 --- a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache @@ -25,179 +25,179 @@ import com.fasterxml.jackson.annotation._ import com.fasterxml.jackson.databind.annotation.JsonSerialize object ScalaJsonUtil { - def getJsonMapper = { - val mapper = new ObjectMapper() - mapper.registerModule(new DefaultScalaModule()) - mapper.registerModule(new JodaModule()); - mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT) - mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY) - mapper - } +def getJsonMapper = { +val mapper = new ObjectMapper() +mapper.registerModule(new DefaultScalaModule()) +mapper.registerModule(new JodaModule()); +mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); +mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT) +mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) +mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) +mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY) +mapper +} } class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper, - httpHeaders: HashMap[String, String] = HashMap(), - hostMap: HashMap[String, Client] = HashMap(), - asyncHttpClient: Boolean = false, - authScheme: String = "", - authPreemptive: Boolean = false) { - - var defaultHeaders: HashMap[String, String] = httpHeaders - - def escape(value: String): String = { - URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20") - } - - def escape(value: Long): String = value.toString - def escape(value: Double): String = value.toString - def escape(value: Float): String = value.toString - - def deserialize(json: String, containerType: String, cls: Class[_]) = { - if (cls == classOf[String]) { - json match { - case s: String => { - if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2) - else s - } - case _ => null - } - } else { - containerType.toLowerCase match { - case "array" => { - val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) - val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] - response.asScala.toList - } - case "list" => { - val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) - val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] - response.asScala.toList - } - case _ => { - json match { - case e: String if ("\"\"" == e) => null - case _ => mapper.readValue(json, cls) - } - } - } - } - } - - def serialize(obj: AnyRef): String = { - if (obj != null) { - obj match { - case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava) - case _ => mapper.writeValueAsString(obj) - } - } else null - } - - def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], formParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = { - val client = getClient(host) - - val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "") - val builder = client.resource(host + path + querystring).accept(contentType) - headerParams.map(p => builder.header(p._1, p._2)) - defaultHeaders.map(p => { - headerParams.contains(p._1) match { - case true => // override default with supplied header - case false => if (p._2 != null) builder.header(p._1, p._2) - } - }) - var formData: MultivaluedMapImpl = null - if(contentType == "application/x-www-form-urlencoded") { - formData = new MultivaluedMapImpl() - formParams.map(p => formData.add(p._1, p._2)) - } - - val response: ClientResponse = method match { - case "GET" => { - builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse] - } - case "POST" => { - if(formData != null) builder.post(classOf[ClientResponse], formData) - else if(body != null && body.isInstanceOf[File]) { - val file = body.asInstanceOf[File] - val form = new FormDataMultiPart() - form.field("filename", file.getName()) - form.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)) - builder.post(classOf[ClientResponse], form) - } - else { - if(body == null) builder.post(classOf[ClientResponse], serialize(body)) - else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body)) - } - } - case "PUT" => { - if(formData != null) builder.post(classOf[ClientResponse], formData) - else if(body == null) builder.put(classOf[ClientResponse], null) - else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body)) - } - case "DELETE" => { - builder.delete(classOf[ClientResponse]) - } - case _ => null - } - response.getClientResponseStatus().getStatusCode() match { - case 204 => "" - case code: Int if (Range(200, 299).contains(code)) => { - response.hasEntity() match { - case true => response.getEntity(classOf[String]) - case false => "" - } - } - case _ => { - val entity = response.hasEntity() match { - case true => response.getEntity(classOf[String]) - case false => "no data" - } - throw new ApiException( - response.getClientResponseStatus().getStatusCode(), - entity) - } - } - } - - def getClient(host: String): Client = { - hostMap.contains(host) match { - case true => hostMap(host) - case false => { - val client = newClient(host) - // client.addFilter(new LoggingFilter()) - hostMap += host -> client - client - } - } - } - - def newClient(host: String): Client = asyncHttpClient match { - case true => { - import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig - import org.sonatype.spice.jersey.client.ahc.AhcHttpClient - import com.ning.http.client.Realm - - val config: DefaultAhcConfig = new DefaultAhcConfig() - if (!authScheme.isEmpty) { - val authSchemeEnum = Realm.AuthScheme.valueOf(authScheme) - config.getAsyncHttpClientConfigBuilder - .setRealm(new Realm.RealmBuilder().setScheme(authSchemeEnum) - .setUsePreemptiveAuth(authPreemptive).build) - } - AhcHttpClient.create(config) - } - case _ => Client.create() - } +httpHeaders: HashMap[String, String] = HashMap(), +hostMap: HashMap[String, Client] = HashMap(), +asyncHttpClient: Boolean = false, +authScheme: String = "", +authPreemptive: Boolean = false) { + +var defaultHeaders: HashMap[String, String] = httpHeaders + +def escape(value: String): String = { +URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20") +} + +def escape(value: Long): String = value.toString +def escape(value: Double): String = value.toString +def escape(value: Float): String = value.toString + +def deserialize(json: String, containerType: String, cls: Class[_]) = { +if (cls == classOf[String]) { +json match { +case s: String => { +if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2) +else s +} +case _ => null +} +} else { +containerType.toLowerCase match { +case "array" => { +val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) +val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] +response.asScala.toList +} +case "list" => { +val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) +val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] +response.asScala.toList +} +case _ => { +json match { +case e: String if ("\"\"" == e) => null +case _ => mapper.readValue(json, cls) +} +} +} +} +} + +def serialize(obj: AnyRef): String = { +if (obj != null) { +obj match { +case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava) +case _ => mapper.writeValueAsString(obj) +} +} else null +} + +def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], formParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = { +val client = getClient(host) + +val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "") +val builder = client.resource(host + path + querystring).accept(contentType) +headerParams.map(p => builder.header(p._1, p._2)) +defaultHeaders.map(p => { +headerParams.contains(p._1) match { +case true => // override default with supplied header +case false => if (p._2 != null) builder.header(p._1, p._2) +} +}) +var formData: MultivaluedMapImpl = null +if(contentType == "application/x-www-form-urlencoded") { +formData = new MultivaluedMapImpl() +formParams.map(p => formData.add(p._1, p._2)) +} + +val response: ClientResponse = method match { +case "GET" => { +builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse] +} +case "POST" => { +if(formData != null) builder.post(classOf[ClientResponse], formData) +else if(body != null && body.isInstanceOf[File]) { +val file = body.asInstanceOf[File] +val form = new FormDataMultiPart() +form.field("filename", file.getName()) +form.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)) +builder.post(classOf[ClientResponse], form) +} +else { +if(body == null) builder.post(classOf[ClientResponse], serialize(body)) +else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body)) +} +} +case "PUT" => { +if(formData != null) builder.post(classOf[ClientResponse], formData) +else if(body == null) builder.put(classOf[ClientResponse], null) +else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body)) +} +case "DELETE" => { +builder.delete(classOf[ClientResponse]) +} +case _ => null +} +response.getClientResponseStatus().getStatusCode() match { +case 204 => "" +case code: Int if (Range(200, 299).contains(code)) => { +response.hasEntity() match { +case true => response.getEntity(classOf[String]) +case false => "" +} +} +case _ => { +val entity = response.hasEntity() match { +case true => response.getEntity(classOf[String]) +case false => "no data" +} +throw new ApiException( +response.getClientResponseStatus().getStatusCode(), +entity) +} +} +} + +def getClient(host: String): Client = { +hostMap.contains(host) match { +case true => hostMap(host) +case false => { +val client = newClient(host) +// client.addFilter(new LoggingFilter()) +hostMap += host -> client +client +} +} +} + +def newClient(host: String): Client = asyncHttpClient match { +case true => { +import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig +import org.sonatype.spice.jersey.client.ahc.AhcHttpClient +import com.ning.http.client.Realm + +val config: DefaultAhcConfig = new DefaultAhcConfig() +if (!authScheme.isEmpty) { +val authSchemeEnum = Realm.AuthScheme.valueOf(authScheme) +config.getAsyncHttpClientConfigBuilder +.setRealm(new Realm.RealmBuilder().setScheme(authSchemeEnum) +.setUsePreemptiveAuth(authPreemptive).build) +} +AhcHttpClient.create(config) +} +case _ => Client.create() +} } object ApiInvoker extends ApiInvoker(mapper = ScalaJsonUtil.getJsonMapper, - httpHeaders = HashMap(), - hostMap = HashMap(), - asyncHttpClient = {{asyncHttpClient}}, - authScheme = "{{authScheme}}", - authPreemptive = {{authPreemptive}}) +httpHeaders = HashMap(), +hostMap = HashMap(), +asyncHttpClient = {{asyncHttpClient}}, +authScheme = "{{authScheme}}", +authPreemptive = {{authPreemptive}}) class ApiException(val code: Int, msg: String) extends RuntimeException(msg) diff --git a/modules/swagger-codegen/src/main/resources/scala/model.mustache b/modules/swagger-codegen/src/main/resources/scala/model.mustache index a45b71a8f8e..cff9a993a84 100644 --- a/modules/swagger-codegen/src/main/resources/scala/model.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/model.mustache @@ -5,11 +5,11 @@ package {{package}} {{#models}} -{{#model}} + {{#model}} -case class {{classname}} ( - {{#vars}}{{#description}}/* {{{description}}} */ - {{/description}}{{name}}: {{{datatype}}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}} - {{/vars}} -{{/model}} + case class {{classname}} ( + {{#vars}}{{#description}}/* {{{description}}} */ + {{/description}}{{name}}: {{{datatype}}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}} + {{/vars}} + {{/model}} {{/models}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache index 1163b7d381a..417bf20feee 100644 --- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache @@ -1,221 +1,224 @@ - 4.0.0 - {{groupId}} - {{artifactId}} - jar - {{artifactId}} - {{artifactVersion}} - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + {{groupId}} + {{artifactId}} + jar + {{artifactId}} + {{artifactVersion}} + + 2.2.0 + - - - maven-mongodb-plugin-repo - maven mongodb plugin repository - http://maven-mongodb-plugin.googlecode.com/svn/maven/repo - default - - + + + maven-mongodb-plugin-repo + maven mongodb plugin repository + http://maven-mongodb-plugin.googlecode.com/svn/maven/repo + default + + - - - - 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-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.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 - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - -Xms128m - -Xmx1500m - - - - - - - - - org.scala-tools - maven-scala-plugin - - ${scala-version} - - - - - - - com.fasterxml.jackson.module - jackson-module-scala_2.10 - ${jackson-version} - - - com.sun.jersey - jersey-client - ${jersey-version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey-version} - - - org.jfarcand - jersey-ahc-client - ${jersey-async-version} - compile - - - org.scala-lang - scala-library - ${scala-version} - - - com.wordnik - swagger-core - ${swagger-core-version} - - - org.scalatest - scalatest_2.10 - ${scala-test-version} - test - - - junit - junit - ${junit-version} - test - - - joda-time - joda-time - ${joda-time-version} - - - org.joda - joda-convert - ${joda-version} - - - - 2.10.4 - 1.2 - 2.2 - 1.7 - 1.5.0-M1 - 1.0.5 - 1.0.0 - 2.4.2 + + 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 + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin-version} + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + -Xms128m + -Xmx1500m + + + + + + + + + org.scala-tools + maven-scala-plugin + + ${scala-version} + + + + + + + com.fasterxml.jackson.module + jackson-module-scala_2.10 + ${jackson-version} + + + com.sun.jersey + jersey-client + ${jersey-version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey-version} + + + org.jfarcand + jersey-ahc-client + ${jersey-async-version} + compile + + + org.scala-lang + scala-library + ${scala-version} + + + io.swagger + swagger-core + ${swagger-core-version} + + + org.scalatest + scalatest_2.10 + ${scala-test-version} + test + + + junit + junit + ${junit-version} + test + + + joda-time + joda-time + ${joda-time-version} + + + org.joda + joda-convert + ${joda-version} + + + + 2.10.4 + 1.2 + 2.2 + 1.7 + 1.5.0 + 1.0.5 + 1.0.0 + 2.4.2 - 4.8.1 - 3.1.5 - 2.1.3 - + 4.8.1 + 3.1.5 + 2.1.3 + diff --git a/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache b/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache index 64c0b07eb28..08cc829bd80 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache +++ b/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache @@ -1,20 +1,20 @@ import {{apiPackage}}._ import akka.actor.ActorSystem -import com.wordnik.swagger.app.{ResourcesApp, SwaggerApp} +import io.swagger.app.{ResourcesApp, SwaggerApp} import javax.servlet.ServletContext import org.scalatra.LifeCycle class ScalatraBootstrap extends LifeCycle { - implicit val swagger = new SwaggerApp +implicit val swagger = new SwaggerApp - override def init(context: ServletContext) { - implicit val system = ActorSystem("appActorSystem") - try { - {{#apiInfo}}{{#apis}}context mount (new {{classname}}, "/{{baseName}}/*") - {{/apis}}{{/apiInfo}} - context mount (new ResourcesApp, "/api-docs/*") - } catch { - case e: Throwable => e.printStackTrace() - } - } +override def init(context: ServletContext) { +implicit val system = ActorSystem("appActorSystem") +try { +{{#apiInfo}}{{#apis}}context mount (new {{classname}}, "/{{baseName}}/*") +{{/apis}}{{/apiInfo}} +context mount (new ResourcesApp, "/api-docs/*") +} catch { +case e: Throwable => e.printStackTrace() +} +} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala b/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala index e25f16ba392..69ca43c0e1f 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala +++ b/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala @@ -1,16 +1,6 @@ -import org.eclipse.jetty.server._ -import org.eclipse.jetty.webapp.WebAppContext -import org.scalatra.servlet.ScalatraListener -object JettyMain { - object conf { - val port = sys.env.get("PORT") map (_.toInt) getOrElse (8080) - val stopTimeout = sys.env.get("STOP_TIMEOUT") map (_.toInt) getOrElse (5000) - val connectorIdleTimeout = sys.env.get("CONNECTOR_IDLE_TIMEOUT") map (_.toInt) getOrElse (90000) - val webapp = sys.env.get("PUBLIC") getOrElse "webapp" - val contextPath = sys.env.get("CONTEXT_PATH") getOrElse "/" - } +object JettyMain { def main(args: Array[String]) = { val server: Server = new Server @@ -40,4 +30,12 @@ object JettyMain { server.start() } + + object conf { + val port = sys.env.get("PORT") map (_.toInt) getOrElse (8080) + val stopTimeout = sys.env.get("STOP_TIMEOUT") map (_.toInt) getOrElse (5000) + val connectorIdleTimeout = sys.env.get("CONNECTOR_IDLE_TIMEOUT") map (_.toInt) getOrElse (90000) + val webapp = sys.env.get("PUBLIC") getOrElse "webapp" + val contextPath = sys.env.get("CONTEXT_PATH") getOrElse "/" + } } diff --git a/modules/swagger-codegen/src/main/resources/scalatra/JsonUtil.scala b/modules/swagger-codegen/src/main/resources/scalatra/JsonUtil.scala index 691a82f563b..1502e1092be 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/JsonUtil.scala +++ b/modules/swagger-codegen/src/main/resources/scalatra/JsonUtil.scala @@ -1,7 +1,5 @@ package json -import com.fasterxml.jackson.module.scala.DefaultScalaModule -import com.fasterxml.jackson.core.JsonGenerator.Feature import com.fasterxml.jackson.databind._ object JsonUtil { diff --git a/modules/swagger-codegen/src/main/resources/scalatra/README.mustache b/modules/swagger-codegen/src/main/resources/scalatra/README.mustache index f8a560b776f..4a80e8480a7 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/README.mustache +++ b/modules/swagger-codegen/src/main/resources/scalatra/README.mustache @@ -1,10 +1,10 @@ # Swagger generated server ## Overview -This server was generated by the [swagger-codegen](https://github.com/wordnik/swagger-codegen) project. By using the -[swagger-spec](https://github.com/wordnik/swagger-core/wiki) from a remote server, you can easily generate a server stub. This +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 scalatra server. This example uses the [scalatra](http://scalatra.org/) framework. To see how to make this your own, look here: -[README](https://github.com/wordnik/swagger-codegen/tree/master/samples/server-generator/scalatra) \ No newline at end of file +[README](https://github.com/swagger-api/swagger-codegen/tree/master/samples/server-generator/scalatra) \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache b/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache index f6e53468ec9..bae9c83a77f 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache +++ b/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache @@ -1,4 +1,4 @@ -package com.wordnik.swagger.app +package io.swagger.app import _root_.akka.actor.ActorSystem @@ -8,32 +8,32 @@ import org.scalatra.ScalatraServlet import org.json4s.{DefaultFormats, Formats} class ResourcesApp(implicit protected val system: ActorSystem, val swagger: SwaggerApp) - extends ScalatraServlet with JacksonSwaggerBase { - before() { - response.headers += ("Access-Control-Allow-Origin" -> "*") - } +extends ScalatraServlet with JacksonSwaggerBase { +before() { +response.headers += ("Access-Control-Allow-Origin" -> "*") +} - protected def buildFullUrl(path: String) = if (path.startsWith("http")) path else { - val port = request.getServerPort - val h = request.getServerName - val prot = if (port == 443) "https" else "http" - val (proto, host) = if (port != 80 && port != 443) ("http", h+":"+port.toString) else (prot, h) - "%s://%s%s%s".format( - proto, - host, - request.getContextPath, - path) - } +protected def buildFullUrl(path: String) = if (path.startsWith("http")) path else { +val port = request.getServerPort +val h = request.getServerName +val prot = if (port == 443) "https" else "http" +val (proto, host) = if (port != 80 && port != 443) ("http", h+":"+port.toString) else (prot, h) +"%s://%s%s%s".format( +proto, +host, +request.getContextPath, +path) +} } class SwaggerApp extends Swagger(apiInfo = ApiSwagger.apiInfo, apiVersion = "1.0", swaggerVersion = "1.2") object ApiSwagger { - val apiInfo = ApiInfo( - """{{{appName}}}""", - """{{{appDescription}}}""", - """{{{infoUrl}}}""", - """{{{infoEmail}}}""", - """{{{licenseInfo}}}""", - """{{{licenseUrl}}}""") +val apiInfo = ApiInfo( +"""{{{appName}}}""", +"""{{{appDescription}}}""", +"""{{{infoUrl}}}""", +"""{{{infoEmail}}}""", +"""{{{licenseInfo}}}""", +"""{{{licenseUrl}}}""") } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/scalatra/api.mustache b/modules/swagger-codegen/src/main/resources/scalatra/api.mustache index 54710361fe9..bb559a6b1b3 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/api.mustache +++ b/modules/swagger-codegen/src/main/resources/scalatra/api.mustache @@ -14,26 +14,26 @@ import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintE import scala.collection.JavaConverters._ -class {{classname}} (implicit val swagger: Swagger) extends ScalatraServlet - with FileUploadSupport - with JacksonJsonSupport - with SwaggerSupport { - protected implicit val jsonFormats: Formats = DefaultFormats +class {{classname}} (implicit val swagger: Swagger) extends ScalatraServlet +with FileUploadSupport +with JacksonJsonSupport +with SwaggerSupport { +protected implicit val jsonFormats: Formats = DefaultFormats - protected val applicationDescription: String = "{{classname}}" - override protected val applicationName: Option[String] = Some("{{baseName}}") +protected val applicationDescription: String = "{{classname}}" +override protected val applicationName: Option[String] = Some("{{baseName}}") - before() { - contentType = formats("json") - response.headers += ("Access-Control-Allow-Origin" -> "*") - } +before() { +contentType = formats("json") +response.headers += ("Access-Control-Allow-Origin" -> "*") +} {{#operations}} -{{#operation}} - {{newline}} + {{#operation}} + {{newline}} - val {{nickname}}Operation = (apiOperation[{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]("{{nickname}}") - summary "{{{summary}}}" - parameters( + val {{nickname}}Operation = (apiOperation[{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]("{{nickname}}") + summary "{{{summary}}}" + parameters( {{#allParams}}{{#isQueryParam}}queryParam[{{dataType}}]("{{paramName}}").description(""){{^required}}.optional{{/required}}{{#defaultValue}}.defaultValue({{{defaultValue}}}){{/defaultValue}} {{/isQueryParam}} {{#isPathParam}}pathParam[{{dataType}}]("{{paramName}}").description(""){{#defaultValue}}.defaultValue({{{defaultValue}}}){{/defaultValue}} @@ -46,49 +46,49 @@ class {{classname}} (implicit val swagger: Swagger) extends ScalatraServlet {{/isFormParam}} {{#hasMore}},{{/hasMore}} {{/allParams}}) - ) + ) - {{httpMethod}}("{{path}}",operation({{nickname}}Operation)) { - {{#allParams}} - {{#isFile}} - val {{paramName}} = fileParams("{{paramName}}") - {{/isFile}} - {{^isFile}} - {{#isPathParam}} - val {{paramName}} = params.getOrElse("{{paramName}}", halt(400)) - {{/isPathParam}} + {{httpMethod}}("{{path}}",operation({{nickname}}Operation)) { + {{#allParams}} + {{#isFile}} + val {{paramName}} = fileParams("{{paramName}}") + {{/isFile}} + {{^isFile}} + {{#isPathParam}} + val {{paramName}} = params.getOrElse("{{paramName}}", halt(400)) + {{/isPathParam}} - {{#isQueryParam}} - {{#collectionFormat}}val {{paramName}}String = params.getAs[String]("{{paramName}}") - val {{paramName}} = if("{{collectionFormat}}".equals("default")) { - {{paramName}}String match { - case Some(str) => str.split(",") - case None => List() - } - } - else - List() - {{/collectionFormat}} - {{^collectionFormat}}val {{paramName}} = params.getAs[{{dataType}}]("{{paramName}}"){{/collectionFormat}} - - {{/isQueryParam}} + {{#isQueryParam}} + {{#collectionFormat}}val {{paramName}}String = params.getAs[String]("{{paramName}}") + val {{paramName}} = if("{{collectionFormat}}".equals("default")) { + {{paramName}}String match { + case Some(str) => str.split(",") + case None => List() + } + } + else + List() + {{/collectionFormat}} + {{^collectionFormat}}val {{paramName}} = params.getAs[{{dataType}}]("{{paramName}}"){{/collectionFormat}} + + {{/isQueryParam}} - {{#isHeaderParam}} - val {{paramName}} = request.getHeader("{{paramName}}") - {{/isHeaderParam}} + {{#isHeaderParam}} + val {{paramName}} = request.getHeader("{{paramName}}") + {{/isHeaderParam}} - {{#isFormParam}} - val {{paramName}} = params.getAs[{{dataType}}]("{{paramName}}") - {{/isFormParam}} + {{#isFormParam}} + val {{paramName}} = params.getAs[{{dataType}}]("{{paramName}}") + {{/isFormParam}} - {{#isBodyParam}} - val {{paramName}} = parsedBody.extract[{{dataType}}] - {{/isBodyParam}} - {{/isFile}} - println("{{paramName}}: " + {{paramName}}) - {{/allParams}} - } + {{#isBodyParam}} + val {{paramName}} = parsedBody.extract[{{dataType}}] + {{/isBodyParam}} + {{/isFile}} + println("{{paramName}}: " + {{paramName}}) + {{/allParams}} + } -{{/operation}} + {{/operation}} {{/operations}} } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/scalatra/build.sbt b/modules/swagger-codegen/src/main/resources/scalatra/build.sbt index afe84c2c7f0..23af47dada0 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/build.sbt +++ b/modules/swagger-codegen/src/main/resources/scalatra/build.sbt @@ -1,4 +1,6 @@ -import AssemblyKeys._ // put this at the top of the file + + +// put this at the top of the file import NativePackagerKeys._ @@ -8,9 +10,9 @@ assemblySettings scalariformSettings -organization := "com.wordnik" +organization := "io.swagger" -seq(webSettings :_*) +seq(webSettings: _*) mainClass in assembly := Some("JettyMain") @@ -23,40 +25,40 @@ scalaVersion := "2.11.2" scalacOptions += "-language:postfixOps" libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "2.2.1" % "test", - "org.scalatra" %% "scalatra" % "2.3.0.RC3", - "org.scalatra" %% "scalatra-scalate" % "2.3.0.RC3", - "org.scalatra" %% "scalatra-json" % "2.3.0.RC3", - "org.scalatra" %% "scalatra-swagger" % "2.3.0.RC3", - "org.scalatra" %% "scalatra-swagger-ext" % "2.3.0.RC3", - "org.scalatra" %% "scalatra-slf4j" % "2.3.0.RC3", - "org.json4s" %% "json4s-jackson" % "3.2.10", - "org.json4s" %% "json4s-ext" % "3.2.10", - "commons-codec" % "commons-codec" % "1.7", - "net.databinder.dispatch" %% "dispatch-core" % "0.11.2", + "org.scalatest" %% "scalatest" % "2.2.1" % "test", + "org.scalatra" %% "scalatra" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-scalate" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-json" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-swagger" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-swagger-ext" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-slf4j" % "2.3.0.RC3", + "org.json4s" %% "json4s-jackson" % "3.2.10", + "org.json4s" %% "json4s-ext" % "3.2.10", + "commons-codec" % "commons-codec" % "1.7", + "net.databinder.dispatch" %% "dispatch-core" % "0.11.2", //"net.databinder.dispatch" %% "json4s-jackson" % "0.11.2", - "net.databinder.dispatch" %% "dispatch-json4s-jackson" % "0.11.2", - "com.typesafe.akka" %% "akka-actor" % "2.3.6", - "org.eclipse.jetty" % "jetty-server" % "9.2.3.v20140905" % "container;compile;test", - "org.eclipse.jetty" % "jetty-webapp" % "9.2.3.v20140905" % "container;compile;test", - "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;compile;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar")) + "net.databinder.dispatch" %% "dispatch-json4s-jackson" % "0.11.2", + "com.typesafe.akka" %% "akka-actor" % "2.3.6", + "org.eclipse.jetty" % "jetty-server" % "9.2.3.v20140905" % "container;compile;test", + "org.eclipse.jetty" % "jetty-webapp" % "9.2.3.v20140905" % "container;compile;test", + "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;compile;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar")) ) -resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository" +resolvers += "Local Maven Repository" at "file://" + Path.userHome.absolutePath + "/.m2/repository" resolvers += "Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/" resolvers += "Sonatype OSS Releases" at "http://oss.sonatype.org/content/repositories/releases/" ivyXML := - - - - + + + + mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) => { - case "about.html" => MergeStrategy.discard + case "about.html" => MergeStrategy.discard case x => old(x) } } diff --git a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache index 8c5d1954662..f740d40bc07 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache +++ b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache @@ -5,11 +5,11 @@ package {{package}} {{#models}} -{{#model}} -case class {{classname}} ( - {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}] {{#description}} // {{description}}{{/description}} - {{/isNotRequired}}{{#hasMore}}, - {{/hasMore}}{{/vars}} -) -{{/model}} + {{#model}} + case class {{classname}} ( + {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}] {{#description}} // {{description}}{{/description}} + {{/isNotRequired}}{{#hasMore}}, + {{/hasMore}}{{/vars}} + ) + {{/model}} {{/models}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/scalatra/web.xml b/modules/swagger-codegen/src/main/resources/scalatra/web.xml index 2a08440458e..a6e529e4aec 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/web.xml +++ b/modules/swagger-codegen/src/main/resources/scalatra/web.xml @@ -1,17 +1,17 @@ - - - org.scalatra.servlet.ScalatraListener - + + + org.scalatra.servlet.ScalatraListener + - - default - /*.html - /css/* - /js/*.js - /images/* - + + default + /*.html + /css/* + /js/*.js + /images/* + diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css index a3352d774ce..41580e0ea07 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css +++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css @@ -9,1084 +9,1319 @@ */ @-ms-viewport { - width: device-width; + width: device-width; } .clearfix { - *zoom: 1; + *zoom: 1; } .clearfix:before, .clearfix:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .clearfix:after { - clear: both; + clear: both; } .hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; } .input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .hidden { - display: none; - visibility: hidden; + display: none; + visibility: hidden; } .visible-phone { - display: none !important; + display: none !important; } .visible-tablet { - display: none !important; + display: none !important; } .hidden-desktop { - display: none !important; + display: none !important; } .visible-desktop { - display: inherit !important; + display: inherit !important; } @media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } + .hidden-desktop { + display: inherit !important; + } + + .visible-desktop { + display: none !important; + } + + .visible-tablet { + display: inherit !important; + } + + .hidden-tablet { + display: none !important; + } } @media (max-width: 767px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } + .hidden-desktop { + display: inherit !important; + } + + .visible-desktop { + display: none !important; + } + + .visible-phone { + display: inherit !important; + } + + .hidden-phone { + display: none !important; + } } @media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } + .row { + margin-left: -30px; + *zoom: 1; + } + + .row:before, + .row:after { + display: table; + line-height: 0; + content: ""; + } + + .row:after { + clear: both; + } + + [class*="span"] { + float: left; + min-height: 1px; + margin-left: 30px; + } + + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 1170px; + } + + .span12 { + width: 1170px; + } + + .span11 { + width: 1070px; + } + + .span10 { + width: 970px; + } + + .span9 { + width: 870px; + } + + .span8 { + width: 770px; + } + + .span7 { + width: 670px; + } + + .span6 { + width: 570px; + } + + .span5 { + width: 470px; + } + + .span4 { + width: 370px; + } + + .span3 { + width: 270px; + } + + .span2 { + width: 170px; + } + + .span1 { + width: 70px; + } + + .offset12 { + margin-left: 1230px; + } + + .offset11 { + margin-left: 1130px; + } + + .offset10 { + margin-left: 1030px; + } + + .offset9 { + margin-left: 930px; + } + + .offset8 { + margin-left: 830px; + } + + .offset7 { + margin-left: 730px; + } + + .offset6 { + margin-left: 630px; + } + + .offset5 { + margin-left: 530px; + } + + .offset4 { + margin-left: 430px; + } + + .offset3 { + margin-left: 330px; + } + + .offset2 { + margin-left: 230px; + } + + .offset1 { + margin-left: 130px; + } + + .row-fluid { + width: 100%; + *zoom: 1; + } + + .row-fluid:before, + .row-fluid:after { + display: table; + line-height: 0; + content: ""; + } + + .row-fluid:after { + clear: both; + } + + .row-fluid [class*="span"] { + display: block; + float: left; + width: 100%; + min-height: 30px; + margin-left: 2.564102564102564%; + *margin-left: 2.5109110747408616%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + .row-fluid [class*="span"]:first-child { + margin-left: 0; + } + + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.564102564102564%; + } + + .row-fluid .span12 { + width: 100%; + *width: 99.94680851063829%; + } + + .row-fluid .span11 { + width: 91.45299145299145%; + *width: 91.39979996362975%; + } + + .row-fluid .span10 { + width: 82.90598290598291%; + *width: 82.8527914166212%; + } + + .row-fluid .span9 { + width: 74.35897435897436%; + *width: 74.30578286961266%; + } + + .row-fluid .span8 { + width: 65.81196581196582%; + *width: 65.75877432260411%; + } + + .row-fluid .span7 { + width: 57.26495726495726%; + *width: 57.21176577559556%; + } + + .row-fluid .span6 { + width: 48.717948717948715%; + *width: 48.664757228587014%; + } + + .row-fluid .span5 { + width: 40.17094017094017%; + *width: 40.11774868157847%; + } + + .row-fluid .span4 { + width: 31.623931623931625%; + *width: 31.570740134569924%; + } + + .row-fluid .span3 { + width: 23.076923076923077%; + *width: 23.023731587561375%; + } + + .row-fluid .span2 { + width: 14.52991452991453%; + *width: 14.476723040552828%; + } + + .row-fluid .span1 { + width: 5.982905982905983%; + *width: 5.929714493544281%; + } + + .row-fluid .offset12 { + margin-left: 105.12820512820512%; + *margin-left: 105.02182214948171%; + } + + .row-fluid .offset12:first-child { + margin-left: 102.56410256410257%; + *margin-left: 102.45771958537915%; + } + + .row-fluid .offset11 { + margin-left: 96.58119658119658%; + *margin-left: 96.47481360247316%; + } + + .row-fluid .offset11:first-child { + margin-left: 94.01709401709402%; + *margin-left: 93.91071103837061%; + } + + .row-fluid .offset10 { + margin-left: 88.03418803418803%; + *margin-left: 87.92780505546462%; + } + + .row-fluid .offset10:first-child { + margin-left: 85.47008547008548%; + *margin-left: 85.36370249136206%; + } + + .row-fluid .offset9 { + margin-left: 79.48717948717949%; + *margin-left: 79.38079650845607%; + } + + .row-fluid .offset9:first-child { + margin-left: 76.92307692307693%; + *margin-left: 76.81669394435352%; + } + + .row-fluid .offset8 { + margin-left: 70.94017094017094%; + *margin-left: 70.83378796144753%; + } + + .row-fluid .offset8:first-child { + margin-left: 68.37606837606839%; + *margin-left: 68.26968539734497%; + } + + .row-fluid .offset7 { + margin-left: 62.393162393162385%; + *margin-left: 62.28677941443899%; + } + + .row-fluid .offset7:first-child { + margin-left: 59.82905982905982%; + *margin-left: 59.72267685033642%; + } + + .row-fluid .offset6 { + margin-left: 53.84615384615384%; + *margin-left: 53.739770867430444%; + } + + .row-fluid .offset6:first-child { + margin-left: 51.28205128205128%; + *margin-left: 51.175668303327875%; + } + + .row-fluid .offset5 { + margin-left: 45.299145299145295%; + *margin-left: 45.1927623204219%; + } + + .row-fluid .offset5:first-child { + margin-left: 42.73504273504273%; + *margin-left: 42.62865975631933%; + } + + .row-fluid .offset4 { + margin-left: 36.75213675213675%; + *margin-left: 36.645753773413354%; + } + + .row-fluid .offset4:first-child { + margin-left: 34.18803418803419%; + *margin-left: 34.081651209310785%; + } + + .row-fluid .offset3 { + margin-left: 28.205128205128204%; + *margin-left: 28.0987452264048%; + } + + .row-fluid .offset3:first-child { + margin-left: 25.641025641025642%; + *margin-left: 25.53464266230224%; + } + + .row-fluid .offset2 { + margin-left: 19.65811965811966%; + *margin-left: 19.551736679396257%; + } + + .row-fluid .offset2:first-child { + margin-left: 17.094017094017094%; + *margin-left: 16.98763411529369%; + } + + .row-fluid .offset1 { + margin-left: 11.11111111111111%; + *margin-left: 11.004728132387708%; + } + + .row-fluid .offset1:first-child { + margin-left: 8.547008547008547%; + *margin-left: 8.440625568285142%; + } + + input, + textarea, + .uneditable-input { + margin-left: 0; + } + + .controls-row [class*="span"] + [class*="span"] { + margin-left: 30px; + } + + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 1156px; + } + + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 1056px; + } + + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 956px; + } + + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 856px; + } + + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 756px; + } + + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 656px; + } + + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 556px; + } + + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 456px; + } + + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 356px; + } + + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 256px; + } + + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 156px; + } + + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 56px; + } + + .thumbnails { + margin-left: -30px; + } + + .thumbnails > li { + margin-left: 30px; + } + + .row-fluid .thumbnails { + margin-left: 0; + } } @media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.7624309392265194%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } + .row { + margin-left: -20px; + *zoom: 1; + } + + .row:before, + .row:after { + display: table; + line-height: 0; + content: ""; + } + + .row:after { + clear: both; + } + + [class*="span"] { + float: left; + min-height: 1px; + margin-left: 20px; + } + + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 724px; + } + + .span12 { + width: 724px; + } + + .span11 { + width: 662px; + } + + .span10 { + width: 600px; + } + + .span9 { + width: 538px; + } + + .span8 { + width: 476px; + } + + .span7 { + width: 414px; + } + + .span6 { + width: 352px; + } + + .span5 { + width: 290px; + } + + .span4 { + width: 228px; + } + + .span3 { + width: 166px; + } + + .span2 { + width: 104px; + } + + .span1 { + width: 42px; + } + + .offset12 { + margin-left: 764px; + } + + .offset11 { + margin-left: 702px; + } + + .offset10 { + margin-left: 640px; + } + + .offset9 { + margin-left: 578px; + } + + .offset8 { + margin-left: 516px; + } + + .offset7 { + margin-left: 454px; + } + + .offset6 { + margin-left: 392px; + } + + .offset5 { + margin-left: 330px; + } + + .offset4 { + margin-left: 268px; + } + + .offset3 { + margin-left: 206px; + } + + .offset2 { + margin-left: 144px; + } + + .offset1 { + margin-left: 82px; + } + + .row-fluid { + width: 100%; + *zoom: 1; + } + + .row-fluid:before, + .row-fluid:after { + display: table; + line-height: 0; + content: ""; + } + + .row-fluid:after { + clear: both; + } + + .row-fluid [class*="span"] { + display: block; + float: left; + width: 100%; + min-height: 30px; + margin-left: 2.7624309392265194%; + *margin-left: 2.709239449864817%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + .row-fluid [class*="span"]:first-child { + margin-left: 0; + } + + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.7624309392265194%; + } + + .row-fluid .span12 { + width: 100%; + *width: 99.94680851063829%; + } + + .row-fluid .span11 { + width: 91.43646408839778%; + *width: 91.38327259903608%; + } + + .row-fluid .span10 { + width: 82.87292817679558%; + *width: 82.81973668743387%; + } + + .row-fluid .span9 { + width: 74.30939226519337%; + *width: 74.25620077583166%; + } + + .row-fluid .span8 { + width: 65.74585635359117%; + *width: 65.69266486422946%; + } + + .row-fluid .span7 { + width: 57.18232044198895%; + *width: 57.12912895262725%; + } + + .row-fluid .span6 { + width: 48.61878453038674%; + *width: 48.56559304102504%; + } + + .row-fluid .span5 { + width: 40.05524861878453%; + *width: 40.00205712942283%; + } + + .row-fluid .span4 { + width: 31.491712707182323%; + *width: 31.43852121782062%; + } + + .row-fluid .span3 { + width: 22.92817679558011%; + *width: 22.87498530621841%; + } + + .row-fluid .span2 { + width: 14.3646408839779%; + *width: 14.311449394616199%; + } + + .row-fluid .span1 { + width: 5.801104972375691%; + *width: 5.747913483013988%; + } + + .row-fluid .offset12 { + margin-left: 105.52486187845304%; + *margin-left: 105.41847889972962%; + } + + .row-fluid .offset12:first-child { + margin-left: 102.76243093922652%; + *margin-left: 102.6560479605031%; + } + + .row-fluid .offset11 { + margin-left: 96.96132596685082%; + *margin-left: 96.8549429881274%; + } + + .row-fluid .offset11:first-child { + margin-left: 94.1988950276243%; + *margin-left: 94.09251204890089%; + } + + .row-fluid .offset10 { + margin-left: 88.39779005524862%; + *margin-left: 88.2914070765252%; + } + + .row-fluid .offset10:first-child { + margin-left: 85.6353591160221%; + *margin-left: 85.52897613729868%; + } + + .row-fluid .offset9 { + margin-left: 79.8342541436464%; + *margin-left: 79.72787116492299%; + } + + .row-fluid .offset9:first-child { + margin-left: 77.07182320441989%; + *margin-left: 76.96544022569647%; + } + + .row-fluid .offset8 { + margin-left: 71.2707182320442%; + *margin-left: 71.16433525332079%; + } + + .row-fluid .offset8:first-child { + margin-left: 68.50828729281768%; + *margin-left: 68.40190431409427%; + } + + .row-fluid .offset7 { + margin-left: 62.70718232044199%; + *margin-left: 62.600799341718584%; + } + + .row-fluid .offset7:first-child { + margin-left: 59.94475138121547%; + *margin-left: 59.838368402492065%; + } + + .row-fluid .offset6 { + margin-left: 54.14364640883978%; + *margin-left: 54.037263430116376%; + } + + .row-fluid .offset6:first-child { + margin-left: 51.38121546961326%; + *margin-left: 51.27483249088986%; + } + + .row-fluid .offset5 { + margin-left: 45.58011049723757%; + *margin-left: 45.47372751851417%; + } + + .row-fluid .offset5:first-child { + margin-left: 42.81767955801105%; + *margin-left: 42.71129657928765%; + } + + .row-fluid .offset4 { + margin-left: 37.01657458563536%; + *margin-left: 36.91019160691196%; + } + + .row-fluid .offset4:first-child { + margin-left: 34.25414364640884%; + *margin-left: 34.14776066768544%; + } + + .row-fluid .offset3 { + margin-left: 28.45303867403315%; + *margin-left: 28.346655695309746%; + } + + .row-fluid .offset3:first-child { + margin-left: 25.69060773480663%; + *margin-left: 25.584224756083227%; + } + + .row-fluid .offset2 { + margin-left: 19.88950276243094%; + *margin-left: 19.783119783707537%; + } + + .row-fluid .offset2:first-child { + margin-left: 17.12707182320442%; + *margin-left: 17.02068884448102%; + } + + .row-fluid .offset1 { + margin-left: 11.32596685082873%; + *margin-left: 11.219583872105325%; + } + + .row-fluid .offset1:first-child { + margin-left: 8.56353591160221%; + *margin-left: 8.457152932878806%; + } + + input, + textarea, + .uneditable-input { + margin-left: 0; + } + + .controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; + } + + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 710px; + } + + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 648px; + } + + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 586px; + } + + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 524px; + } + + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 462px; + } + + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 400px; + } + + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 338px; + } + + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 276px; + } + + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 214px; + } + + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 152px; + } + + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 90px; + } + + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 28px; + } } @media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade { - top: -100px; - } - .modal.fade.in { - top: 20px; - } + body { + padding-right: 20px; + padding-left: 20px; + } + + .navbar-fixed-top, + .navbar-fixed-bottom, + .navbar-static-top { + margin-right: -20px; + margin-left: -20px; + } + + .container-fluid { + padding: 0; + } + + .dl-horizontal dt { + float: none; + width: auto; + clear: none; + text-align: left; + } + + .dl-horizontal dd { + margin-left: 0; + } + + .container { + width: auto; + } + + .row-fluid { + width: 100%; + } + + .row, + .thumbnails { + margin-left: 0; + } + + .thumbnails > li { + float: none; + margin-left: 0; + } + + [class*="span"], + .uneditable-input[class*="span"], + .row-fluid [class*="span"] { + display: block; + float: none; + width: 100%; + margin-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + .span12, + .row-fluid .span12 { + width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + .row-fluid [class*="offset"]:first-child { + margin-left: 0; + } + + .input-large, + .input-xlarge, + .input-xxlarge, + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + .input-prepend input, + .input-append input, + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + display: inline-block; + width: auto; + } + + .controls-row [class*="span"] + [class*="span"] { + margin-left: 0; + } + + .modal { + position: fixed; + top: 20px; + right: 20px; + left: 20px; + width: auto; + margin: 0; + } + + .modal.fade { + top: -100px; + } + + .modal.fade.in { + top: 20px; + } } @media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media-object { - margin-right: 0; - margin-left: 0; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } + + .page-header h1 small { + display: block; + line-height: 20px; + } + + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; + } + + .form-horizontal .control-label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + + .form-horizontal .controls { + margin-left: 0; + } + + .form-horizontal .control-list { + padding-top: 0; + } + + .form-horizontal .form-actions { + padding-right: 10px; + padding-left: 10px; + } + + .media .pull-left, + .media .pull-right { + display: block; + float: none; + margin-bottom: 10px; + } + + .media-object { + margin-right: 0; + margin-left: 0; + } + + .modal { + top: 10px; + right: 10px; + left: 10px; + } + + .modal-header .close { + padding: 10px; + margin: -10px; + } + + .carousel-caption { + position: static; + } } @media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: #999999; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: none; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } + body { + padding-top: 0; + } + + .navbar-fixed-top, + .navbar-fixed-bottom { + position: static; + } + + .navbar-fixed-top { + margin-bottom: 20px; + } + + .navbar-fixed-bottom { + margin-top: 20px; + } + + .navbar-fixed-top .navbar-inner, + .navbar-fixed-bottom .navbar-inner { + padding: 5px; + } + + .navbar .container { + width: auto; + padding: 0; + } + + .navbar .brand { + padding-right: 10px; + padding-left: 10px; + margin: 0 0 0 -5px; + } + + .nav-collapse { + clear: both; + } + + .nav-collapse .nav { + float: none; + margin: 0 0 10px; + } + + .nav-collapse .nav > li { + float: none; + } + + .nav-collapse .nav > li > a { + margin-bottom: 2px; + } + + .nav-collapse .nav > .divider-vertical { + display: none; + } + + .nav-collapse .nav .nav-header { + color: #777777; + text-shadow: none; + } + + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { + padding: 9px 15px; + font-weight: bold; + color: #777777; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + } + + .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + } + + .nav-collapse .dropdown-menu li + li a { + margin-bottom: 2px; + } + + .nav-collapse .nav > li > a:hover, + .nav-collapse .dropdown-menu a:hover { + background-color: #f2f2f2; + } + + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; + } + + .navbar-inverse .nav-collapse .nav > li > a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:hover { + background-color: #111111; + } + + .nav-collapse.in .btn-group { + padding: 0; + margin-top: 5px; + } + + .nav-collapse .dropdown-menu { + position: static; + top: auto; + left: auto; + display: none; + float: none; + max-width: none; + padding: 0; + margin: 0 15px; + background-color: transparent; + border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + + .nav-collapse .open > .dropdown-menu { + display: block; + } + + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { + display: none; + } + + .nav-collapse .dropdown-menu .divider { + display: none; + } + + .nav-collapse .nav > li > .dropdown-menu:before, + .nav-collapse .nav > li > .dropdown-menu:after { + display: none; + } + + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + float: none; + padding: 10px 15px; + margin: 10px 0; + border-top: 1px solid #f2f2f2; + border-bottom: 1px solid #f2f2f2; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + } + + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; + } + + .navbar .nav-collapse .nav.pull-right { + float: none; + margin-left: 0; + } + + .nav-collapse, + .nav-collapse.collapse { + height: 0; + overflow: hidden; + } + + .navbar .btn-navbar { + display: block; + } + + .navbar-static .navbar-inner { + padding-right: 10px; + padding-left: 10px; + } } @media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; + } } diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap.css b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap.css index db3b3bfd6a0..bbe32a8627b 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap.css +++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/bootstrap.css @@ -18,95 +18,95 @@ header, hgroup, nav, section { - display: block; + display: block; } audio, canvas, video { - display: inline-block; - *display: inline; - *zoom: 1; + display: inline-block; + *display: inline; + *zoom: 1; } audio:not([controls]) { - display: none; + display: none; } html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; } a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } a:hover, a:active { - outline: 0; + outline: 0; } sub, sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; } sup { - top: -0.5em; + top: -0.5em; } sub { - bottom: -0.25em; + bottom: -0.25em; } img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; + width: auto \9; + height: auto; + max-width: 100%; + vertical-align: middle; + border: 0; + -ms-interpolation-mode: bicubic; } #map_canvas img, .google-maps img { - max-width: none; + max-width: none; } button, input, select, textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; + margin: 0; + font-size: 100%; + vertical-align: middle; } button, input { - *overflow: visible; - line-height: normal; + *overflow: visible; + line-height: normal; } button::-moz-focus-inner, input::-moz-focus-inner { - padding: 0; - border: 0; + padding: 0; + border: 0; } button, html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; + cursor: pointer; + -webkit-appearance: button; } label, @@ -117,601 +117,612 @@ input[type="reset"], input[type="submit"], input[type="radio"], input[type="checkbox"] { - cursor: pointer; + cursor: pointer; } input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-appearance: textfield; } input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; + -webkit-appearance: none; } textarea { - overflow: auto; - vertical-align: top; + overflow: auto; + vertical-align: top; } @media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + + a, + a:visited { + text-decoration: underline; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + + thead { + display: table-header-group; + } + + tr, + img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + @page { + margin: 0.5cm; + } + + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + + h2, + h3 { + page-break-after: avoid; + } } .clearfix { - *zoom: 1; + *zoom: 1; } .clearfix:before, .clearfix:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .clearfix:after { - clear: both; + clear: both; } .hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; } .input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; + margin: 0; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 20px; + color: #333333; + background-color: #ffffff; } a { - color: #0088cc; - text-decoration: none; + color: #0088cc; + text-decoration: none; } a:hover { - color: #005580; - text-decoration: underline; + color: #005580; + text-decoration: underline; } .img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); } .img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; } .row { - margin-left: -20px; - *zoom: 1; + margin-left: -20px; + *zoom: 1; } .row:before, .row:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .row:after { - clear: both; + clear: both; } [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; + float: left; + min-height: 1px; + margin-left: 20px; } .container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { - width: 940px; + width: 940px; } .span12 { - width: 940px; + width: 940px; } .span11 { - width: 860px; + width: 860px; } .span10 { - width: 780px; + width: 780px; } .span9 { - width: 700px; + width: 700px; } .span8 { - width: 620px; + width: 620px; } .span7 { - width: 540px; + width: 540px; } .span6 { - width: 460px; + width: 460px; } .span5 { - width: 380px; + width: 380px; } .span4 { - width: 300px; + width: 300px; } .span3 { - width: 220px; + width: 220px; } .span2 { - width: 140px; + width: 140px; } .span1 { - width: 60px; + width: 60px; } .offset12 { - margin-left: 980px; + margin-left: 980px; } .offset11 { - margin-left: 900px; + margin-left: 900px; } .offset10 { - margin-left: 820px; + margin-left: 820px; } .offset9 { - margin-left: 740px; + margin-left: 740px; } .offset8 { - margin-left: 660px; + margin-left: 660px; } .offset7 { - margin-left: 580px; + margin-left: 580px; } .offset6 { - margin-left: 500px; + margin-left: 500px; } .offset5 { - margin-left: 420px; + margin-left: 420px; } .offset4 { - margin-left: 340px; + margin-left: 340px; } .offset3 { - margin-left: 260px; + margin-left: 260px; } .offset2 { - margin-left: 180px; + margin-left: 180px; } .offset1 { - margin-left: 100px; + margin-left: 100px; } .row-fluid { - width: 100%; - *zoom: 1; + width: 100%; + *zoom: 1; } .row-fluid:before, .row-fluid:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .row-fluid:after { - clear: both; + clear: both; } .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + display: block; + float: left; + width: 100%; + min-height: 30px; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .row-fluid [class*="span"]:first-child { - margin-left: 0; + margin-left: 0; } .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; + margin-left: 2.127659574468085%; } .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; + width: 6.382978723404255%; + *width: 6.329787234042553%; } .row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; } .row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; } .row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; } .row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; } .row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; } .row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; } .row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; } .row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; } .row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; } .row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; } .row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; } .row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; } .row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; } .row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; } .row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; } .row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; } .row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; } .row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; } .row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; } .row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; } .row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; } .row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; } .row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; } .row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; } [class*="span"].hide, .row-fluid [class*="span"].hide { - display: none; + display: none; } [class*="span"].pull-right, .row-fluid [class*="span"].pull-right { - float: right; + float: right; } .container { - margin-right: auto; - margin-left: auto; - *zoom: 1; + margin-right: auto; + margin-left: auto; + *zoom: 1; } .container:before, .container:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .container:after { - clear: both; + clear: both; } .container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; + padding-right: 20px; + padding-left: 20px; + *zoom: 1; } .container-fluid:before, .container-fluid:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .container-fluid:after { - clear: both; + clear: both; } p { - margin: 0 0 10px; + margin: 0 0 10px; } .lead { - margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; + margin-bottom: 20px; + font-size: 21px; + font-weight: 200; + line-height: 30px; } small { - font-size: 85%; + font-size: 85%; } strong { - font-weight: bold; + font-weight: bold; } em { - font-style: italic; + font-style: italic; } cite { - font-style: normal; + font-style: normal; } .muted { - color: #999999; + color: #999999; } a.muted:hover { - color: #808080; + color: #808080; } .text-warning { - color: #c09853; + color: #c09853; } a.text-warning:hover { - color: #a47e3c; + color: #a47e3c; } .text-error { - color: #b94a48; + color: #b94a48; } a.text-error:hover { - color: #953b39; + color: #953b39; } .text-info { - color: #3a87ad; + color: #3a87ad; } a.text-info:hover { - color: #2d6987; + color: #2d6987; } .text-success { - color: #468847; + color: #468847; } a.text-success:hover { - color: #356635; + color: #356635; } h1, @@ -720,12 +731,12 @@ h3, h4, h5, h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; + margin: 10px 0; + font-family: inherit; + font-weight: bold; + line-height: 20px; + color: inherit; + text-rendering: optimizelegibility; } h1 small, @@ -734,301 +745,301 @@ h3 small, h4 small, h5 small, h6 small { - font-weight: normal; - line-height: 1; - color: #999999; + font-weight: normal; + line-height: 1; + color: #999999; } h1, h2, h3 { - line-height: 40px; + line-height: 40px; } h1 { - font-size: 38.5px; + font-size: 38.5px; } h2 { - font-size: 31.5px; + font-size: 31.5px; } h3 { - font-size: 24.5px; + font-size: 24.5px; } h4 { - font-size: 17.5px; + font-size: 17.5px; } h5 { - font-size: 14px; + font-size: 14px; } h6 { - font-size: 11.9px; + font-size: 11.9px; } h1 small { - font-size: 24.5px; + font-size: 24.5px; } h2 small { - font-size: 17.5px; + font-size: 17.5px; } h3 small { - font-size: 14px; + font-size: 14px; } h4 small { - font-size: 14px; + font-size: 14px; } .page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; + padding-bottom: 9px; + margin: 20px 0 30px; + border-bottom: 1px solid #eeeeee; } ul, ol { - padding: 0; - margin: 0 0 10px 25px; + padding: 0; + margin: 0 0 10px 25px; } ul ul, ul ol, ol ol, ol ul { - margin-bottom: 0; + margin-bottom: 0; } li { - line-height: 20px; + line-height: 20px; } ul.unstyled, ol.unstyled { - margin-left: 0; - list-style: none; + margin-left: 0; + list-style: none; } ul.inline, ol.inline { - margin-left: 0; - list-style: none; + margin-left: 0; + list-style: none; } ul.inline > li, ol.inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; + display: inline-block; + padding-right: 5px; + padding-left: 5px; } dl { - margin-bottom: 20px; + margin-bottom: 20px; } dt, dd { - line-height: 20px; + line-height: 20px; } dt { - font-weight: bold; + font-weight: bold; } dd { - margin-left: 10px; + margin-left: 10px; } .dl-horizontal { - *zoom: 1; + *zoom: 1; } .dl-horizontal:before, .dl-horizontal:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .dl-horizontal:after { - clear: both; + clear: both; } .dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; + float: left; + width: 160px; + overflow: hidden; + clear: left; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; } .dl-horizontal dd { - margin-left: 180px; + margin-left: 180px; } hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; + margin: 20px 0; + border: 0; + border-top: 1px solid #eeeeee; + border-bottom: 1px solid #ffffff; } abbr[title], abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; + cursor: help; + border-bottom: 1px dotted #999999; } abbr.initialism { - font-size: 90%; - text-transform: uppercase; + font-size: 90%; + text-transform: uppercase; } blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; + padding: 0 0 0 15px; + margin: 0 0 20px; + border-left: 5px solid #eeeeee; } blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 25px; + margin-bottom: 0; + font-size: 16px; + font-weight: 300; + line-height: 25px; } blockquote small { - display: block; - line-height: 20px; - color: #999999; + display: block; + line-height: 20px; + color: #999999; } blockquote small:before { - content: '\2014 \00A0'; + content: '\2014 \00A0'; } blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; + float: right; + padding-right: 15px; + padding-left: 0; + border-right: 5px solid #eeeeee; + border-left: 0; } blockquote.pull-right p, blockquote.pull-right small { - text-align: right; + text-align: right; } blockquote.pull-right small:before { - content: ''; + content: ''; } blockquote.pull-right small:after { - content: '\00A0 \2014'; + content: '\00A0 \2014'; } q:before, q:after, blockquote:before, blockquote:after { - content: ""; + content: ""; } address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 20px; + display: block; + margin-bottom: 20px; + font-style: normal; + line-height: 20px; } code, pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + padding: 0 3px 2px; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + font-size: 12px; + color: #333333; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } code { - padding: 2px 4px; - color: #d14; - white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; + padding: 2px 4px; + color: #d14; + white-space: nowrap; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; } pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 20px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; + word-break: break-all; + word-wrap: break-word; + white-space: pre; + white-space: pre-wrap; + background-color: #f5f5f5; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } pre.prettyprint { - margin-bottom: 20px; + margin-bottom: 20px; } pre code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; + padding: 0; + color: inherit; + white-space: pre; + white-space: pre-wrap; + background-color: transparent; + border: 0; } .pre-scrollable { - max-height: 340px; - overflow-y: scroll; + max-height: 340px; + overflow-y: scroll; } form { - margin: 0 0 20px; + margin: 0 0 20px; } fieldset { - padding: 0; - margin: 0; - border: 0; + padding: 0; + margin: 0; + border: 0; } legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: 40px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; + display: block; + width: 100%; + padding: 0; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; + color: #333333; + border: 0; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 15px; - color: #999999; + font-size: 15px; + color: #999999; } label, @@ -1036,21 +1047,21 @@ input, button, select, textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; + font-size: 14px; + font-weight: normal; + line-height: 20px; } input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } label { - display: block; - margin-bottom: 5px; + display: block; + margin-bottom: 5px; } select, @@ -1070,27 +1081,27 @@ input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { - display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + display: inline-block; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; + color: #555555; + vertical-align: middle; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } input, textarea, .uneditable-input { - width: 206px; + width: 206px; } textarea { - height: auto; + height: auto; } textarea, @@ -1109,15 +1120,15 @@ input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; } textarea:focus, @@ -1136,22 +1147,22 @@ input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); } input[type="radio"], input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - *margin-top: 0; - line-height: normal; + margin: 4px 0 0; + margin-top: 1px \9; + *margin-top: 0; + line-height: normal; } input[type="file"], @@ -1161,128 +1172,128 @@ input[type="reset"], input[type="button"], input[type="radio"], input[type="checkbox"] { - width: auto; + width: auto; } select, input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ + height: 30px; + /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ + *margin-top: 4px; + /* For IE7, add top margin to align select with labels */ - line-height: 30px; + line-height: 30px; } select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; + width: 220px; + background-color: #ffffff; + border: 1px solid #cccccc; } select[multiple], select[size] { - height: auto; + height: auto; } select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } .uneditable-input, .uneditable-textarea { - color: #999999; - cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + color: #999999; + cursor: not-allowed; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); } .uneditable-input { - overflow: hidden; - white-space: nowrap; + overflow: hidden; + white-space: nowrap; } .uneditable-textarea { - width: auto; - height: auto; + width: auto; + height: auto; } input:-moz-placeholder, textarea:-moz-placeholder { - color: #999999; + color: #999999; } input:-ms-input-placeholder, textarea:-ms-input-placeholder { - color: #999999; + color: #999999; } input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { - color: #999999; + color: #999999; } .radio, .checkbox { - min-height: 20px; - padding-left: 20px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; + float: left; + margin-left: -20px; } .controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; + padding-top: 5px; } .radio.inline, .checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; + display: inline-block; + padding-top: 5px; + margin-bottom: 0; + vertical-align: middle; } .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { - margin-left: 10px; + margin-left: 10px; } .input-mini { - width: 60px; + width: 60px; } .input-small { - width: 90px; + width: 90px; } .input-medium { - width: 150px; + width: 150px; } .input-large { - width: 210px; + width: 210px; } .input-xlarge { - width: 270px; + width: 270px; } .input-xxlarge { - width: 530px; + width: 530px; } input[class*="span"], @@ -1293,8 +1304,8 @@ textarea[class*="span"], .row-fluid select[class*="span"], .row-fluid textarea[class*="span"], .row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; + float: none; + margin-left: 0; } .input-append input[class*="span"], @@ -1307,114 +1318,114 @@ textarea[class*="span"], .row-fluid .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] { - display: inline-block; + display: inline-block; } input, textarea, .uneditable-input { - margin-left: 0; + margin-left: 0; } .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; + margin-left: 20px; } input.span12, textarea.span12, .uneditable-input.span12 { - width: 926px; + width: 926px; } input.span11, textarea.span11, .uneditable-input.span11 { - width: 846px; + width: 846px; } input.span10, textarea.span10, .uneditable-input.span10 { - width: 766px; + width: 766px; } input.span9, textarea.span9, .uneditable-input.span9 { - width: 686px; + width: 686px; } input.span8, textarea.span8, .uneditable-input.span8 { - width: 606px; + width: 606px; } input.span7, textarea.span7, .uneditable-input.span7 { - width: 526px; + width: 526px; } input.span6, textarea.span6, .uneditable-input.span6 { - width: 446px; + width: 446px; } input.span5, textarea.span5, .uneditable-input.span5 { - width: 366px; + width: 366px; } input.span4, textarea.span4, .uneditable-input.span4 { - width: 286px; + width: 286px; } input.span3, textarea.span3, .uneditable-input.span3 { - width: 206px; + width: 206px; } input.span2, textarea.span2, .uneditable-input.span2 { - width: 126px; + width: 126px; } input.span1, textarea.span1, .uneditable-input.span1 { - width: 46px; + width: 46px; } .controls-row { - *zoom: 1; + *zoom: 1; } .controls-row:before, .controls-row:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .controls-row:after { - clear: both; + clear: both; } .controls-row [class*="span"], .row-fluid .controls-row [class*="span"] { - float: left; + float: left; } .controls-row .checkbox[class*="span"], .controls-row .radio[class*="span"] { - padding-top: 5px; + padding-top: 5px; } input[disabled], @@ -1423,21 +1434,21 @@ textarea[disabled], input[readonly], select[readonly], textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; + cursor: not-allowed; + background-color: #eeeeee; } input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"][readonly], input[type="checkbox"][readonly] { - background-color: transparent; + background-color: transparent; } .control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #c09853; + color: #c09853; } .control-group.warning .checkbox, @@ -1445,38 +1456,38 @@ input[type="checkbox"][readonly] { .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #c09853; + color: #c09853; } .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + border-color: #a47e3c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; + color: #c09853; + background-color: #fcf8e3; + border-color: #c09853; } .control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { - color: #b94a48; + color: #b94a48; } .control-group.error .checkbox, @@ -1484,38 +1495,38 @@ input[type="checkbox"][readonly] { .control-group.error input, .control-group.error select, .control-group.error textarea { - color: #b94a48; + color: #b94a48; } .control-group.error input, .control-group.error select, .control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + border-color: #b94a48; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + border-color: #953b39; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; + color: #b94a48; + background-color: #f2dede; + border-color: #b94a48; } .control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { - color: #468847; + color: #468847; } .control-group.success .checkbox, @@ -1523,38 +1534,38 @@ input[type="checkbox"][readonly] { .control-group.success input, .control-group.success select, .control-group.success textarea { - color: #468847; + color: #468847; } .control-group.success input, .control-group.success select, .control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + border-color: #356635; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; + color: #468847; + background-color: #dff0d8; + border-color: #468847; } .control-group.info .control-label, .control-group.info .help-block, .control-group.info .help-inline { - color: #3a87ad; + color: #3a87ad; } .control-group.info .checkbox, @@ -1562,93 +1573,93 @@ input[type="checkbox"][readonly] { .control-group.info input, .control-group.info select, .control-group.info textarea { - color: #3a87ad; + color: #3a87ad; } .control-group.info input, .control-group.info select, .control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + border-color: #3a87ad; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.info input:focus, .control-group.info select:focus, .control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + border-color: #2d6987; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; } .control-group.info .input-prepend .add-on, .control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; + color: #3a87ad; + background-color: #d9edf7; + border-color: #3a87ad; } input:focus:invalid, textarea:focus:invalid, select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; + color: #b94a48; + border-color: #ee5f5b; } input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; + border-color: #e9322d; + -webkit-box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; + box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; + background-color: #f5f5f5; + border-top: 1px solid #e5e5e5; + *zoom: 1; } .form-actions:before, .form-actions:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .form-actions:after { - clear: both; + clear: both; } .help-block, .help-inline { - color: #595959; + color: #595959; } .help-block { - display: block; - margin-bottom: 10px; + display: block; + margin-bottom: 10px; } .help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; + display: inline-block; + *display: inline; + padding-left: 5px; + vertical-align: middle; + *zoom: 1; } .input-append, .input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; + margin-bottom: 5px; + font-size: 0; + white-space: nowrap; } .input-append input, @@ -1659,7 +1670,7 @@ select:focus:invalid:focus { .input-prepend .uneditable-input, .input-append .dropdown-menu, .input-prepend .dropdown-menu { - font-size: 14px; + font-size: 14px; } .input-append input, @@ -1668,13 +1679,13 @@ select:focus:invalid:focus { .input-prepend select, .input-append .uneditable-input, .input-prepend .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + position: relative; + margin-bottom: 0; + *margin-left: 0; + vertical-align: top; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append input:focus, @@ -1683,23 +1694,23 @@ select:focus:invalid:focus { .input-prepend select:focus, .input-append .uneditable-input:focus, .input-prepend .uneditable-input:focus { - z-index: 2; + z-index: 2; } .input-append .add-on, .input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; - font-size: 14px; - font-weight: normal; - line-height: 20px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; + display: inline-block; + width: auto; + height: 20px; + min-width: 16px; + padding: 4px 5px; + font-size: 14px; + font-weight: normal; + line-height: 20px; + text-align: center; + text-shadow: 0 1px 0 #ffffff; + background-color: #eeeeee; + border: 1px solid #ccc; } .input-append .add-on, @@ -1708,140 +1719,140 @@ select:focus:invalid:focus { .input-prepend .btn, .input-append .btn-group > .dropdown-toggle, .input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + vertical-align: top; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .input-append .active, .input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; + background-color: #a9dba9; + border-color: #46a546; } .input-prepend .add-on, .input-prepend .btn { - margin-right: -1px; + margin-right: -1px; } .input-prepend .add-on:first-child, .input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-append input, .input-append select, .input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-append input + .btn-group .btn:last-child, .input-append select + .btn-group .btn:last-child, .input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append .add-on, .input-append .btn, .input-append .btn-group { - margin-left: -1px; + margin-left: -1px; } .input-append .add-on:last-child, .input-append .btn:last-child, .input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append input, .input-prepend.input-append select, .input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .input-prepend.input-append input + .btn-group .btn, .input-prepend.input-append select + .btn-group .btn, .input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + margin-right: -1px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-prepend.input-append .add-on:last-child, .input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + margin-left: -1px; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append .btn-group:first-child { - margin-left: 0; + margin-left: 0; } input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ + padding-right: 14px; + padding-right: 4px \9; + padding-left: 14px; + padding-left: 4px \9; + /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + margin-bottom: 0; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } /* Allow for input prepend/append in search forms */ .form-search .input-append .search-query, .form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; } .form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; } .form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, @@ -1865,96 +1876,96 @@ input.search-query { .form-search .input-append, .form-inline .input-append, .form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - vertical-align: middle; - *zoom: 1; + display: inline-block; + *display: inline; + margin-bottom: 0; + vertical-align: middle; + *zoom: 1; } .form-search .hide, .form-inline .hide, .form-horizontal .hide { - display: none; + display: none; } .form-search label, .form-inline label, .form-search .btn-group, .form-inline .btn-group { - display: inline-block; + display: inline-block; } .form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend { - margin-bottom: 0; + margin-bottom: 0; } .form-search .radio, .form-search .checkbox, .form-inline .radio, .form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; + padding-left: 0; + margin-bottom: 0; + vertical-align: middle; } .form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"], .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; + float: left; + margin-right: 3px; + margin-left: 0; } .control-group { - margin-bottom: 10px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; + margin-top: 20px; + -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; + margin-bottom: 20px; + *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .form-horizontal .control-group:after { - clear: both; + clear: both; } .form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; + float: left; + width: 160px; + padding-top: 5px; + text-align: right; } .form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; + *display: inline-block; + *padding-left: 20px; + margin-left: 180px; + *margin-left: 0; } .form-horizontal .controls:first-child { - *padding-left: 180px; + *padding-left: 180px; } .form-horizontal .help-block { - margin-bottom: 0; + margin-bottom: 0; } .form-horizontal input + .help-block, @@ -1963,44 +1974,44 @@ legend + .control-group { .form-horizontal .uneditable-input + .help-block, .form-horizontal .input-prepend + .help-block, .form-horizontal .input-append + .help-block { - margin-top: 10px; + margin-top: 10px; } .form-horizontal .form-actions { - padding-left: 180px; + padding-left: 180px; } table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; + max-width: 100%; + background-color: transparent; + border-collapse: collapse; + border-spacing: 0; } .table, table { - width: 100%; - margin-bottom: 20px; + width: 100%; + margin-bottom: 20px; } .table th, table th, .table td, table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; + padding: 8px; + line-height: 20px; + text-align: left; + vertical-align: top; + border-top: 1px solid #dddddd; } .table th, table th { - font-weight: bold; + font-weight: bold; } .table thead th, table thead th { - vertical-align: bottom; + vertical-align: bottom; } .table caption + thead tr:first-child th, @@ -2015,37 +2026,37 @@ table colgroup + thead tr:first-child th, table colgroup + thead tr:first-child td, table thead:first-child tr:first-child th, table thead:first-child tr:first-child td { - border-top: 0; + border-top: 0; } .table tbody + tbody, table tbody + tbody { - border-top: 2px solid #dddddd; + border-top: 2px solid #dddddd; } .table .table, table table { - background-color: #ffffff; + background-color: #ffffff; } .table-condensed th, .table-condensed td { - padding: 4px 5px; + padding: 4px 5px; } .table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border: 1px solid #dddddd; + border-collapse: separate; + *border-collapse: collapse; + border-left: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .table-bordered th, .table-bordered td { - border-left: 1px solid #dddddd; + border-left: 1px solid #dddddd; } .table-bordered caption + thead tr:first-child th, @@ -2057,222 +2068,222 @@ table table { .table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { - border-top: 0; + border-top: 0; } .table-bordered thead:first-child tr:first-child > th:first-child, .table-bordered tbody:first-child tr:first-child > td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; } .table-bordered thead:first-child tr:first-child > th:last-child, .table-bordered tbody:first-child tr:first-child > td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; } .table-bordered thead:last-child tr:last-child > th:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child, .table-bordered tfoot:last-child tr:last-child > td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; } .table-bordered thead:last-child tr:last-child > th:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child, .table-bordered tfoot:last-child tr:last-child > td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; } .table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; } .table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; } .table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; } .table-bordered caption + thead tr:first-child th:last-child, .table-bordered caption + tbody tr:first-child td:last-child, .table-bordered colgroup + thead tr:first-child th:last-child, .table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; } .table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th, table tbody > tr:nth-child(odd) > td, table tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; + background-color: #f9f9f9; } .table-hover tbody tr:hover td, .table-hover tbody tr:hover th { - background-color: #f5f5f5; + background-color: #f5f5f5; } table td[class*="span"], table th[class*="span"], .row-fluid table td[class*="span"], .row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; + display: table-cell; + float: none; + margin-left: 0; } .table td.span1, .table th.span1 { - float: none; - width: 44px; - margin-left: 0; + float: none; + width: 44px; + margin-left: 0; } .table td.span2, .table th.span2 { - float: none; - width: 124px; - margin-left: 0; + float: none; + width: 124px; + margin-left: 0; } .table td.span3, .table th.span3 { - float: none; - width: 204px; - margin-left: 0; + float: none; + width: 204px; + margin-left: 0; } .table td.span4, .table th.span4 { - float: none; - width: 284px; - margin-left: 0; + float: none; + width: 284px; + margin-left: 0; } .table td.span5, .table th.span5 { - float: none; - width: 364px; - margin-left: 0; + float: none; + width: 364px; + margin-left: 0; } .table td.span6, .table th.span6 { - float: none; - width: 444px; - margin-left: 0; + float: none; + width: 444px; + margin-left: 0; } .table td.span7, .table th.span7 { - float: none; - width: 524px; - margin-left: 0; + float: none; + width: 524px; + margin-left: 0; } .table td.span8, .table th.span8 { - float: none; - width: 604px; - margin-left: 0; + float: none; + width: 604px; + margin-left: 0; } .table td.span9, .table th.span9 { - float: none; - width: 684px; - margin-left: 0; + float: none; + width: 684px; + margin-left: 0; } .table td.span10, .table th.span10 { - float: none; - width: 764px; - margin-left: 0; + float: none; + width: 764px; + margin-left: 0; } .table td.span11, .table th.span11 { - float: none; - width: 844px; - margin-left: 0; + float: none; + width: 844px; + margin-left: 0; } .table td.span12, .table th.span12 { - float: none; - width: 924px; - margin-left: 0; + float: none; + width: 924px; + margin-left: 0; } .table tbody tr.success td, table tbody tr.success td { - background-color: #dff0d8; + background-color: #dff0d8; } .table tbody tr.error td, table tbody tr.error td { - background-color: #f2dede; + background-color: #f2dede; } .table tbody tr.warning td, table tbody tr.warning td { - background-color: #fcf8e3; + background-color: #fcf8e3; } .table tbody tr.info td, table tbody tr.info td { - background-color: #d9edf7; + background-color: #d9edf7; } .table-hover tbody tr.success:hover td { - background-color: #d0e9c6; + background-color: #d0e9c6; } .table-hover tbody tr.error:hover td { - background-color: #ebcccc; + background-color: #ebcccc; } .table-hover tbody tr.warning:hover td { - background-color: #faf2cc; + background-color: #faf2cc; } .table-hover tbody tr.info:hover td { - background-color: #c4e3f3; + background-color: #c4e3f3; } [class^="icon-"], [class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; + display: inline-block; + width: 14px; + height: 14px; + margin-top: 1px; + *margin-right: .3em; + line-height: 14px; + vertical-align: text-top; + background-image: url("../img/glyphicons-halflings.png"); + background-position: 14px 14px; + background-repeat: no-repeat; } /* White icons with optional class, or on hover/active states of certain elements */ @@ -2290,915 +2301,915 @@ table tbody tr.info td { .dropdown-menu > .active > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); + background-image: url("../img/glyphicons-halflings-white.png"); } .icon-glass { - background-position: 0 0; + background-position: 0 0; } .icon-music { - background-position: -24px 0; + background-position: -24px 0; } .icon-search { - background-position: -48px 0; + background-position: -48px 0; } .icon-envelope { - background-position: -72px 0; + background-position: -72px 0; } .icon-heart { - background-position: -96px 0; + background-position: -96px 0; } .icon-star { - background-position: -120px 0; + background-position: -120px 0; } .icon-star-empty { - background-position: -144px 0; + background-position: -144px 0; } .icon-user { - background-position: -168px 0; + background-position: -168px 0; } .icon-film { - background-position: -192px 0; + background-position: -192px 0; } .icon-th-large { - background-position: -216px 0; + background-position: -216px 0; } .icon-th { - background-position: -240px 0; + background-position: -240px 0; } .icon-th-list { - background-position: -264px 0; + background-position: -264px 0; } .icon-ok { - background-position: -288px 0; + background-position: -288px 0; } .icon-remove { - background-position: -312px 0; + background-position: -312px 0; } .icon-zoom-in { - background-position: -336px 0; + background-position: -336px 0; } .icon-zoom-out { - background-position: -360px 0; + background-position: -360px 0; } .icon-off { - background-position: -384px 0; + background-position: -384px 0; } .icon-signal { - background-position: -408px 0; + background-position: -408px 0; } .icon-cog { - background-position: -432px 0; + background-position: -432px 0; } .icon-trash { - background-position: -456px 0; + background-position: -456px 0; } .icon-home { - background-position: 0 -24px; + background-position: 0 -24px; } .icon-file { - background-position: -24px -24px; + background-position: -24px -24px; } .icon-time { - background-position: -48px -24px; + background-position: -48px -24px; } .icon-road { - background-position: -72px -24px; + background-position: -72px -24px; } .icon-download-alt { - background-position: -96px -24px; + background-position: -96px -24px; } .icon-download { - background-position: -120px -24px; + background-position: -120px -24px; } .icon-upload { - background-position: -144px -24px; + background-position: -144px -24px; } .icon-inbox { - background-position: -168px -24px; + background-position: -168px -24px; } .icon-play-circle { - background-position: -192px -24px; + background-position: -192px -24px; } .icon-repeat { - background-position: -216px -24px; + background-position: -216px -24px; } .icon-refresh { - background-position: -240px -24px; + background-position: -240px -24px; } .icon-list-alt { - background-position: -264px -24px; + background-position: -264px -24px; } .icon-lock { - background-position: -287px -24px; + background-position: -287px -24px; } .icon-flag { - background-position: -312px -24px; + background-position: -312px -24px; } .icon-headphones { - background-position: -336px -24px; + background-position: -336px -24px; } .icon-volume-off { - background-position: -360px -24px; + background-position: -360px -24px; } .icon-volume-down { - background-position: -384px -24px; + background-position: -384px -24px; } .icon-volume-up { - background-position: -408px -24px; + background-position: -408px -24px; } .icon-qrcode { - background-position: -432px -24px; + background-position: -432px -24px; } .icon-barcode { - background-position: -456px -24px; + background-position: -456px -24px; } .icon-tag { - background-position: 0 -48px; + background-position: 0 -48px; } .icon-tags { - background-position: -25px -48px; + background-position: -25px -48px; } .icon-book { - background-position: -48px -48px; + background-position: -48px -48px; } .icon-bookmark { - background-position: -72px -48px; + background-position: -72px -48px; } .icon-print { - background-position: -96px -48px; + background-position: -96px -48px; } .icon-camera { - background-position: -120px -48px; + background-position: -120px -48px; } .icon-font { - background-position: -144px -48px; + background-position: -144px -48px; } .icon-bold { - background-position: -167px -48px; + background-position: -167px -48px; } .icon-italic { - background-position: -192px -48px; + background-position: -192px -48px; } .icon-text-height { - background-position: -216px -48px; + background-position: -216px -48px; } .icon-text-width { - background-position: -240px -48px; + background-position: -240px -48px; } .icon-align-left { - background-position: -264px -48px; + background-position: -264px -48px; } .icon-align-center { - background-position: -288px -48px; + background-position: -288px -48px; } .icon-align-right { - background-position: -312px -48px; + background-position: -312px -48px; } .icon-align-justify { - background-position: -336px -48px; + background-position: -336px -48px; } .icon-list { - background-position: -360px -48px; + background-position: -360px -48px; } .icon-indent-left { - background-position: -384px -48px; + background-position: -384px -48px; } .icon-indent-right { - background-position: -408px -48px; + background-position: -408px -48px; } .icon-facetime-video { - background-position: -432px -48px; + background-position: -432px -48px; } .icon-picture { - background-position: -456px -48px; + background-position: -456px -48px; } .icon-pencil { - background-position: 0 -72px; + background-position: 0 -72px; } .icon-map-marker { - background-position: -24px -72px; + background-position: -24px -72px; } .icon-adjust { - background-position: -48px -72px; + background-position: -48px -72px; } .icon-tint { - background-position: -72px -72px; + background-position: -72px -72px; } .icon-edit { - background-position: -96px -72px; + background-position: -96px -72px; } .icon-share { - background-position: -120px -72px; + background-position: -120px -72px; } .icon-check { - background-position: -144px -72px; + background-position: -144px -72px; } .icon-move { - background-position: -168px -72px; + background-position: -168px -72px; } .icon-step-backward { - background-position: -192px -72px; + background-position: -192px -72px; } .icon-fast-backward { - background-position: -216px -72px; + background-position: -216px -72px; } .icon-backward { - background-position: -240px -72px; + background-position: -240px -72px; } .icon-play { - background-position: -264px -72px; + background-position: -264px -72px; } .icon-pause { - background-position: -288px -72px; + background-position: -288px -72px; } .icon-stop { - background-position: -312px -72px; + background-position: -312px -72px; } .icon-forward { - background-position: -336px -72px; + background-position: -336px -72px; } .icon-fast-forward { - background-position: -360px -72px; + background-position: -360px -72px; } .icon-step-forward { - background-position: -384px -72px; + background-position: -384px -72px; } .icon-eject { - background-position: -408px -72px; + background-position: -408px -72px; } .icon-chevron-left { - background-position: -432px -72px; + background-position: -432px -72px; } .icon-chevron-right { - background-position: -456px -72px; + background-position: -456px -72px; } .icon-plus-sign { - background-position: 0 -96px; + background-position: 0 -96px; } .icon-minus-sign { - background-position: -24px -96px; + background-position: -24px -96px; } .icon-remove-sign { - background-position: -48px -96px; + background-position: -48px -96px; } .icon-ok-sign { - background-position: -72px -96px; + background-position: -72px -96px; } .icon-question-sign { - background-position: -96px -96px; + background-position: -96px -96px; } .icon-info-sign { - background-position: -120px -96px; + background-position: -120px -96px; } .icon-screenshot { - background-position: -144px -96px; + background-position: -144px -96px; } .icon-remove-circle { - background-position: -168px -96px; + background-position: -168px -96px; } .icon-ok-circle { - background-position: -192px -96px; + background-position: -192px -96px; } .icon-ban-circle { - background-position: -216px -96px; + background-position: -216px -96px; } .icon-arrow-left { - background-position: -240px -96px; + background-position: -240px -96px; } .icon-arrow-right { - background-position: -264px -96px; + background-position: -264px -96px; } .icon-arrow-up { - background-position: -289px -96px; + background-position: -289px -96px; } .icon-arrow-down { - background-position: -312px -96px; + background-position: -312px -96px; } .icon-share-alt { - background-position: -336px -96px; + background-position: -336px -96px; } .icon-resize-full { - background-position: -360px -96px; + background-position: -360px -96px; } .icon-resize-small { - background-position: -384px -96px; + background-position: -384px -96px; } .icon-plus { - background-position: -408px -96px; + background-position: -408px -96px; } .icon-minus { - background-position: -433px -96px; + background-position: -433px -96px; } .icon-asterisk { - background-position: -456px -96px; + background-position: -456px -96px; } .icon-exclamation-sign { - background-position: 0 -120px; + background-position: 0 -120px; } .icon-gift { - background-position: -24px -120px; + background-position: -24px -120px; } .icon-leaf { - background-position: -48px -120px; + background-position: -48px -120px; } .icon-fire { - background-position: -72px -120px; + background-position: -72px -120px; } .icon-eye-open { - background-position: -96px -120px; + background-position: -96px -120px; } .icon-eye-close { - background-position: -120px -120px; + background-position: -120px -120px; } .icon-warning-sign { - background-position: -144px -120px; + background-position: -144px -120px; } .icon-plane { - background-position: -168px -120px; + background-position: -168px -120px; } .icon-calendar { - background-position: -192px -120px; + background-position: -192px -120px; } .icon-random { - width: 16px; - background-position: -216px -120px; + width: 16px; + background-position: -216px -120px; } .icon-comment { - background-position: -240px -120px; + background-position: -240px -120px; } .icon-magnet { - background-position: -264px -120px; + background-position: -264px -120px; } .icon-chevron-up { - background-position: -288px -120px; + background-position: -288px -120px; } .icon-chevron-down { - background-position: -313px -119px; + background-position: -313px -119px; } .icon-retweet { - background-position: -336px -120px; + background-position: -336px -120px; } .icon-shopping-cart { - background-position: -360px -120px; + background-position: -360px -120px; } .icon-folder-close { - background-position: -384px -120px; + background-position: -384px -120px; } .icon-folder-open { - width: 16px; - background-position: -408px -120px; + width: 16px; + background-position: -408px -120px; } .icon-resize-vertical { - background-position: -432px -119px; + background-position: -432px -119px; } .icon-resize-horizontal { - background-position: -456px -118px; + background-position: -456px -118px; } .icon-hdd { - background-position: 0 -144px; + background-position: 0 -144px; } .icon-bullhorn { - background-position: -24px -144px; + background-position: -24px -144px; } .icon-bell { - background-position: -48px -144px; + background-position: -48px -144px; } .icon-certificate { - background-position: -72px -144px; + background-position: -72px -144px; } .icon-thumbs-up { - background-position: -96px -144px; + background-position: -96px -144px; } .icon-thumbs-down { - background-position: -120px -144px; + background-position: -120px -144px; } .icon-hand-right { - background-position: -144px -144px; + background-position: -144px -144px; } .icon-hand-left { - background-position: -168px -144px; + background-position: -168px -144px; } .icon-hand-up { - background-position: -192px -144px; + background-position: -192px -144px; } .icon-hand-down { - background-position: -216px -144px; + background-position: -216px -144px; } .icon-circle-arrow-right { - background-position: -240px -144px; + background-position: -240px -144px; } .icon-circle-arrow-left { - background-position: -264px -144px; + background-position: -264px -144px; } .icon-circle-arrow-up { - background-position: -288px -144px; + background-position: -288px -144px; } .icon-circle-arrow-down { - background-position: -312px -144px; + background-position: -312px -144px; } .icon-globe { - background-position: -336px -144px; + background-position: -336px -144px; } .icon-wrench { - background-position: -360px -144px; + background-position: -360px -144px; } .icon-tasks { - background-position: -384px -144px; + background-position: -384px -144px; } .icon-filter { - background-position: -408px -144px; + background-position: -408px -144px; } .icon-briefcase { - background-position: -432px -144px; + background-position: -432px -144px; } .icon-fullscreen { - background-position: -456px -144px; + background-position: -456px -144px; } .dropup, .dropdown { - position: relative; + position: relative; } .dropdown-toggle { - *margin-bottom: -3px; + *margin-bottom: -3px; } .dropdown-toggle:active, .open .dropdown-toggle { - outline: 0; + outline: 0; } .caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; + display: inline-block; + width: 0; + height: 0; + vertical-align: top; + border-top: 4px solid #000000; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + content: ""; } .dropdown .caret { - margin-top: 8px; - margin-left: 2px; + margin-top: 8px; + margin-left: 2px; } .dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + background-color: #ffffff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + *border-right-width: 2px; + *border-bottom-width: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .dropdown-menu.pull-right { - right: 0; - left: auto; + right: 0; + left: auto; } .dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; + *width: 100%; + height: 1px; + margin: 9px 1px; + *margin: -5px 0 5px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; } .dropdown-menu li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333333; - white-space: nowrap; + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 20px; + color: #333333; + white-space: nowrap; } .dropdown-menu li > a:hover, .dropdown-menu li > a:focus, .dropdown-submenu:hover > a { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); + color: #ffffff; + text-decoration: none; + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); + color: #ffffff; + text-decoration: none; + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + outline: 0; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } .dropdown-menu .disabled > a, .dropdown-menu .disabled > a:hover { - color: #999999; + color: #999999; } .dropdown-menu .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + text-decoration: none; + cursor: default; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .open { - *z-index: 1000; + *z-index: 1000; } .open > .dropdown-menu { - display: block; + display: block; } .pull-right > .dropdown-menu { - right: 0; - left: auto; + right: 0; + left: auto; } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: ""; + border-top: 0; + border-bottom: 4px solid #000000; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; + top: auto; + bottom: 100%; + margin-bottom: 1px; } .dropdown-submenu { - position: relative; + position: relative; } .dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown-submenu:hover > .dropdown-menu { - display: block; + display: block; } .dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; } .dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; + display: block; + float: right; + width: 0; + height: 0; + margin-top: 5px; + margin-right: -10px; + border-color: transparent; + border-left-color: #cccccc; + border-style: solid; + border-width: 5px 0 5px 5px; + content: " "; } .dropdown-submenu:hover > a:after { - border-left-color: #ffffff; + border-left-color: #ffffff; } .dropdown-submenu.pull-left { - float: none; + float: none; } .dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; } .dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; + padding-right: 20px; + padding-left: 20px; } .typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + z-index: 1051; + margin-top: 2px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } .well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); } .well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + padding: 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + padding: 9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; + opacity: 0; + -webkit-transition: opacity 0.15s linear; + -moz-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; } .fade.in { - opacity: 1; + opacity: 1; } .collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; + position: relative; + height: 0; + overflow: hidden; + -webkit-transition: height 0.35s ease; + -moz-transition: height 0.35s ease; + -o-transition: height 0.35s ease; + transition: height 0.35s ease; } .collapse.in { - height: auto; + height: auto; } .close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); + float: right; + font-size: 20px; + font-weight: bold; + line-height: 20px; + color: #000000; + text-shadow: 0 1px 0 #ffffff; + opacity: 0.2; + filter: alpha(opacity=20); } .close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); + color: #000000; + text-decoration: none; + cursor: pointer; + opacity: 0.4; + filter: alpha(opacity=40); } button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; } .btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + display: inline-block; + *display: inline; + padding: 4px 12px; + margin-bottom: 0; + *margin-left: .3em; + font-size: 14px; + line-height: 20px; + color: #333333; + text-align: center; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; + cursor: pointer; + background-color: #f5f5f5; + *background-color: #e6e6e6; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + border: 1px solid #bbbbbb; + *border: 0; + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-bottom-color: #a2a2a2; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + *zoom: 1; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -3206,113 +3217,113 @@ button.close { .btn.active, .btn.disabled, .btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; + color: #333333; + background-color: #e6e6e6; + *background-color: #d9d9d9; } .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #cccccc \9; } .btn:first-child { - *margin-left: 0; + *margin-left: 0; } .btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; } .btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } .btn.active, .btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + background-image: none; + outline: 0; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn.disabled, .btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + cursor: default; + background-image: none; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .btn-large [class^="icon-"], .btn-large [class*=" icon-"] { - margin-top: 4px; + margin-top: 4px; } .btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .btn-small [class^="icon-"], .btn-small [class*=" icon-"] { - margin-top: 0; + margin-top: 0; } .btn-mini [class^="icon-"], .btn-mini [class*=" icon-"] { - margin-top: -1px; + margin-top: -1px; } .btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + display: block; + width: 100%; + padding-right: 0; + padding-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .btn-block + .btn-block { - margin-top: 5px; + margin-top: 5px; } input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { - width: 100%; + width: 100%; } .btn-primary.active, @@ -3321,29 +3332,29 @@ input[type="button"].btn-block { .btn-success.active, .btn-info.active, .btn-inverse.active { - color: rgba(255, 255, 255, 0.75); + color: rgba(255, 255, 255, 0.75); } .btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); } .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #006dcc; + *background-color: #0044cc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-primary:hover, @@ -3351,31 +3362,31 @@ input[type="button"].btn-block { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; + color: #ffffff; + background-color: #0044cc; + *background-color: #003bb3; } .btn-primary:active, .btn-primary.active { - background-color: #003399 \9; + background-color: #003399 \9; } .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #faa732; + *background-color: #f89406; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); + background-repeat: repeat-x; + border-color: #f89406 #f89406 #ad6704; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-warning:hover, @@ -3383,31 +3394,31 @@ input[type="button"].btn-block { .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; + color: #ffffff; + background-color: #f89406; + *background-color: #df8505; } .btn-warning:active, .btn-warning.active { - background-color: #c67605 \9; + background-color: #c67605 \9; } .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #da4f49; + *background-color: #bd362f; + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); + background-repeat: repeat-x; + border-color: #bd362f #bd362f #802420; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-danger:hover, @@ -3415,31 +3426,31 @@ input[type="button"].btn-block { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; + color: #ffffff; + background-color: #bd362f; + *background-color: #a9302a; } .btn-danger:active, .btn-danger.active { - background-color: #942a25 \9; + background-color: #942a25 \9; } .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #5bb75b; + *background-color: #51a351; + background-image: -moz-linear-gradient(top, #62c462, #51a351); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); + background-image: -webkit-linear-gradient(top, #62c462, #51a351); + background-image: -o-linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); + background-repeat: repeat-x; + border-color: #51a351 #51a351 #387038; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-success:hover, @@ -3447,31 +3458,31 @@ input[type="button"].btn-block { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; + color: #ffffff; + background-color: #51a351; + *background-color: #499249; } .btn-success:active, .btn-success.active { - background-color: #408140 \9; + background-color: #408140 \9; } .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #49afcd; + *background-color: #2f96b4; + background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); + background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); + background-repeat: repeat-x; + border-color: #2f96b4 #2f96b4 #1f6377; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-info:hover, @@ -3479,31 +3490,31 @@ input[type="button"].btn-block { .btn-info.active, .btn-info.disabled, .btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; + color: #ffffff; + background-color: #2f96b4; + *background-color: #2a85a0; } .btn-info:active, .btn-info.active { - background-color: #24748c \9; + background-color: #24748c \9; } .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + *background-color: #222222; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(to bottom, #444444, #222222); + background-repeat: repeat-x; + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-inverse:hover, @@ -3511,271 +3522,271 @@ input[type="button"].btn-block { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #222222; + *background-color: #151515; } .btn-inverse:active, .btn-inverse.active { - background-color: #080808 \9; + background-color: #080808 \9; } button.btn, input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; + padding: 0; + border: 0; } button.btn.btn-large, input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; + *padding-top: 7px; + *padding-bottom: 7px; } button.btn.btn-small, input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn.btn-mini, input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; + *padding-top: 1px; + *padding-bottom: 1px; } .btn-link, .btn-link:active, .btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + color: #0088cc; + cursor: pointer; + border-color: transparent; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .btn-link:hover { - color: #005580; - text-decoration: underline; - background-color: transparent; + color: #005580; + text-decoration: underline; + background-color: transparent; } .btn-link[disabled]:hover { - color: #333333; - text-decoration: none; + color: #333333; + text-decoration: none; } .btn-group { - position: relative; - display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; - vertical-align: middle; - *zoom: 1; + position: relative; + display: inline-block; + *display: inline; + *margin-left: .3em; + font-size: 0; + white-space: nowrap; + vertical-align: middle; + *zoom: 1; } .btn-group:first-child { - *margin-left: 0; + *margin-left: 0; } .btn-group + .btn-group { - margin-left: 5px; + margin-left: 5px; } .btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; + margin-top: 10px; + margin-bottom: 10px; + font-size: 0; } .btn-toolbar > .btn + .btn, .btn-toolbar > .btn-group + .btn, .btn-toolbar > .btn + .btn-group { - margin-left: 5px; + margin-left: 5px; } .btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + position: relative; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .btn-group > .btn + .btn { - margin-left: -1px; + margin-left: -1px; } .btn-group > .btn, .btn-group > .dropdown-menu, .btn-group > .popover { - font-size: 14px; + font-size: 14px; } .btn-group > .btn-mini { - font-size: 10.5px; + font-size: 10.5px; } .btn-group > .btn-small { - font-size: 11.9px; + font-size: 11.9px; } .btn-group > .btn-large { - font-size: 17.5px; + font-size: 17.5px; } .btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; + margin-left: 0; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-topleft: 4px; } .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; } .btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; + margin-left: 0; + -webkit-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -webkit-border-top-left-radius: 6px; + border-top-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + -moz-border-radius-topleft: 6px; } .btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; + -webkit-border-top-right-radius: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + -moz-border-radius-topright: 6px; + -moz-border-radius-bottomright: 6px; } .btn-group > .btn:hover, .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active { - z-index: 2; + z-index: 2; } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { - outline: 0; + outline: 0; } .btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; - padding-right: 8px; - *padding-bottom: 5px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + *padding-top: 5px; + padding-right: 8px; + *padding-bottom: 5px; + padding-left: 8px; + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; + *padding-top: 2px; + padding-right: 5px; + *padding-bottom: 2px; + padding-left: 5px; } .btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 4px; } .btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; - padding-right: 12px; - *padding-bottom: 7px; - padding-left: 12px; + *padding-top: 7px; + padding-right: 12px; + *padding-bottom: 7px; + padding-left: 12px; } .btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + background-image: none; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; + background-color: #e6e6e6; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; + background-color: #0044cc; } .btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; + background-color: #f89406; } .btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; + background-color: #bd362f; } .btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; + background-color: #51a351; } .btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; + background-color: #2f96b4; } .btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; + background-color: #222222; } .btn .caret { - margin-top: 8px; - margin-left: 0; + margin-top: 8px; + margin-left: 0; } .btn-mini .caret, .btn-small .caret, .btn-large .caret { - margin-top: 6px; + margin-top: 6px; } .btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; + border-top-width: 5px; + border-right-width: 5px; + border-left-width: 5px; } .dropup .btn-large .caret { - border-bottom-width: 5px; + border-bottom-width: 5px; } .btn-primary .caret, @@ -3784,824 +3795,824 @@ input[type="submit"].btn.btn-mini { .btn-info .caret, .btn-success .caret, .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; + border-top-color: #ffffff; + border-bottom-color: #ffffff; } .btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ - *zoom: 1; + *zoom: 1; } .btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .btn-group-vertical > .btn + .btn { - margin-top: -1px; - margin-left: 0; + margin-top: -1px; + margin-left: 0; } .btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } .btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; } .btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; } .btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + padding: 8px 35px 8px 14px; + margin-bottom: 20px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #fcf8e3; + border: 1px solid #fbeed5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .alert, .alert h4 { - color: #c09853; + color: #c09853; } .alert h4 { - margin: 0; + margin: 0; } .alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 20px; + position: relative; + top: -2px; + right: -21px; + line-height: 20px; } .alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; + color: #468847; + background-color: #dff0d8; + border-color: #d6e9c6; } .alert-success h4 { - color: #468847; + color: #468847; } .alert-danger, .alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; + color: #b94a48; + background-color: #f2dede; + border-color: #eed3d7; } .alert-danger h4, .alert-error h4 { - color: #b94a48; + color: #b94a48; } .alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; + color: #3a87ad; + background-color: #d9edf7; + border-color: #bce8f1; } .alert-info h4 { - color: #3a87ad; + color: #3a87ad; } .alert-block { - padding-top: 14px; - padding-bottom: 14px; + padding-top: 14px; + padding-bottom: 14px; } .alert-block > p, .alert-block > ul { - margin-bottom: 0; + margin-bottom: 0; } .alert-block p + p { - margin-top: 5px; + margin-top: 5px; } .nav { - margin-bottom: 20px; - margin-left: 0; - list-style: none; + margin-bottom: 20px; + margin-left: 0; + list-style: none; } .nav > li > a { - display: block; + display: block; } .nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; + text-decoration: none; + background-color: #eeeeee; } .nav > li > a > img { - max-width: none; + max-width: none; } .nav > .pull-right { - float: right; + float: right; } .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; + display: block; + padding: 3px 15px; + font-size: 11px; + font-weight: bold; + line-height: 20px; + color: #999999; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-transform: uppercase; } .nav li + .nav-header { - margin-top: 9px; + margin-top: 9px; } .nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; + padding-right: 15px; + padding-left: 15px; + margin-bottom: 0; } .nav-list > li > a, .nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + margin-right: -15px; + margin-left: -15px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .nav-list > li > a { - padding: 3px 15px; + padding: 3px 15px; } .nav-list > .active > a, .nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); + background-color: #0088cc; } .nav-list [class^="icon-"], .nav-list [class*=" icon-"] { - margin-right: 2px; + margin-right: 2px; } .nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; + *width: 100%; + height: 1px; + margin: 9px 1px; + *margin: -5px 0 5px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; } .nav-tabs, .nav-pills { - *zoom: 1; + *zoom: 1; } .nav-tabs:before, .nav-pills:before, .nav-tabs:after, .nav-pills:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .nav-tabs:after, .nav-pills:after { - clear: both; + clear: both; } .nav-tabs > li, .nav-pills > li { - float: left; + float: left; } .nav-tabs > li > a, .nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; + padding-right: 12px; + padding-left: 12px; + margin-right: 2px; + line-height: 14px; } .nav-tabs { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #ddd; } .nav-tabs > li { - margin-bottom: -1px; + margin-bottom: -1px; } .nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + padding-top: 8px; + padding-bottom: 8px; + line-height: 20px; + border: 1px solid transparent; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; + color: #555555; + cursor: default; + background-color: #ffffff; + border: 1px solid #ddd; + border-bottom-color: transparent; } .nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + padding-top: 8px; + padding-bottom: 8px; + margin-top: 2px; + margin-bottom: 2px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } .nav-pills > .active > a, .nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; + color: #ffffff; + background-color: #0088cc; } .nav-stacked > li { - float: none; + float: none; } .nav-stacked > li > a { - margin-right: 0; + margin-right: 0; } .nav-tabs.nav-stacked { - border-bottom: 0; + border-bottom: 0; } .nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + border: 1px solid #ddd; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; } .nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; + z-index: 2; + border-color: #ddd; } .nav-pills.nav-stacked > li > a { - margin-bottom: 3px; + margin-bottom: 3px; } .nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; + margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; + margin-top: 6px; + border-top-color: #0088cc; + border-bottom-color: #0088cc; } .nav .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; + border-top-color: #005580; + border-bottom-color: #005580; } /* move down carets for tabs */ .nav-tabs .dropdown-toggle .caret { - margin-top: 8px; + margin-top: 8px; } .nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; + border-top-color: #fff; + border-bottom-color: #fff; } .nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; + border-top-color: #555555; + border-bottom-color: #555555; } .nav > .dropdown.active > a:hover { - cursor: pointer; + cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; + color: #ffffff; + background-color: #999999; + border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, .nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); + border-top-color: #ffffff; + border-bottom-color: #ffffff; + opacity: 1; + filter: alpha(opacity=100); } .tabs-stacked .open > a:hover { - border-color: #999999; + border-color: #999999; } .tabbable { - *zoom: 1; + *zoom: 1; } .tabbable:before, .tabbable:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .tabbable:after { - clear: both; + clear: both; } .tab-content { - overflow: auto; + overflow: auto; } .tabs-below > .nav-tabs, .tabs-right > .nav-tabs, .tabs-left > .nav-tabs { - border-bottom: 0; + border-bottom: 0; } .tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; + display: none; } .tab-content > .active, .pill-content > .active { - display: block; + display: block; } .tabs-below > .nav-tabs { - border-top: 1px solid #ddd; + border-top: 1px solid #ddd; } .tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; + margin-top: -1px; + margin-bottom: 0; } .tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; } .tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; + border-top-color: #ddd; + border-bottom-color: transparent; } .tabs-below > .nav-tabs > .active > a, .tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; + border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, .tabs-right > .nav-tabs > li { - float: none; + float: none; } .tabs-left > .nav-tabs > li > a, .tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; + min-width: 74px; + margin-right: 0; + margin-bottom: 3px; } .tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; + float: left; + margin-right: 19px; + border-right: 1px solid #ddd; } .tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + margin-right: -1px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; + border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; + border-color: #ddd transparent #ddd #ddd; + *border-right-color: #ffffff; } .tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; + float: right; + margin-left: 19px; + border-left: 1px solid #ddd; } .tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + margin-left: -1px; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; + border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, .tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; + border-color: #ddd #ddd #ddd transparent; + *border-left-color: #ffffff; } .nav > .disabled > a { - color: #999999; + color: #999999; } .nav > .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; + text-decoration: none; + cursor: default; + background-color: transparent; } .navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; + *position: relative; + *z-index: 2; + margin-bottom: 20px; + overflow: visible; } .navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + min-height: 40px; + padding-right: 20px; + padding-left: 20px; + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); + background-repeat: repeat-x; + border: 1px solid #d4d4d4; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + *zoom: 1; + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); } .navbar-inner:before, .navbar-inner:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .navbar-inner:after { - clear: both; + clear: both; } .navbar .container { - width: auto; + width: auto; } .nav-collapse.collapse { - height: auto; - overflow: visible; + height: auto; + overflow: visible; } .navbar .brand { - display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; + display: block; + float: left; + padding: 10px 20px 10px; + margin-left: -20px; + font-size: 20px; + font-weight: 200; + color: #777777; + text-shadow: 0 1px 0 #ffffff; } .navbar .brand:hover { - text-decoration: none; + text-decoration: none; } .navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; + margin-bottom: 0; + line-height: 40px; + color: #777777; } .navbar-link { - color: #777777; + color: #777777; } .navbar-link:hover { - color: #333333; + color: #333333; } .navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; + height: 40px; + margin: 0 9px; + border-right: 1px solid #ffffff; + border-left: 1px solid #f2f2f2; } .navbar .btn, .navbar .btn-group { - margin-top: 5px; + margin-top: 5px; } .navbar .btn-group .btn, .navbar .input-prepend .btn, .navbar .input-append .btn { - margin-top: 0; + margin-top: 0; } .navbar-form { - margin-bottom: 0; - *zoom: 1; + margin-bottom: 0; + *zoom: 1; } .navbar-form:before, .navbar-form:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .navbar-form:after { - clear: both; + clear: both; } .navbar-form input, .navbar-form select, .navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; + margin-top: 5px; } .navbar-form input, .navbar-form select, .navbar-form .btn { - display: inline-block; - margin-bottom: 0; + display: inline-block; + margin-bottom: 0; } .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { - margin-top: 3px; + margin-top: 3px; } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; + margin-top: 5px; + white-space: nowrap; } .navbar-form .input-append input, .navbar-form .input-prepend input { - margin-top: 0; + margin-top: 0; } .navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; + position: relative; + float: left; + margin-top: 5px; + margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + padding: 4px 14px; + margin-bottom: 0; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 1; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } .navbar-static-top { - position: static; - margin-bottom: 0; + position: static; + margin-bottom: 0; } .navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; + position: fixed; + right: 0; + left: 0; + z-index: 1030; + margin-bottom: 0; } .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { - border-width: 0 0 1px; + border-width: 0 0 1px; } .navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; + border-width: 1px 0 0; } .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + padding-right: 0; + padding-left: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { - width: 940px; + width: 940px; } .navbar-fixed-top { - top: 0; + top: 0; } .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); } .navbar-fixed-bottom { - bottom: 0; + bottom: 0; } .navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); } .navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; } .navbar .nav.pull-right { - float: right; - margin-right: 0; + float: right; + margin-right: 0; } .navbar .nav > li { - float: left; + float: left; } .navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; + float: none; + padding: 10px 15px 10px; + color: #777777; + text-decoration: none; + text-shadow: 0 1px 0 #ffffff; } .navbar .nav .dropdown-toggle .caret { - margin-top: 8px; + margin-top: 8px; } .navbar .nav > li > a:focus, .navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; - background-color: transparent; + color: #333333; + text-decoration: none; + background-color: transparent; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + color: #555555; + text-decoration: none; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + display: none; + float: right; + padding: 7px 10px; + margin-right: 5px; + margin-left: 5px; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + *background-color: #e5e5e5; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); + background-repeat: repeat-x; + border-color: #e5e5e5 #e5e5e5 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); } .navbar .btn-navbar:hover, @@ -4609,258 +4620,258 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #cccccc \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + display: block; + width: 18px; + height: 2px; + background-color: #f5f5f5; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } .btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; + margin-top: 3px; } .navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; + position: absolute; + top: -7px; + left: 9px; + display: inline-block; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-left: 7px solid transparent; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; } .navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; + position: absolute; + top: -6px; + left: 10px; + display: inline-block; + border-right: 6px solid transparent; + border-bottom: 6px solid #ffffff; + border-left: 6px solid transparent; + content: ''; } .navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); + top: auto; + bottom: -7px; + border-top: 7px solid #ccc; + border-bottom: 0; + border-top-color: rgba(0, 0, 0, 0.2); } .navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; + top: auto; + bottom: -6px; + border-top: 6px solid #ffffff; + border-bottom: 0; } .navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; + border-top-color: #555555; + border-bottom-color: #555555; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; + color: #555555; + background-color: #e5e5e5; } .navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; + border-top-color: #777777; + border-bottom-color: #777777; } .navbar .nav li.dropdown.open > .dropdown-toggle .caret, .navbar .nav li.dropdown.active > .dropdown-toggle .caret, .navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; + border-top-color: #555555; + border-bottom-color: #555555; } .navbar .pull-right > li > .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; + right: 0; + left: auto; } .navbar .pull-right > li > .dropdown-menu:before, .navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; + right: 12px; + left: auto; } .navbar .pull-right > li > .dropdown-menu:after, .navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; + right: 13px; + left: auto; } .navbar .pull-right > li > .dropdown-menu .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; + right: 100%; + left: auto; + margin-right: -1px; + margin-left: 0; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; } .navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); + background-repeat: repeat-x; + border-color: #252525; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); } .navbar-inverse .brand, .navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .navbar-inverse .brand:hover, .navbar-inverse .nav > li > a:hover { - color: #ffffff; + color: #ffffff; } .navbar-inverse .brand { - color: #999999; + color: #999999; } .navbar-inverse .navbar-text { - color: #999999; + color: #999999; } .navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:hover { - color: #ffffff; - background-color: transparent; + color: #ffffff; + background-color: transparent; } .navbar-inverse .nav .active > a, .navbar-inverse .nav .active > a:hover, .navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; + color: #ffffff; + background-color: #111111; } .navbar-inverse .navbar-link { - color: #999999; + color: #999999; } .navbar-inverse .navbar-link:hover { - color: #ffffff; + color: #ffffff; } .navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; + border-right-color: #222222; + border-left-color: #111111; } .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; + color: #ffffff; + background-color: #111111; } .navbar-inverse .nav li.dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; + border-top-color: #ffffff; + border-bottom-color: #ffffff; } .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; + border-top-color: #999999; + border-bottom-color: #999999; } .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; + border-top-color: #ffffff; + border-bottom-color: #ffffff; } .navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; } .navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; + color: #cccccc; } .navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; + color: #cccccc; } .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; + color: #cccccc; } .navbar-inverse .navbar-search .search-query:focus, .navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + outline: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } .navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + *background-color: #040404; + background-image: -moz-linear-gradient(top, #151515, #040404); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-repeat: repeat-x; + border-color: #040404 #040404 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .navbar-inverse .btn-navbar:hover, @@ -4868,1190 +4879,1190 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .btn-navbar.active, .navbar-inverse .btn-navbar.disabled, .navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; + color: #ffffff; + background-color: #040404; + *background-color: #000000; } .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active { - background-color: #000000 \9; + background-color: #000000 \9; } .breadcrumb { - padding: 8px 15px; - margin: 0 0 20px; - list-style: none; - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .breadcrumb > li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; + display: inline-block; + *display: inline; + text-shadow: 0 1px 0 #ffffff; + *zoom: 1; } .breadcrumb > li > .divider { - padding: 0 5px; - color: #ccc; + padding: 0 5px; + color: #ccc; } .breadcrumb > .active { - color: #999999; + color: #999999; } .pagination { - margin: 20px 0; + margin: 20px 0; } .pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + display: inline-block; + *display: inline; + margin-bottom: 0; + margin-left: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + *zoom: 1; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .pagination ul > li { - display: inline; + display: inline; } .pagination ul > li > a, .pagination ul > li > span { - float: left; - padding: 4px 12px; - line-height: 20px; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; + float: left; + padding: 4px 12px; + line-height: 20px; + text-decoration: none; + background-color: #ffffff; + border: 1px solid #dddddd; + border-left-width: 0; } .pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span { - background-color: #f5f5f5; + background-color: #f5f5f5; } .pagination ul > .active > a, .pagination ul > .active > span { - color: #999999; - cursor: default; + color: #999999; + cursor: default; } .pagination ul > .disabled > span, .pagination ul > .disabled > a, .pagination ul > .disabled > a:hover { - color: #999999; - cursor: default; - background-color: transparent; + color: #999999; + cursor: default; + background-color: transparent; } .pagination ul > li:first-child > a, .pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; + border-left-width: 1px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-topleft: 4px; } .pagination ul > li:last-child > a, .pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; } .pagination-centered { - text-align: center; + text-align: center; } .pagination-right { - text-align: right; + text-align: right; } .pagination-large ul > li > a, .pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; + padding: 11px 19px; + font-size: 17.5px; } .pagination-large ul > li:first-child > a, .pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; + -webkit-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -webkit-border-top-left-radius: 6px; + border-top-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + -moz-border-radius-topleft: 6px; } .pagination-large ul > li:last-child > a, .pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; + -webkit-border-top-right-radius: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + -moz-border-radius-topright: 6px; + -moz-border-radius-bottomright: 6px; } .pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + -moz-border-radius-topleft: 3px; } .pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; + -moz-border-radius-topright: 3px; + -moz-border-radius-bottomright: 3px; } .pagination-small ul > li > a, .pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; + padding: 2px 10px; + font-size: 11.9px; } .pagination-mini ul > li > a, .pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; + padding: 0 6px; + font-size: 10.5px; } .pager { - margin: 20px 0; - text-align: center; - list-style: none; - *zoom: 1; + margin: 20px 0; + text-align: center; + list-style: none; + *zoom: 1; } .pager:before, .pager:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .pager:after { - clear: both; + clear: both; } .pager li { - display: inline; + display: inline; } .pager li > a, .pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } .pager li > a:hover { - text-decoration: none; - background-color: #f5f5f5; + text-decoration: none; + background-color: #f5f5f5; } .pager .next > a, .pager .next > span { - float: right; + float: right; } .pager .previous > a, .pager .previous > span { - float: left; + float: left; } .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > span { - color: #999999; - cursor: default; - background-color: #fff; + color: #999999; + cursor: default; + background-color: #fff; } .modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: #000000; } .modal-backdrop.fade { - opacity: 0; + opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); + opacity: 0.8; + filter: alpha(opacity=80); } .modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + position: fixed; + top: 10%; + left: 50%; + z-index: 1050; + width: 560px; + margin-left: -280px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + *border: 1px solid #999; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + outline: none; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } .modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; + top: -25%; + -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; + -moz-transition: opacity 0.3s linear, top 0.3s ease-out; + -o-transition: opacity 0.3s linear, top 0.3s ease-out; + transition: opacity 0.3s linear, top 0.3s ease-out; } .modal.fade.in { - top: 10%; + top: 10%; } .modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; + padding: 9px 15px; + border-bottom: 1px solid #eee; } .modal-header .close { - margin-top: 2px; + margin-top: 2px; } .modal-header h3 { - margin: 0; - line-height: 30px; + margin: 0; + line-height: 30px; } .modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; + position: relative; + max-height: 400px; + padding: 15px; + overflow-y: auto; } .modal-form { - margin-bottom: 0; + margin-bottom: 0; } .modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; + padding: 14px 15px 15px; + margin-bottom: 0; + text-align: right; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + *zoom: 1; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } .modal-footer:before, .modal-footer:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .modal-footer:after { - clear: both; + clear: both; } .modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; + margin-bottom: 0; + margin-left: 5px; } .modal-footer .btn-group .btn + .btn { - margin-left: -1px; + margin-left: -1px; } .modal-footer .btn-block + .btn-block { - margin-left: 0; + margin-left: 0; } .tooltip { - position: absolute; - z-index: 1030; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; + position: absolute; + z-index: 1030; + display: block; + padding: 5px; + font-size: 11px; + opacity: 0; + filter: alpha(opacity=0); + visibility: visible; } .tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); + opacity: 0.8; + filter: alpha(opacity=80); } .tooltip.top { - margin-top: -3px; + margin-top: -3px; } .tooltip.right { - margin-left: 3px; + margin-left: 3px; } .tooltip.bottom { - margin-top: 3px; + margin-top: 3px; } .tooltip.left { - margin-left: -3px; + margin-left: -3px; } .tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + max-width: 200px; + padding: 3px 8px; + color: #ffffff; + text-align: center; + text-decoration: none; + background-color: #000000; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } .tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; + bottom: 0; + left: 50%; + margin-left: -5px; + border-top-color: #000000; + border-width: 5px 5px 0; } .tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; + top: 50%; + left: 0; + margin-top: -5px; + border-right-color: #000000; + border-width: 5px 5px 5px 0; } .tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; + top: 50%; + right: 0; + margin-top: -5px; + border-left-color: #000000; + border-width: 5px 0 5px 5px; } .tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; + top: 0; + left: 50%; + margin-left: -5px; + border-bottom-color: #000000; + border-width: 0 5px 5px; } .popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - width: 236px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + width: 236px; + padding: 1px; + text-align: left; + white-space: normal; + background-color: #ffffff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .popover.top { - margin-top: -10px; + margin-top: -10px; } .popover.right { - margin-left: 10px; + margin-left: 10px; } .popover.bottom { - margin-top: 10px; + margin-top: 10px; } .popover.left { - margin-left: -10px; + margin-left: -10px; } .popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; + padding: 8px 14px; + margin: 0; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } .popover-content { - padding: 9px 14px; + padding: 9px 14px; } .popover .arrow, .popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } .popover .arrow { - border-width: 11px; + border-width: 11px; } .popover .arrow:after { - border-width: 10px; - content: ""; + border-width: 10px; + content: ""; } .popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; + bottom: -11px; + left: 50%; + margin-left: -11px; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + border-bottom-width: 0; } .popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; + bottom: 1px; + margin-left: -10px; + border-top-color: #ffffff; + border-bottom-width: 0; } .popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; + top: 50%; + left: -11px; + margin-top: -11px; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); + border-left-width: 0; } .popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; + bottom: -10px; + left: 1px; + border-right-color: #ffffff; + border-left-width: 0; } .popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; + top: -11px; + left: 50%; + margin-left: -11px; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + border-top-width: 0; } .popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; + top: 1px; + margin-left: -10px; + border-bottom-color: #ffffff; + border-top-width: 0; } .popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; + top: 50%; + right: -11px; + margin-top: -11px; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); + border-right-width: 0; } .popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; + right: 1px; + bottom: -10px; + border-left-color: #ffffff; + border-right-width: 0; } .thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; + margin-left: -20px; + list-style: none; + *zoom: 1; } .thumbnails:before, .thumbnails:after { - display: table; - line-height: 0; - content: ""; + display: table; + line-height: 0; + content: ""; } .thumbnails:after { - clear: both; + clear: both; } .row-fluid .thumbnails { - margin-left: 0; + margin-left: 0; } .thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; + float: left; + margin-bottom: 20px; + margin-left: 20px; } .thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; + display: block; + padding: 4px; + line-height: 20px; + border: 1px solid #ddd; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + border-color: #0088cc; + -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } .thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; + display: block; + max-width: 100%; + margin-right: auto; + margin-left: auto; } .thumbnail .caption { - padding: 9px; - color: #555555; + padding: 9px; + color: #555555; } .media, .media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; + overflow: hidden; + *overflow: visible; + zoom: 1; } .media, .media .media { - margin-top: 15px; + margin-top: 15px; } .media:first-child { - margin-top: 0; + margin-top: 0; } .media-object { - display: block; + display: block; } .media-heading { - margin: 0 0 5px; + margin: 0 0 5px; } .media .pull-left { - margin-right: 10px; + margin-right: 10px; } .media .pull-right { - margin-left: 10px; + margin-left: 10px; } .media-list { - margin-left: 0; - list-style: none; + margin-left: 0; + list-style: none; } .label, .badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; + font-weight: bold; + line-height: 14px; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + white-space: nowrap; + vertical-align: baseline; + background-color: #999999; } .label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; + padding-right: 9px; + padding-left: 9px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; } .label:empty, .badge:empty { - display: none; + display: none; } a.label:hover, a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; + color: #ffffff; + text-decoration: none; + cursor: pointer; } .label-important, .badge-important { - background-color: #b94a48; + background-color: #b94a48; } .label-important[href], .badge-important[href] { - background-color: #953b39; + background-color: #953b39; } .label-warning, .badge-warning { - background-color: #f89406; + background-color: #f89406; } .label-warning[href], .badge-warning[href] { - background-color: #c67605; + background-color: #c67605; } .label-success, .badge-success { - background-color: #468847; + background-color: #468847; } .label-success[href], .badge-success[href] { - background-color: #356635; + background-color: #356635; } .label-info, .badge-info { - background-color: #3a87ad; + background-color: #3a87ad; } .label-info[href], .badge-info[href] { - background-color: #2d6987; + background-color: #2d6987; } .label-inverse, .badge-inverse { - background-color: #333333; + background-color: #333333; } .label-inverse[href], .badge-inverse[href] { - background-color: #1a1a1a; + background-color: #1a1a1a; } .btn .label, .btn .badge { - position: relative; - top: -1px; + position: relative; + top: -1px; } .btn-mini .label, .btn-mini .badge { - top: 0; + top: 0; } @-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } } @-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } } @-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } } @-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } } @keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } } .progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + height: 20px; + margin-bottom: 20px; + overflow: hidden; + background-color: #f7f7f7; + background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); + background-repeat: repeat-x; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; + float: left; + width: 0; + height: 100%; + font-size: 12px; + color: #ffffff; + text-align: center; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e90d2; + background-image: -moz-linear-gradient(top, #149bdf, #0480be); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); + background-image: -webkit-linear-gradient(top, #149bdf, #0480be); + background-image: -o-linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; } .progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); } .progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; + background-color: #149bdf; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; } .progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; } .progress-danger .bar, .progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); + background-color: #dd514c; + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } .progress-danger.progress-striped .bar, .progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-success .bar, .progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); + background-color: #5eb95e; + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } .progress-success.progress-striped .bar, .progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-info .bar, .progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); + background-color: #4bb1cf; + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } .progress-info.progress-striped .bar, .progress-striped .bar-info { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-warning .bar, .progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); + background-color: #faa732; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } .progress-warning.progress-striped .bar, .progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-color: #fbb450; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 20px; + margin-bottom: 20px; } .accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + margin-bottom: 2px; + border: 1px solid #e5e5e5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .accordion-heading { - border-bottom: 0; + border-bottom: 0; } .accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; + display: block; + padding: 8px 15px; } .accordion-toggle { - cursor: pointer; + cursor: pointer; } .accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; + padding: 9px 15px; + border-top: 1px solid #e5e5e5; } .carousel { - position: relative; - margin-bottom: 20px; - line-height: 1; + position: relative; + margin-bottom: 20px; + line-height: 1; } .carousel-inner { - position: relative; - width: 100%; - overflow: hidden; + position: relative; + width: 100%; + overflow: hidden; } .carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; + position: relative; + display: none; + -webkit-transition: 0.6s ease-in-out left; + -moz-transition: 0.6s ease-in-out left; + -o-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; } .carousel-inner > .item > img { - display: block; - line-height: 1; + display: block; + line-height: 1; } .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { - display: block; + display: block; } .carousel-inner > .active { - left: 0; + left: 0; } .carousel-inner > .next, .carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; + position: absolute; + top: 0; + width: 100%; } .carousel-inner > .next { - left: 100%; + left: 100%; } .carousel-inner > .prev { - left: -100%; + left: -100%; } .carousel-inner > .next.left, .carousel-inner > .prev.right { - left: 0; + left: 0; } .carousel-inner > .active.left { - left: -100%; + left: -100%; } .carousel-inner > .active.right { - left: 100%; + left: 100%; } .carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); + position: absolute; + top: 40%; + left: 15px; + width: 40px; + height: 40px; + margin-top: -20px; + font-size: 60px; + font-weight: 100; + line-height: 30px; + color: #ffffff; + text-align: center; + background: #222222; + border: 3px solid #ffffff; + -webkit-border-radius: 23px; + -moz-border-radius: 23px; + border-radius: 23px; + opacity: 0.5; + filter: alpha(opacity=50); } .carousel-control.right { - right: 15px; - left: auto; + right: 15px; + left: auto; } .carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); + color: #ffffff; + text-decoration: none; + opacity: 0.9; + filter: alpha(opacity=90); } .carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); + position: absolute; + right: 0; + bottom: 0; + left: 0; + padding: 15px; + background: #333333; + background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { - line-height: 20px; - color: #ffffff; + line-height: 20px; + color: #ffffff; } .carousel-caption h4 { - margin: 0 0 5px; + margin: 0 0 5px; } .carousel-caption p { - margin-bottom: 0; + margin-bottom: 0; } .hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + padding: 60px; + margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; + background-color: #eeeeee; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; + color: inherit; } .hero-unit li { - line-height: 30px; + line-height: 30px; } .pull-right { - float: right; + float: right; } .pull-left { - float: left; + float: left; } .hide { - display: none; + display: none; } .show { - display: block; + display: block; } .invisible { - visibility: hidden; + visibility: hidden; } .affix { - position: fixed; + position: fixed; } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css index f14f6bdb62c..59a05ee958a 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css +++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css @@ -1,308 +1,309 @@ .line-numbers { - margin-right: 1.0em; + margin-right: 1.0em; } .content { - padding-bottom: 100px; + padding-bottom: 100px; } .column_header_name { - width: 150px; + width: 150px; } .column_header_path { - width: 350px; + width: 350px; } .column_header_name .column_header_param_type .column_header_data_type .column_header_return_type { - width: 200px; + width: 200px; } .expandable { - display: none; + display: none; } .main_content { - margin-top: 80px; - margin-left: 25px; - margin-right: 25px; + margin-top: 80px; + margin-left: 25px; + margin-right: 25px; } .model { - float: left; + float: left; } .model-container { - float: left; - width: 500px; - padding: 0px; + float: left; + width: 500px; + padding: 0px; } .model-detail-container { - clear: left; - float: left; - width: 500px; - margin-left: 40px; + clear: left; + float: left; + width: 500px; + margin-left: 40px; } .model-detail-popup { - box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px 5px; - border-style: solid; - border-width: 1px; - border-color: black; - padding-left: 10px; - padding-right: 10px; - padding-top: 10px; - padding-bottom: 10px; - background-color: white; - opacity: 0.99; - z-index: 1; - overflow: scroll; - width: 400px; + box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px 5px; + border-style: solid; + border-width: 1px; + border-color: black; + padding-left: 10px; + padding-right: 10px; + padding-top: 10px; + padding-bottom: 10px; + background-color: white; + opacity: 0.99; + z-index: 1; + overflow: scroll; + width: 400px; } .model-detail-popup .code { - background-color: #E4F5FF; - font-family: monospace; - white-space: pre; - margin: 10px; - overflow: auto; + background-color: #E4F5FF; + font-family: monospace; + white-space: pre; + margin: 10px; + overflow: auto; } .model-detail-popup h2 { - margin-top: 0px; - padding-top: 0px; + margin-top: 0px; + padding-top: 0px; } .model-detail-popup li { - padding-bottom: 5px; + padding-bottom: 5px; } .model-detail-popup .param-reqiured-true { - font-family: monospace; - font-weight: bold; - clear: left; - display: block; - float: left; - width: 100%; + font-family: monospace; + font-weight: bold; + clear: left; + display: block; + float: left; + width: 100%; } .model-detail-popup .param-required-false { - font-family: monospace; - clear: left; - display: block; - float: left; - width: 100%; + font-family: monospace; + clear: left; + display: block; + float: left; + width: 100%; } .model-detail-popup .param-description { - margin-left: 50px; - float: left; + margin-left: 50px; + float: left; } .section-header { - border-bottom: 2px; - font-weight: bold; - font-size: 15px; - padding: 6px 0; - color: rgb(57,57,57); + border-bottom: 2px; + font-weight: bold; + font-size: 15px; + padding: 6px 0; + color: rgb(57, 57, 57); } .content { - padding-top: 100px; + padding-top: 100px; } .content h1 { - font-size: 43px; - text-align: center; - margin-top: 40px; - margin-bottom: 40px; + font-size: 43px; + text-align: center; + margin-top: 40px; + margin-bottom: 40px; } .sidebar { - box-sizing: border-box; - float: left; - display: block; - width: 240px; - overflow: scroll; - position: fixed; + box-sizing: border-box; + float: left; + display: block; + width: 240px; + overflow: scroll; + position: fixed; } .section-box { - border-bottom-style: solid; - border-bottom: 10px; + border-bottom-style: solid; + border-bottom: 10px; } .section-box ul li { - list-style: none; - margin-left: 0px; + list-style: none; + margin-left: 0px; } .non-sidebar { - box-sizing: border-box; - display: block; - margin-left: 240px; - margin-right: 0px; - width: 638px; + box-sizing: border-box; + display: block; + margin-left: 240px; + margin-right: 0px; + width: 638px; } .non-sidebar h2 { - clear: left; - padding-top: 20px; + clear: left; + padding-top: 20px; } li.parameter { - list-style: none; - display: block; - padding-left: 1em; + list-style: none; + display: block; + padding-left: 1em; } -.param{ - display: block; +.param { + display: block; } .param-name { - margin-left: 1em; + margin-left: 1em; } .param-in { - font-weight: bold; - font-size: 1.1em; + font-weight: bold; + font-size: 1.1em; } + .param-type { - margin-left: 1em; - font-style: italic; + margin-left: 1em; + font-style: italic; } .param-description { - display: block; - font-family: 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif; + display: block; + font-family: 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif; } .param-optional-flag { - font-style: italic; + font-style: italic; } .section { - font-weight: normal; - clear: left; + font-weight: normal; + clear: left; } .section a { - text-decoration: underline; + text-decoration: underline; } .code { - background-color: #E4F5FF; - font-family: monospace; - white-space: pre; - margin: 10px; - overflow: auto; - width: 600px; + background-color: #E4F5FF; + font-family: monospace; + white-space: pre; + margin: 10px; + overflow: auto; + width: 600px; } .header { - position: fixed; - text-align: left; - background-color: black; - float: left; - top: 0; - width: 100%; - height: 70px auto; - padding-bottom: 20px; - box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px 5px; + position: fixed; + text-align: left; + background-color: black; + float: left; + top: 0; + width: 100%; + height: 70px auto; + padding-bottom: 20px; + box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px 5px; } .top-bar h1 a { - width: auto; + width: auto; } .top-bar h1#logo a { - width: auto; - display: block; - clear: none; - float: left; - background-position: left;; - color: white; - text-decoration: none; + width: auto; + display: block; + clear: none; + float: left; + background-position: left;; + color: white; + text-decoration: none; } .top-bar ul li { - list-style: none; + list-style: none; } .top-bar h1#logo span { - display: block; - clear: none; - float: left; - padding-top: 10px; - padding-left: 10px; - margin: 0px; + display: block; + clear: none; + float: left; + padding-top: 10px; + padding-left: 10px; + margin: 0px; } .top-bar h1#logo a span.light { - color: #ffc97a; - color: #666666; - padding-left: 0px; + color: #ffc97a; + color: #666666; + padding-left: 0px; } .top-bar ul#nav { - float: none; - clear: both; - overflow: hidden; - margin: 0; - padding: 0; - display: block; - float: right; - clear: none; + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + float: right; + clear: none; } .top-bar ul#nav li { - float: left; - clear: none; - margin: 0; - padding: 2px 10px; - border-right: 1px solid #dddddd; + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; } .top-bar ul#nav li:first-child, .top-bar ul#nav li.first { - padding-left: 0; + padding-left: 0; } .top-bar ul#nav li:last-child, .top-bar ul#nav li.last { - padding-right: 0; - border-right: none; + padding-right: 0; + border-right: none; } .top-bar ul#nav li { - border: none; - padding: 0 5px; + border: none; + padding: 0 5px; } .top-bar ul#nav li a { - display: block; - padding: 8px 10px 8px 10px; - color: #999999; - text-decoration: none; + display: block; + padding: 8px 10px 8px 10px; + color: #999999; + text-decoration: none; } .top-bar ul#nav li a.strong { - color: white; + color: white; } .top-bar ul#nav li a:active, .top-bar ul#nav li a.active, .top-bar ul#nav li a:hover { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -o-border-radius: 4px; - -ms-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; - background-image: -webkit-gradient(linear, 0% 100%, 0% 0%, color-stop(0%, #ff5401), color-stop(100%, #ffa014)); - background-image: -moz-linear-gradient(bottom, #ff5401 0%, #ffa014 100%); - background-image: linear-gradient(bottom, #ff5401 0%, #ffa014 100%); - color: white; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -o-border-radius: 4px; + -ms-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + background-image: -webkit-gradient(linear, 0% 100%, 0% 0%, color-stop(0%, #ff5401), color-stop(100%, #ffa014)); + background-image: -moz-linear-gradient(bottom, #ff5401 0%, #ffa014 100%); + background-image: linear-gradient(bottom, #ff5401 0%, #ffa014 100%); + color: white; } .top-bar ul#nav:hover li { - border-color: #222222; + border-color: #222222; } diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/bootstrap.js b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/bootstrap.js index 6c15a583296..96bc4e8c103 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/bootstrap.js +++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/bootstrap.js @@ -20,44 +20,45 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) + * ======================================================= */ - $(function () { + $(function () { - $.support.transition = (function () { + $.support.transition = (function () { - var transitionEnd = (function () { + var transitionEnd = (function () { - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition': 'webkitTransitionEnd' + , 'MozTransition': 'transitionend' + , 'OTransition': 'oTransitionEnd otransitionend' + , 'transition': 'transitionend' + } + , name - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } + for (name in transEndEventNames) { + if (el.style[name] !== undefined) { + return transEndEventNames[name] + } + } - }()) + }()) - return transitionEnd && { - end: transitionEnd - } + return transitionEnd && { + end: transitionEnd + } - })() + })() - }) + }) -}(window.jQuery);/* ========================================================== +}(window.jQuery); +/* ========================================================== * bootstrap-alert.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== @@ -79,83 +80,84 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* ALERT CLASS DEFINITION - * ====================== */ + /* ALERT CLASS DEFINITION + * ====================== */ - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } + var dismiss = '[data-dismiss="alert"]' + , Alert = function (el) { + $(el).on('click', dismiss, this.close) + } - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent + Alert.prototype.close = function (e) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } - $parent = $(selector) + $parent = $(selector) - e && e.preventDefault() + e && e.preventDefault() - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.trigger(e = $.Event('close')) + $parent.trigger(e = $.Event('close')) - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return - $parent.removeClass('in') + $parent.removeClass('in') - function removeElement() { - $parent - .trigger('closed') - .remove() - } + function removeElement() { + $parent + .trigger('closed') + .remove() + } - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() + } - /* ALERT PLUGIN DEFINITION - * ======================= */ + /* ALERT PLUGIN DEFINITION + * ======================= */ - var old = $.fn.alert + var old = $.fn.alert - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('alert') + if (!data) $this.data('alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } - $.fn.alert.Constructor = Alert + $.fn.alert.Constructor = Alert - /* ALERT NO CONFLICT - * ================= */ + /* ALERT NO CONFLICT + * ================= */ - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } - /* ALERT DATA-API - * ============== */ + /* ALERT DATA-API + * ============== */ - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) + $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) -}(window.jQuery);/* ============================================================ +}(window.jQuery); +/* ============================================================ * bootstrap-button.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ @@ -177,89 +179,90 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ + /* BUTTON PUBLIC CLASS DEFINITION + * ============================== */ - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.button.defaults, options) + } - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' + Button.prototype.setState = function (state) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) - $el[val](data[state] || this.options[state]) + $el[val](data[state] || this.options[state]) - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - $parent && $parent - .find('.active') - .removeClass('active') + $parent && $parent + .find('.active') + .removeClass('active') - this.$element.toggleClass('active') - } + this.$element.toggleClass('active') + } - /* BUTTON PLUGIN DEFINITION - * ======================== */ + /* BUTTON PLUGIN DEFINITION + * ======================== */ - var old = $.fn.button + var old = $.fn.button - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('button') + , options = typeof option == 'object' && option + if (!data) $this.data('button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } - $.fn.button.defaults = { - loadingText: 'loading...' - } + $.fn.button.defaults = { + loadingText: 'loading...' + } - $.fn.button.Constructor = Button + $.fn.button.Constructor = Button - /* BUTTON NO CONFLICT - * ================== */ + /* BUTTON NO CONFLICT + * ================== */ - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } - /* BUTTON DATA-API - * =============== */ + /* BUTTON DATA-API + * =============== */ - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) + $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + }) -}(window.jQuery);/* ========================================================== +}(window.jQuery); +/* ========================================================== * bootstrap-carousel.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== @@ -281,169 +284,172 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* CAROUSEL CLASS DEFINITION - * ========================= */ + /* CAROUSEL CLASS DEFINITION + * ========================= */ - var Carousel = function (element, options) { - this.$element = $(element) - this.options = options - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this + var Carousel = function (element, options) { + this.$element = $(element) + this.options = options + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) } - , to: function (pos) { - var $active = this.$element.find('.item.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } + Carousel.prototype = { - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } + cycle: function (e) { + if (!e) this.paused = false + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + return this + } - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle() - } - clearInterval(this.interval) - this.interval = null - return this - } + , to: function (pos) { + var $active = this.$element.find('.item.active') + , children = $active.parent().children() + , activePos = children.index($active) + , that = this - , next: function () { - if (this.sliding) return - return this.slide('next') - } + if (pos > (children.length - 1) || pos < 0) return - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } + if (this.sliding) { + return this.$element.one('slid', function () { + that.to(pos) + }) + } - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e + if (activePos == pos) { + return this.pause().cycle() + } - this.sliding = true + return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + } - isCycling && this.pause() + , pause: function (e) { + if (!e) this.paused = true + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle() + } + clearInterval(this.interval) + this.interval = null + return this + } - $next = $next.length ? $next : this.$element.find('.item')[fallback]() + , next: function () { + if (this.sliding) return + return this.slide('next') + } - e = $.Event('slide', { - relatedTarget: $next[0] - }) + , prev: function () { + if (this.sliding) return + return this.slide('prev') + } - if ($next.hasClass('active')) return + , slide: function (type, next) { + var $active = this.$element.find('.item.active') + , $next = next || $active[type]() + , isCycling = this.interval + , direction = type == 'next' ? 'left' : 'right' + , fallback = type == 'next' ? 'first' : 'last' + , that = this + , e + + this.sliding = true + + isCycling && this.pause() + + $next = $next.length ? $next : this.$element.find('.item')[fallback]() + + e = $.Event('slide', { + relatedTarget: $next[0] + }) + + if ($next.hasClass('active')) return + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + this.$element.one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { + that.$element.trigger('slid') + }, 0) + }) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } + isCycling && this.cycle() - isCycling && this.cycle() + return this + } - return this } - } - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ + /* CAROUSEL PLUGIN DEFINITION + * ========================== */ - var old = $.fn.carousel + var old = $.fn.carousel - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.cycle() - }) - } + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('carousel') + , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) + , action = typeof option == 'string' ? option : options.slide + if (!data) $this.data('carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.cycle() + }) + } - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } + $.fn.carousel.defaults = { + interval: 5000 + , pause: 'hover' + } - $.fn.carousel.Constructor = Carousel + $.fn.carousel.Constructor = Carousel - /* CAROUSEL NO CONFLICT - * ==================== */ + /* CAROUSEL NO CONFLICT + * ==================== */ - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } - /* CAROUSEL DATA-API - * ================= */ + /* CAROUSEL DATA-API + * ================= */ - $(document).on('click.carousel.data-api', '[data-slide]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) + $(document).on('click.carousel.data-api', '[data-slide]', function (e) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() + }) -}(window.jQuery);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-collapse.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= @@ -465,151 +471,152 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.collapse.defaults, options) + + if (this.options.parent) { + this.$parent = $(this.options.parent) + } - if (this.options.parent) { - this.$parent = $(this.options.parent) + this.options.toggle && this.toggle() } - this.options.toggle && this.toggle() - } + Collapse.prototype = { - Collapse.prototype = { + constructor: Collapse - constructor: Collapse + , dimension: function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } + , show: function () { + var dimension + , scroll + , actives + , hasData - , show: function () { - var dimension - , scroll - , actives - , hasData + if (this.transitioning) return - if (this.transitioning) return + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') + if (actives && actives.length) { + hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('collapse', null) + } - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } + this.$element[dimension](0) + this.transition('addClass', $.Event('show'), 'shown') + $.support.transition && this.$element[dimension](this.$element[0][scroll]) + } - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } + , hide: function () { + var dimension + if (this.transitioning) return + dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', $.Event('hide'), 'hidden') + this.$element[dimension](0) + } - , hide: function () { - var dimension - if (this.transitioning) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } + , reset: function (size) { + var dimension = this.dimension() - , reset: function (size) { - var dimension = this.dimension() + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + return this + } - return this - } + , transition: function (method, startEvent, completeEvent) { + var that = this + , complete = function () { + if (startEvent.type == 'show') that.reset() + that.transitioning = 0 + that.$element.trigger(completeEvent) + } - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } + this.$element.trigger(startEvent) - this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return - if (startEvent.isDefaultPrevented()) return + this.transitioning = 1 - this.transitioning = 1 + this.$element[method]('in') - this.$element[method]('in') + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } + , toggle: function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() } - } + /* COLLAPSE PLUGIN DEFINITION + * ========================== */ - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ + var old = $.fn.collapse - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('collapse') + , options = typeof option == 'object' && option + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.collapse.defaults = { - toggle: true - } + $.fn.collapse.defaults = { + toggle: true + } - $.fn.collapse.Constructor = Collapse + $.fn.collapse.Constructor = Collapse - /* COLLAPSE NO CONFLICT - * ==================== */ + /* COLLAPSE NO CONFLICT + * ==================== */ - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } - /* COLLAPSE DATA-API - * ================= */ + /* COLLAPSE DATA-API + * ================= */ - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) + $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) + }) -}(window.jQuery);/* ============================================================ +}(window.jQuery); +/* ============================================================ * bootstrap-dropdown.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ @@ -631,145 +638,150 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* DROPDOWN CLASS DEFINITION - * ========================= */ + /* DROPDOWN CLASS DEFINITION + * ========================= */ - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } + var toggle = '[data-toggle=dropdown]' + , Dropdown = function (element) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } - Dropdown.prototype = { + Dropdown.prototype = { - constructor: Dropdown + constructor: Dropdown - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive + , toggle: function (e) { + var $this = $(this) + , $parent + , isActive - if ($this.is('.disabled, :disabled')) return + if ($this.is('.disabled, :disabled')) return - $parent = getParent($this) + $parent = getParent($this) - isActive = $parent.hasClass('open') + isActive = $parent.hasClass('open') - clearMenus() + clearMenus() - if (!isActive) { - $parent.toggleClass('open') - } + if (!isActive) { + $parent.toggleClass('open') + } - $this.focus() + $this.focus() - return false - } + return false + } - , keydown: function (e) { - var $this - , $items - , $active - , $parent - , isActive - , index + , keydown: function (e) { + var $this + , $items + , $active + , $parent + , isActive + , index - if (!/(38|40|27)/.test(e.keyCode)) return + if (!/(38|40|27)/.test(e.keyCode)) return - $this = $(this) + $this = $(this) - e.preventDefault() - e.stopPropagation() + e.preventDefault() + e.stopPropagation() - if ($this.is('.disabled, :disabled')) return + if ($this.is('.disabled, :disabled')) return - $parent = getParent($this) + $parent = getParent($this) - isActive = $parent.hasClass('open') + isActive = $parent.hasClass('open') - if (!isActive || (isActive && e.keyCode == 27)) return $this.click() + if (!isActive || (isActive && e.keyCode == 27)) return $this.click() - $items = $('[role=menu] li:not(.divider):visible a', $parent) + $items = $('[role=menu] li:not(.divider):visible a', $parent) - if (!$items.length) return + if (!$items.length) return - index = $items.index($items.filter(':focus')) + index = $items.index($items.filter(':focus')) - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 - $items - .eq(index) - .focus() - } + $items + .eq(index) + .focus() + } - } + } - function clearMenus() { - $(toggle).each(function () { - getParent($(this)).removeClass('open') - }) - } + function clearMenus() { + $(toggle).each(function () { + getParent($(this)).removeClass('open') + }) + } - function getParent($this) { - var selector = $this.attr('data-target') - , $parent + function getParent($this) { + var selector = $this.attr('data-target') + , $parent - if (!selector) { - selector = $this.attr('href') - selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } - $parent = $(selector) - $parent.length || ($parent = $this.parent()) + $parent = $(selector) + $parent.length || ($parent = $this.parent()) - return $parent - } + return $parent + } - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ - var old = $.fn.dropdown + var old = $.fn.dropdown - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } - $.fn.dropdown.Constructor = Dropdown + $.fn.dropdown.Constructor = Dropdown - /* DROPDOWN NO CONFLICT - * ==================== */ + /* DROPDOWN NO CONFLICT + * ==================== */ - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ - $(document) - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + $(document) + .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) + .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { + e.stopPropagation() + }) + .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { + e.stopPropagation() + }) + .on('click.dropdown.data-api touchstart.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown) -}(window.jQuery);/* ========================================================= +}(window.jQuery); +/* ========================================================= * bootstrap-modal.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= @@ -791,227 +803,229 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* MODAL CLASS DEFINITION - * ====================== */ + /* MODAL CLASS DEFINITION + * ====================== */ - var Modal = function (element, options) { - this.options = options - this.$element = $(element) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - this.options.remote && this.$element.find('.modal-body').load(this.options.remote) - } + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + this.options.remote && this.$element.find('.modal-body').load(this.options.remote) + } - Modal.prototype = { + Modal.prototype = { - constructor: Modal + constructor: Modal - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } + , toggle: function () { + return this[!this.isShown ? 'show' : 'hide']() + } - , show: function () { - var that = this - , e = $.Event('show') + , show: function () { + var that = this + , e = $.Event('show') - this.$element.trigger(e) + this.$element.trigger(e) - if (this.isShown || e.isDefaultPrevented()) return + if (this.isShown || e.isDefaultPrevented()) return - this.isShown = true + this.isShown = true - this.escape() + this.escape() - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) //don't move modals dom position + } - that.$element - .show() + that.$element + .show() - if (transition) { - that.$element[0].offsetWidth // force reflow - } + if (transition) { + that.$element[0].offsetWidth // force reflow + } - that.$element - .addClass('in') - .attr('aria-hidden', false) + that.$element + .addClass('in') + .attr('aria-hidden', false) - that.enforceFocus() + that.enforceFocus() - transition ? - that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : - that.$element.focus().trigger('shown') + transition ? + that.$element.one($.support.transition.end, function () { + that.$element.focus().trigger('shown') + }) : + that.$element.focus().trigger('shown') - }) - } + }) + } - , hide: function (e) { - e && e.preventDefault() + , hide: function (e) { + e && e.preventDefault() - var that = this + var that = this - e = $.Event('hide') + e = $.Event('hide') - this.$element.trigger(e) + this.$element.trigger(e) - if (!this.isShown || e.isDefaultPrevented()) return + if (!this.isShown || e.isDefaultPrevented()) return - this.isShown = false + this.isShown = false - this.escape() + this.escape() - $(document).off('focusin.modal') + $(document).off('focusin.modal') - this.$element - .removeClass('in') - .attr('aria-hidden', true) + this.$element + .removeClass('in') + .attr('aria-hidden', true) - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } + $.support.transition && this.$element.hasClass('fade') ? + this.hideWithTransition() : + this.hideModal() + } - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - this.$element.off('keyup.dismiss.modal') - } - } - - , hideWithTransition: function () { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - that.hideModal() - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - that.hideModal() - }) - } + , enforceFocus: function () { + var that = this + $(document).on('focusin.modal', function (e) { + if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { + that.$element.focus() + } + }) + } - , hideModal: function (that) { - this.$element - .hide() - .trigger('hidden') + , escape: function () { + var that = this + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.modal', function (e) { + e.which == 27 && that.hide() + }) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.modal') + } + } - this.backdrop() - } + , hideWithTransition: function () { + var that = this + , timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + that.hideModal() + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + that.hideModal() + }) + } + + , hideModal: function (that) { + this.$element + .hide() + .trigger('hidden') - , removeBackdrop: function () { - this.$backdrop.remove() - this.$backdrop = null - } + this.backdrop() + } + + , removeBackdrop: function () { + this.$backdrop.remove() + this.$backdrop = null + } - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' + , backdrop: function (callback) { + var that = this + , animate = this.$element.hasClass('fade') ? 'fade' : '' - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate - this.$backdrop = $('
') - .appendTo(document.body) + this.$backdrop = $('
') + .appendTo(document.body) - this.$backdrop.click( - this.options.backdrop == 'static' ? - $.proxy(this.$element[0].focus, this.$element[0]) - : $.proxy(this.hide, this) - ) + this.$backdrop.click( + this.options.backdrop == 'static' ? + $.proxy(this.$element[0].focus, this.$element[0]) + : $.proxy(this.hide, this) + ) - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - this.$backdrop.addClass('in') + this.$backdrop.addClass('in') - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() + doAnimate ? + this.$backdrop.one($.support.transition.end, callback) : + callback() - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) : - this.removeBackdrop() + $.support.transition && this.$element.hasClass('fade') ? + this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) : + this.removeBackdrop() - } else if (callback) { - callback() + } else if (callback) { + callback() + } } - } - } + } - /* MODAL PLUGIN DEFINITION - * ======================= */ + /* MODAL PLUGIN DEFINITION + * ======================= */ - var old = $.fn.modal + var old = $.fn.modal - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } + $.fn.modal = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('modal') + , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) + if (!data) $this.data('modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option]() + else if (options.show) data.show() + }) + } - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } + $.fn.modal.defaults = { + backdrop: true + , keyboard: true + , show: true + } - $.fn.modal.Constructor = Modal + $.fn.modal.Constructor = Modal - /* MODAL NO CONFLICT - * ================= */ + /* MODAL NO CONFLICT + * ================= */ - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } - /* MODAL DATA-API - * ============== */ + /* MODAL DATA-API + * ============== */ - $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) + $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({remote: !/#/.test(href) && href}, $target.data(), $this.data()) - e.preventDefault() + e.preventDefault() - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) + }) }(window.jQuery); /* =========================================================== @@ -1037,270 +1051,271 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ + /* TOOLTIP PUBLIC CLASS DEFINITION + * =============================== */ - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } + var Tooltip = function (element, options) { + this.init('tooltip', element, options) + } - Tooltip.prototype = { + Tooltip.prototype = { - constructor: Tooltip + constructor: Tooltip - , init: function (type, element, options) { - var eventIn - , eventOut + , init: function (type, element, options) { + var eventIn + , eventOut - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.enabled = true - if (this.options.trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } + if (this.options.trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (this.options.trigger != 'manual') { + eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } + this.options.selector ? + (this._options = $.extend({}, this.options, {trigger: 'manual', selector: ''})) : + this.fixTitle() + } - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + , getOptions: function (options) { + options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay + return options } - } - return options - } + , enter: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) - , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) + if (!self.options.delay || !self.options.delay.show) return self.show() - if (!self.options.delay || !self.options.delay.show) return self.show() + clearTimeout(this.timeout) + self.hoverState = 'in' + this.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } + , leave: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) + if (this.timeout) clearTimeout(this.timeout) + if (!self.options.delay || !self.options.delay.hide) return self.hide() - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() + self.hoverState = 'out' + this.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } + , show: function () { + var $tip + , inside + , pos + , actualWidth + , actualHeight + , placement + , tp + + if (this.hasContent() && this.enabled) { + $tip = this.tip() + this.setContent() + + if (this.options.animation) { + $tip.addClass('fade') + } + + placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + inside = /in/.test(placement) + + $tip + .detach() + .css({top: 0, left: 0, display: 'block'}) + .insertAfter(this.$element) + + pos = this.getPosition(inside) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + switch (inside ? placement.split(' ')[1] : placement) { + case 'bottom': + tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'top': + tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} + break + } + + $tip + .offset(tp) + .addClass(placement) + .addClass('in') + } + } - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - .insertAfter(this.$element) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .offset(tp) - .addClass(placement) - .addClass('in') - } - } + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } + , hide: function () { + var that = this + , $tip = this.tip() - , hide: function () { - var that = this - , $tip = this.tip() + $tip.removeClass('in') - $tip.removeClass('in') + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).detach() + }, 500) - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).detach() - }, 500) + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.detach() + }) + } - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.detach() - }) - } + $.support.transition && this.$tip.hasClass('fade') ? + removeWithAnimation() : + $tip.detach() - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.detach() + return this + } - return this - } + , fixTitle: function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + } + } - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } + , hasContent: function () { + return this.getTitle() + } - , hasContent: function () { - return this.getTitle() - } + , getPosition: function (inside) { + return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + } - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } + , getTitle: function () { + var title + , $e = this.$element + , o = this.options - , getTitle: function () { - var title - , $e = this.$element - , o = this.options + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + return title + } - return title - } + , tip: function () { + return this.$tip = this.$tip || $(this.options.template) + } - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } + , validate: function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } + , enable: function () { + this.enabled = true + } - , enable: function () { - this.enabled = true - } + , disable: function () { + this.enabled = false + } - , disable: function () { - this.enabled = false - } + , toggleEnabled: function () { + this.enabled = !this.enabled + } - , toggleEnabled: function () { - this.enabled = !this.enabled - } + , toggle: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + self[self.tip().hasClass('in') ? 'hide' : 'show']() + } - , toggle: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - self[self.tip().hasClass('in') ? 'hide' : 'show']() - } + , destroy: function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) } - } + /* TOOLTIP PLUGIN DEFINITION + * ========================= */ - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ + var old = $.fn.tooltip - var old = $.fn.tooltip - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip + $.fn.tooltip = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tooltip') + , options = typeof option == 'object' && option + if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover' - , title: '' - , delay: 0 - , html: false - } + $.fn.tooltip.Constructor = Tooltip + + $.fn.tooltip.defaults = { + animation: true + , placement: 'top' + , selector: false + , template: '
' + , trigger: 'hover' + , title: '' + , delay: 0 + , html: false + } - /* TOOLTIP NO CONFLICT - * =================== */ + /* TOOLTIP NO CONFLICT + * =================== */ - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } -}(window.jQuery);/* =========================================================== +}(window.jQuery); +/* =========================================================== * bootstrap-popover.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== @@ -1322,98 +1337,102 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ + /* POPOVER PUBLIC CLASS DEFINITION + * =============================== */ - var Popover = function (element, options) { - this.init('popover', element, options) - } + var Popover = function (element, options) { + this.init('popover', element, options) + } - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js ========================================== */ - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - constructor: Popover + constructor: Popover - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() + , content = this.getContent() - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) - $tip.removeClass('fade top bottom left right in') - } + $tip.removeClass('fade top bottom left right in') + } - , hasContent: function () { - return this.getTitle() || this.getContent() - } + , hasContent: function () { + return this.getTitle() || this.getContent() + } - , getContent: function () { - var content - , $e = this.$element - , o = this.options + , getContent: function () { + var content + , $e = this.$element + , o = this.options - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + content = $e.attr('data-content') + || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - return content - } + return content + } - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } + , tip: function () { + if (!this.$tip) { + this.$tip = $(this.options.template) + } + return this.$tip + } - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } + , destroy: function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } - }) + }) - /* POPOVER PLUGIN DEFINITION - * ======================= */ + /* POPOVER PLUGIN DEFINITION + * ======================= */ - var old = $.fn.popover + var old = $.fn.popover - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('popover') + , options = typeof option == 'object' && option + if (!data) $this.data('popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.popover.Constructor = Popover + $.fn.popover.Constructor = Popover - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '

' - }) + $.fn.popover.defaults = $.extend({}, $.fn.tooltip.defaults, { + placement: 'right' + , + trigger: 'click' + , + content: '' + , + template: '

' + }) - /* POPOVER NO CONFLICT - * =================== */ + /* POPOVER NO CONFLICT + * =================== */ - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } -}(window.jQuery);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-scrollspy.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= @@ -1435,146 +1454,149 @@ !function ($) { - "use strict"; // jshint ;_; - + "use strict"; // jshint ;_; - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } + /* SCROLLSPY CLASS DEFINITION + * ========================== */ - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) + function ScrollSpy(element, options) { + var process = $.proxy(this.process, this) + , $element = $(element).is('body') ? $(window) : $(element) + , href + this.options = $.extend({}, $.fn.scrollspy.defaults, options) + this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.$body = $('body') + this.refresh() + this.process() + } - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && $href.length - && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } + ScrollSpy.prototype = { + + constructor: ScrollSpy + + , refresh: function () { + var self = this + , $targets + + this.offsets = $([]) + this.targets = $([]) + + $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + , href = $el.data('target') || $el.attr('href') + , $href = /^#\w/.test(href) && $(href) + return ( $href + && $href.length + && [[$href.position().top + self.$scrollElement.scrollTop(), href]] ) || null + }) + .sort(function (a, b) { + return a[0] - b[0] + }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i + , process: function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + , maxScroll = scrollHeight - this.$scrollElement.height() + , offsets = this.offsets + , targets = this.targets + , activeTarget = this.activeTarget + , i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) + && this.activate(i) + } - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate(targets[i]) + } } - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } + , activate: function (target) { + var active + , selector - , activate: function (target) { - var active - , selector + this.activeTarget = target - this.activeTarget = target + $(this.selector) + .parent('.active') + .removeClass('active') - $(this.selector) - .parent('.active') - .removeClass('active') + selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' + active = $(selector) + .parent('li') + .addClass('active') - active = $(selector) - .parent('li') - .addClass('active') + if (active.parent('.dropdown-menu').length) { + active = active.closest('li.dropdown').addClass('active') + } - if (active.parent('.dropdown-menu').length) { - active = active.closest('li.dropdown').addClass('active') + active.trigger('activate') } - active.trigger('activate') - } + } - } + /* SCROLLSPY PLUGIN DEFINITION + * =========================== */ - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.scrollspy - - $.fn.scrollspy = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } + var old = $.fn.scrollspy - $.fn.scrollspy.Constructor = ScrollSpy + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('scrollspy') + , options = typeof option == 'object' && option + if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.scrollspy.defaults = { - offset: 10 - } + $.fn.scrollspy.Constructor = ScrollSpy + $.fn.scrollspy.defaults = { + offset: 10 + } - /* SCROLLSPY NO CONFLICT - * ===================== */ - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } + /* SCROLLSPY NO CONFLICT + * ===================== */ + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } - /* SCROLLSPY DATA-API - * ================== */ + /* SCROLLSPY DATA-API + * ================== */ - $(window).on('load', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) }) - }) -}(window.jQuery);/* ======================================================== +}(window.jQuery); +/* ======================================================== * bootstrap-tab.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== @@ -1596,128 +1618,129 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* TAB CLASS DEFINITION - * ==================== */ + /* TAB CLASS DEFINITION + * ==================== */ - var Tab = function (element) { - this.element = $(element) - } + var Tab = function (element) { + this.element = $(element) + } - Tab.prototype = { + Tab.prototype = { - constructor: Tab + constructor: Tab - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e + , show: function () { + var $this = this.element + , $ul = $this.closest('ul:not(.dropdown-menu)') + , selector = $this.attr('data-target') + , previous + , $target + , e - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } - if ( $this.parent('li').hasClass('active') ) return + if ($this.parent('li').hasClass('active')) return - previous = $ul.find('.active:last a')[0] + previous = $ul.find('.active:last a')[0] - e = $.Event('show', { - relatedTarget: previous - }) + e = $.Event('show', { + relatedTarget: previous + }) - $this.trigger(e) + $this.trigger(e) - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return - $target = $(selector) + $target = $(selector) - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown' + , relatedTarget: previous + }) + }) + } - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') + , activate: function (element, container, callback) { + var $active = container.find('> .active') + , transition = callback + && $.support.transition + && $active.hasClass('fade') - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') - element.addClass('active') + element.addClass('active') - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } - callback && callback() - } + callback && callback() + } - transition ? - $active.one($.support.transition.end, next) : - next() + transition ? + $active.one($.support.transition.end, next) : + next() - $active.removeClass('in') + $active.removeClass('in') + } } - } - /* TAB PLUGIN DEFINITION - * ===================== */ + /* TAB PLUGIN DEFINITION + * ===================== */ - var old = $.fn.tab + var old = $.fn.tab - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } + $.fn.tab = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tab') + if (!data) $this.data('tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.tab.Constructor = Tab + $.fn.tab.Constructor = Tab - /* TAB NO CONFLICT - * =============== */ + /* TAB NO CONFLICT + * =============== */ - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } - /* TAB DATA-API - * ============ */ + /* TAB DATA-API + * ============ */ - $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) + $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) -}(window.jQuery);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-typeahead.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= @@ -1737,307 +1760,309 @@ * ============================================================ */ -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ +!function ($) { - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.source = this.options.source - this.$menu = $(this.options.menu) - this.shown = false - this.listen() - } + "use strict"; // jshint ;_; - Typeahead.prototype = { - constructor: Typeahead + /* TYPEAHEAD PUBLIC CLASS DEFINITION + * ================================= */ - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() + var Typeahead = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.typeahead.defaults, options) + this.matcher = this.options.matcher || this.matcher + this.sorter = this.options.sorter || this.sorter + this.highlighter = this.options.highlighter || this.highlighter + this.updater = this.options.updater || this.updater + this.source = this.options.source + this.$menu = $(this.options.menu) + this.shown = false + this.listen() } - , updater: function (item) { - return item - } + Typeahead.prototype = { - , show: function () { - var pos = $.extend({}, this.$element.position(), { - height: this.$element[0].offsetHeight - }) + constructor: Typeahead - this.$menu - .insertAfter(this.$element) - .css({ - top: pos.top + pos.height - , left: pos.left - }) - .show() + , select: function () { + var val = this.$menu.find('.active').attr('data-value') + this.$element + .val(this.updater(val)) + .change() + return this.hide() + } - this.shown = true - return this - } + , updater: function (item) { + return item + } - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } + , show: function () { + var pos = $.extend({}, this.$element.position(), { + height: this.$element[0].offsetHeight + }) + + this.$menu + .insertAfter(this.$element) + .css({ + top: pos.top + pos.height + , left: pos.left + }) + .show() + + this.shown = true + return this + } - , lookup: function (event) { - var items + , hide: function () { + this.$menu.hide() + this.shown = false + return this + } - this.query = this.$element.val() + , lookup: function (event) { + var items - if (!this.query || this.query.length < this.options.minLength) { - return this.shown ? this.hide() : this - } + this.query = this.$element.val() - items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source + if (!this.query || this.query.length < this.options.minLength) { + return this.shown ? this.hide() : this + } - return items ? this.process(items) : this - } + items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source - , process: function (items) { - var that = this + return items ? this.process(items) : this + } - items = $.grep(items, function (item) { - return that.matcher(item) - }) + , process: function (items) { + var that = this - items = this.sorter(items) + items = $.grep(items, function (item) { + return that.matcher(item) + }) - if (!items.length) { - return this.shown ? this.hide() : this - } + items = this.sorter(items) - return this.render(items.slice(0, this.options.items)).show() - } + if (!items.length) { + return this.shown ? this.hide() : this + } - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } + return this.render(items.slice(0, this.options.items)).show() + } - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item + , matcher: function (item) { + return ~item.toLowerCase().indexOf(this.query.toLowerCase()) + } - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } + , sorter: function (items) { + var beginswith = [] + , caseSensitive = [] + , caseInsensitive = [] + , item - return beginswith.concat(caseSensitive, caseInsensitive) - } + while (item = items.shift()) { + if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) + else if (~item.indexOf(this.query)) caseSensitive.push(item) + else caseInsensitive.push(item) + } - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } + return beginswith.concat(caseSensitive, caseInsensitive) + } - , render: function (items) { - var that = this + , highlighter: function (item) { + var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') + return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { + return '' + match + '' + }) + } - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) + , render: function (items) { + var that = this - items.first().addClass('active') - this.$menu.html(items) - return this - } + items = $(items).map(function (i, item) { + i = $(that.options.item).attr('data-value', item) + i.find('a').html(that.highlighter(item)) + return i[0] + }) - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() + items.first().addClass('active') + this.$menu.html(items) + return this + } - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } + , next: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , next = active.next() - next.addClass('active') - } + if (!next.length) { + next = $(this.$menu.find('li')[0]) + } - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() + next.addClass('active') + } - if (!prev.length) { - prev = this.$menu.find('li').last() - } + , prev: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , prev = active.prev() - prev.addClass('active') - } + if (!prev.length) { + prev = this.$menu.find('li').last() + } - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) + prev.addClass('active') + } - if (this.eventSupported('keydown')) { - this.$element.on('keydown', $.proxy(this.keydown, this)) - } + , listen: function () { + this.$element + .on('blur', $.proxy(this.blur, this)) + .on('keypress', $.proxy(this.keypress, this)) + .on('keyup', $.proxy(this.keyup, this)) - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } + if (this.eventSupported('keydown')) { + this.$element.on('keydown', $.proxy(this.keydown, this)) + } - , eventSupported: function(eventName) { - var isSupported = eventName in this.$element - if (!isSupported) { - this.$element.setAttribute(eventName, 'return;') - isSupported = typeof this.$element[eventName] === 'function' - } - return isSupported - } + this.$menu + .on('click', $.proxy(this.click, this)) + .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + } - , move: function (e) { - if (!this.shown) return + , eventSupported: function (eventName) { + var isSupported = eventName in this.$element + if (!isSupported) { + this.$element.setAttribute(eventName, 'return;') + isSupported = typeof this.$element[eventName] === 'function' + } + return isSupported + } - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break + , move: function (e) { + if (!this.shown) return + + switch (e.keyCode) { + case 9: // tab + case 13: // enter + case 27: // escape + e.preventDefault() + break + + case 38: // up arrow + e.preventDefault() + this.prev() + break + + case 40: // down arrow + e.preventDefault() + this.next() + break + } - case 38: // up arrow - e.preventDefault() - this.prev() - break + e.stopPropagation() + } - case 40: // down arrow - e.preventDefault() - this.next() - break - } + , keydown: function (e) { + this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40, 38, 9, 13, 27]) + this.move(e) + } - e.stopPropagation() - } + , keypress: function (e) { + if (this.suppressKeyPressRepeat) return + this.move(e) + } - , keydown: function (e) { - this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) - this.move(e) - } + , keyup: function (e) { + switch (e.keyCode) { + case 40: // down arrow + case 38: // up arrow + case 16: // shift + case 17: // ctrl + case 18: // alt + break + + case 9: // tab + case 13: // enter + if (!this.shown) return + this.select() + break + + case 27: // escape + if (!this.shown) return + this.hide() + break + + default: + this.lookup() + } - , keypress: function (e) { - if (this.suppressKeyPressRepeat) return - this.move(e) - } + e.stopPropagation() + e.preventDefault() + } - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - case 16: // shift - case 17: // ctrl - case 18: // alt - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } + , blur: function (e) { + var that = this + setTimeout(function () { + that.hide() + }, 150) + } - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } + , click: function (e) { + e.stopPropagation() + e.preventDefault() + this.select() + } - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } + , mouseenter: function (e) { + this.$menu.find('.active').removeClass('active') + $(e.currentTarget).addClass('active') + } - } + } - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ + /* TYPEAHEAD PLUGIN DEFINITION + * =========================== */ - var old = $.fn.typeahead + var old = $.fn.typeahead - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } + $.fn.typeahead = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('typeahead') + , options = typeof option == 'object' && option + if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - , minLength: 1 - } + $.fn.typeahead.defaults = { + source: [] + , items: 8 + , menu: '
      ' + , item: '
      • ' + , minLength: 1 + } - $.fn.typeahead.Constructor = Typeahead + $.fn.typeahead.Constructor = Typeahead - /* TYPEAHEAD NO CONFLICT - * =================== */ + /* TYPEAHEAD NO CONFLICT + * =================== */ - $.fn.typeahead.noConflict = function () { - $.fn.typeahead = old - return this - } + $.fn.typeahead.noConflict = function () { + $.fn.typeahead = old + return this + } - /* TYPEAHEAD DATA-API - * ================== */ + /* TYPEAHEAD DATA-API + * ================== */ - $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) + $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) + }) }(window.jQuery); /* ========================================================== @@ -2062,98 +2087,100 @@ !function ($) { - "use strict"; // jshint ;_; + "use strict"; // jshint ;_; - /* AFFIX CLASS DEFINITION - * ====================== */ + /* AFFIX CLASS DEFINITION + * ====================== */ - var Affix = function (element, options) { - this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window) - .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) - this.$element = $(element) - this.checkPosition() - } + var Affix = function (element, options) { + this.options = $.extend({}, $.fn.affix.defaults, options) + this.$window = $(window) + .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.affix.data-api', $.proxy(function () { + setTimeout($.proxy(this.checkPosition, this), 1) + }, this)) + this.$element = $(element) + this.checkPosition() + } - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return - var scrollHeight = $(document).height() - , scrollTop = this.$window.scrollTop() - , position = this.$element.offset() - , offset = this.options.offset - , offsetBottom = offset.bottom - , offsetTop = offset.top - , reset = 'affix affix-top affix-bottom' - , affix + var scrollHeight = $(document).height() + , scrollTop = this.$window.scrollTop() + , position = this.$element.offset() + , offset = this.options.offset + , offsetBottom = offset.bottom + , offsetTop = offset.top + , reset = 'affix affix-top affix-bottom' + , affix - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top() + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() - affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? - false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? - 'bottom' : offsetTop != null && scrollTop <= offsetTop ? - 'top' : false + affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? + false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? + 'bottom' : offsetTop != null && scrollTop <= offsetTop ? + 'top' : false - if (this.affixed === affix) return + if (this.affixed === affix) return - this.affixed = affix - this.unpin = affix == 'bottom' ? position.top - scrollTop : null + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null - this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) - } + this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) + } - /* AFFIX PLUGIN DEFINITION - * ======================= */ + /* AFFIX PLUGIN DEFINITION + * ======================= */ - var old = $.fn.affix + var old = $.fn.affix - $.fn.affix = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('affix') - , options = typeof option == 'object' && option - if (!data) $this.data('affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('affix') + , options = typeof option == 'object' && option + if (!data) $this.data('affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } - $.fn.affix.Constructor = Affix + $.fn.affix.Constructor = Affix - $.fn.affix.defaults = { - offset: 0 - } + $.fn.affix.defaults = { + offset: 0 + } - /* AFFIX NO CONFLICT - * ================= */ + /* AFFIX NO CONFLICT + * ================= */ - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } - /* AFFIX DATA-API - * ============== */ + /* AFFIX DATA-API + * ============== */ - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - , data = $spy.data() + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + , data = $spy.data() - data.offset = data.offset || {} + data.offset = data.offset || {} - data.offsetBottom && (data.offset.bottom = data.offsetBottom) - data.offsetTop && (data.offset.top = data.offsetTop) + data.offsetBottom && (data.offset.bottom = data.offsetBottom) + data.offsetTop && (data.offset.top = data.offsetTop) - $spy.affix(data) + $spy.affix(data) + }) }) - }) }(window.jQuery); \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js index 38837795279..868f62001bf 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js +++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js @@ -1,2 +1,2803 @@ /*! jQuery v1.8.3 jquery.com | jquery.org/license */ -(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write(""),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t
      a",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="
      t
      ",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="
      ",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;ti.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="
      ",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="

      ",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t0)for(i=r;i=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*\s*$/g,Nt={option:[1,""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X
      ","
      "]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]===""&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("
      ").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window); \ No newline at end of file +(function (e, t) { + function _(e) { + var t = M[e] = {}; + return v.each(e.split(y), function (e, n) { + t[n] = !0 + }), t + } + + function H(e, n, r) { + if (r === t && e.nodeType === 1) { + var i = "data-" + n.replace(P, "-$1").toLowerCase(); + r = e.getAttribute(i); + if (typeof r == "string") { + try { + r = r === "true" ? !0 : r === "false" ? !1 : r === "null" ? null : +r + "" === r ? +r : D.test(r) ? v.parseJSON(r) : r + } catch (s) { + } + v.data(e, n, r) + } else r = t + } + return r + } + + function B(e) { + var t; + for (t in e) { + if (t === "data" && v.isEmptyObject(e[t]))continue; + if (t !== "toJSON")return !1 + } + return !0 + } + + function et() { + return !1 + } + + function tt() { + return !0 + } + + function ut(e) { + return !e || !e.parentNode || e.parentNode.nodeType === 11 + } + + function at(e, t) { + do e = e[t]; while (e && e.nodeType !== 1); + return e + } + + function ft(e, t, n) { + t = t || 0; + if (v.isFunction(t))return v.grep(e, function (e, r) { + var i = !!t.call(e, r, e); + return i === n + }); + if (t.nodeType)return v.grep(e, function (e, r) { + return e === t === n + }); + if (typeof t == "string") { + var r = v.grep(e, function (e) { + return e.nodeType === 1 + }); + if (it.test(t))return v.filter(t, r, !n); + t = v.filter(t, r) + } + return v.grep(e, function (e, r) { + return v.inArray(e, t) >= 0 === n + }) + } + + function lt(e) { + var t = ct.split("|"), n = e.createDocumentFragment(); + if (n.createElement)while (t.length)n.createElement(t.pop()); + return n + } + + function Lt(e, t) { + return e.getElementsByTagName(t)[0] || e.appendChild(e.ownerDocument.createElement(t)) + } + + function At(e, t) { + if (t.nodeType !== 1 || !v.hasData(e))return; + var n, r, i, s = v._data(e), o = v._data(t, s), u = s.events; + if (u) { + delete o.handle, o.events = {}; + for (n in u)for (r = 0, i = u[n].length; r < i; r++)v.event.add(t, n, u[n][r]) + } + o.data && (o.data = v.extend({}, o.data)) + } + + function Ot(e, t) { + var n; + if (t.nodeType !== 1)return; + t.clearAttributes && t.clearAttributes(), t.mergeAttributes && t.mergeAttributes(e), n = t.nodeName.toLowerCase(), n === "object" ? (t.parentNode && (t.outerHTML = e.outerHTML), v.support.html5Clone && e.innerHTML && !v.trim(t.innerHTML) && (t.innerHTML = e.innerHTML)) : n === "input" && Et.test(e.type) ? (t.defaultChecked = t.checked = e.checked, t.value !== e.value && (t.value = e.value)) : n === "option" ? t.selected = e.defaultSelected : n === "input" || n === "textarea" ? t.defaultValue = e.defaultValue : n === "script" && t.text !== e.text && (t.text = e.text), t.removeAttribute(v.expando) + } + + function Mt(e) { + return typeof e.getElementsByTagName != "undefined" ? e.getElementsByTagName("*") : typeof e.querySelectorAll != "undefined" ? e.querySelectorAll("*") : [] + } + + function _t(e) { + Et.test(e.type) && (e.defaultChecked = e.checked) + } + + function Qt(e, t) { + if (t in e)return t; + var n = t.charAt(0).toUpperCase() + t.slice(1), r = t, i = Jt.length; + while (i--) { + t = Jt[i] + n; + if (t in e)return t + } + return r + } + + function Gt(e, t) { + return e = t || e, v.css(e, "display") === "none" || !v.contains(e.ownerDocument, e) + } + + function Yt(e, t) { + var n, r, i = [], s = 0, o = e.length; + for (; s < o; s++) { + n = e[s]; + if (!n.style)continue; + i[s] = v._data(n, "olddisplay"), t ? (!i[s] && n.style.display === "none" && (n.style.display = ""), n.style.display === "" && Gt(n) && (i[s] = v._data(n, "olddisplay", nn(n.nodeName)))) : (r = Dt(n, "display"), !i[s] && r !== "none" && v._data(n, "olddisplay", r)) + } + for (s = 0; s < o; s++) { + n = e[s]; + if (!n.style)continue; + if (!t || n.style.display === "none" || n.style.display === "")n.style.display = t ? i[s] || "" : "none" + } + return e + } + + function Zt(e, t, n) { + var r = Rt.exec(t); + return r ? Math.max(0, r[1] - (n || 0)) + (r[2] || "px") : t + } + + function en(e, t, n, r) { + var i = n === (r ? "border" : "content") ? 4 : t === "width" ? 1 : 0, s = 0; + for (; i < 4; i += 2)n === "margin" && (s += v.css(e, n + $t[i], !0)), r ? (n === "content" && (s -= parseFloat(Dt(e, "padding" + $t[i])) || 0), n !== "margin" && (s -= parseFloat(Dt(e, "border" + $t[i] + "Width")) || 0)) : (s += parseFloat(Dt(e, "padding" + $t[i])) || 0, n !== "padding" && (s += parseFloat(Dt(e, "border" + $t[i] + "Width")) || 0)); + return s + } + + function tn(e, t, n) { + var r = t === "width" ? e.offsetWidth : e.offsetHeight, i = !0, s = v.support.boxSizing && v.css(e, "boxSizing") === "border-box"; + if (r <= 0 || r == null) { + r = Dt(e, t); + if (r < 0 || r == null)r = e.style[t]; + if (Ut.test(r))return r; + i = s && (v.support.boxSizingReliable || r === e.style[t]), r = parseFloat(r) || 0 + } + return r + en(e, t, n || (s ? "border" : "content"), i) + "px" + } + + function nn(e) { + if (Wt[e])return Wt[e]; + var t = v("<" + e + ">").appendTo(i.body), n = t.css("display"); + t.remove(); + if (n === "none" || n === "") { + Pt = i.body.appendChild(Pt || v.extend(i.createElement("iframe"), {frameBorder: 0, width: 0, height: 0})); + if (!Ht || !Pt.createElement)Ht = (Pt.contentWindow || Pt.contentDocument).document, Ht.write(""), Ht.close(); + t = Ht.body.appendChild(Ht.createElement(e)), n = Dt(t, "display"), i.body.removeChild(Pt) + } + return Wt[e] = n, n + } + + function fn(e, t, n, r) { + var i; + if (v.isArray(t))v.each(t, function (t, i) { + n || sn.test(e) ? r(e, i) : fn(e + "[" + (typeof i == "object" ? t : "") + "]", i, n, r) + }); else if (!n && v.type(t) === "object")for (i in t)fn(e + "[" + i + "]", t[i], n, r); else r(e, t) + } + + function Cn(e) { + return function (t, n) { + typeof t != "string" && (n = t, t = "*"); + var r, i, s, o = t.toLowerCase().split(y), u = 0, a = o.length; + if (v.isFunction(n))for (; u < a; u++)r = o[u], s = /^\+/.test(r), s && (r = r.substr(1) || "*"), i = e[r] = e[r] || [], i[s ? "unshift" : "push"](n) + } + } + + function kn(e, n, r, i, s, o) { + s = s || n.dataTypes[0], o = o || {}, o[s] = !0; + var u, a = e[s], f = 0, l = a ? a.length : 0, c = e === Sn; + for (; f < l && (c || !u); f++)u = a[f](n, r, i), typeof u == "string" && (!c || o[u] ? u = t : (n.dataTypes.unshift(u), u = kn(e, n, r, i, u, o))); + return (c || !u) && !o["*"] && (u = kn(e, n, r, i, "*", o)), u + } + + function Ln(e, n) { + var r, i, s = v.ajaxSettings.flatOptions || {}; + for (r in n)n[r] !== t && ((s[r] ? e : i || (i = {}))[r] = n[r]); + i && v.extend(!0, e, i) + } + + function An(e, n, r) { + var i, s, o, u, a = e.contents, f = e.dataTypes, l = e.responseFields; + for (s in l)s in r && (n[l[s]] = r[s]); + while (f[0] === "*")f.shift(), i === t && (i = e.mimeType || n.getResponseHeader("content-type")); + if (i)for (s in a)if (a[s] && a[s].test(i)) { + f.unshift(s); + break + } + if (f[0]in r)o = f[0]; else { + for (s in r) { + if (!f[0] || e.converters[s + " " + f[0]]) { + o = s; + break + } + u || (u = s) + } + o = o || u + } + if (o)return o !== f[0] && f.unshift(o), r[o] + } + + function On(e, t) { + var n, r, i, s, o = e.dataTypes.slice(), u = o[0], a = {}, f = 0; + e.dataFilter && (t = e.dataFilter(t, e.dataType)); + if (o[1])for (n in e.converters)a[n.toLowerCase()] = e.converters[n]; + for (; i = o[++f];)if (i !== "*") { + if (u !== "*" && u !== i) { + n = a[u + " " + i] || a["* " + i]; + if (!n)for (r in a) { + s = r.split(" "); + if (s[1] === i) { + n = a[u + " " + s[0]] || a["* " + s[0]]; + if (n) { + n === !0 ? n = a[r] : a[r] !== !0 && (i = s[0], o.splice(f--, 0, i)); + break + } + } + } + if (n !== !0)if (n && e["throws"])t = n(t); else try { + t = n(t) + } catch (l) { + return {state: "parsererror", error: n ? l : "No conversion from " + u + " to " + i} + } + } + u = i + } + return {state: "success", data: t} + } + + function Fn() { + try { + return new e.XMLHttpRequest + } catch (t) { + } + } + + function In() { + try { + return new e.ActiveXObject("Microsoft.XMLHTTP") + } catch (t) { + } + } + + function $n() { + return setTimeout(function () { + qn = t + }, 0), qn = v.now() + } + + function Jn(e, t) { + v.each(t, function (t, n) { + var r = (Vn[t] || []).concat(Vn["*"]), i = 0, s = r.length; + for (; i < s; i++)if (r[i].call(e, t, n))return + }) + } + + function Kn(e, t, n) { + var r, i = 0, s = 0, o = Xn.length, u = v.Deferred().always(function () { + delete a.elem + }), a = function () { + var t = qn || $n(), n = Math.max(0, f.startTime + f.duration - t), r = n / f.duration || 0, i = 1 - r, s = 0, o = f.tweens.length; + for (; s < o; s++)f.tweens[s].run(i); + return u.notifyWith(e, [f, i, n]), i < 1 && o ? n : (u.resolveWith(e, [f]), !1) + }, f = u.promise({ + elem: e, + props: v.extend({}, t), + opts: v.extend(!0, {specialEasing: {}}, n), + originalProperties: t, + originalOptions: n, + startTime: qn || $n(), + duration: n.duration, + tweens: [], + createTween: function (t, n, r) { + var i = v.Tween(e, f.opts, t, n, f.opts.specialEasing[t] || f.opts.easing); + return f.tweens.push(i), i + }, + stop: function (t) { + var n = 0, r = t ? f.tweens.length : 0; + for (; n < r; n++)f.tweens[n].run(1); + return t ? u.resolveWith(e, [f, t]) : u.rejectWith(e, [f, t]), this + } + }), l = f.props; + Qn(l, f.opts.specialEasing); + for (; i < o; i++) { + r = Xn[i].call(f, e, l, f.opts); + if (r)return r + } + return Jn(f, l), v.isFunction(f.opts.start) && f.opts.start.call(e, f), v.fx.timer(v.extend(a, { + anim: f, + queue: f.opts.queue, + elem: e + })), f.progress(f.opts.progress).done(f.opts.done, f.opts.complete).fail(f.opts.fail).always(f.opts.always) + } + + function Qn(e, t) { + var n, r, i, s, o; + for (n in e) { + r = v.camelCase(n), i = t[r], s = e[n], v.isArray(s) && (i = s[1], s = e[n] = s[0]), n !== r && (e[r] = s, delete e[n]), o = v.cssHooks[r]; + if (o && "expand"in o) { + s = o.expand(s), delete e[r]; + for (n in s)n in e || (e[n] = s[n], t[n] = i) + } else t[r] = i + } + } + + function Gn(e, t, n) { + var r, i, s, o, u, a, f, l, c, h = this, p = e.style, d = {}, m = [], g = e.nodeType && Gt(e); + n.queue || (l = v._queueHooks(e, "fx"), l.unqueued == null && (l.unqueued = 0, c = l.empty.fire, l.empty.fire = function () { + l.unqueued || c() + }), l.unqueued++, h.always(function () { + h.always(function () { + l.unqueued--, v.queue(e, "fx").length || l.empty.fire() + }) + })), e.nodeType === 1 && ("height"in t || "width"in t) && (n.overflow = [p.overflow, p.overflowX, p.overflowY], v.css(e, "display") === "inline" && v.css(e, "float") === "none" && (!v.support.inlineBlockNeedsLayout || nn(e.nodeName) === "inline" ? p.display = "inline-block" : p.zoom = 1)), n.overflow && (p.overflow = "hidden", v.support.shrinkWrapBlocks || h.done(function () { + p.overflow = n.overflow[0], p.overflowX = n.overflow[1], p.overflowY = n.overflow[2] + })); + for (r in t) { + s = t[r]; + if (Un.exec(s)) { + delete t[r], a = a || s === "toggle"; + if (s === (g ? "hide" : "show"))continue; + m.push(r) + } + } + o = m.length; + if (o) { + u = v._data(e, "fxshow") || v._data(e, "fxshow", {}), "hidden"in u && (g = u.hidden), a && (u.hidden = !g), g ? v(e).show() : h.done(function () { + v(e).hide() + }), h.done(function () { + var t; + v.removeData(e, "fxshow", !0); + for (t in d)v.style(e, t, d[t]) + }); + for (r = 0; r < o; r++)i = m[r], f = h.createTween(i, g ? u[i] : 0), d[i] = u[i] || v.style(e, i), i in u || (u[i] = f.start, g && (f.end = f.start, f.start = i === "width" || i === "height" ? 1 : 0)) + } + } + + function Yn(e, t, n, r, i) { + return new Yn.prototype.init(e, t, n, r, i) + } + + function Zn(e, t) { + var n, r = {height: e}, i = 0; + t = t ? 1 : 0; + for (; i < 4; i += 2 - t)n = $t[i], r["margin" + n] = r["padding" + n] = e; + return t && (r.opacity = r.width = e), r + } + + function tr(e) { + return v.isWindow(e) ? e : e.nodeType === 9 ? e.defaultView || e.parentWindow : !1 + } + + var n, r, i = e.document, s = e.location, o = e.navigator, u = e.jQuery, a = e.$, f = Array.prototype.push, l = Array.prototype.slice, c = Array.prototype.indexOf, h = Object.prototype.toString, p = Object.prototype.hasOwnProperty, d = String.prototype.trim, v = function (e, t) { + return new v.fn.init(e, t, n) + }, m = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source, g = /\S/, y = /\s+/, b = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, w = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, E = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, S = /^[\],:{}\s]*$/, x = /(?:^|:|,)(?:\s*\[)+/g, T = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, N = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g, C = /^-ms-/, k = /-([\da-z])/gi, L = function (e, t) { + return (t + "").toUpperCase() + }, A = function () { + i.addEventListener ? (i.removeEventListener("DOMContentLoaded", A, !1), v.ready()) : i.readyState === "complete" && (i.detachEvent("onreadystatechange", A), v.ready()) + }, O = {}; + v.fn = v.prototype = { + constructor: v, init: function (e, n, r) { + var s, o, u, a; + if (!e)return this; + if (e.nodeType)return this.context = this[0] = e, this.length = 1, this; + if (typeof e == "string") { + e.charAt(0) === "<" && e.charAt(e.length - 1) === ">" && e.length >= 3 ? s = [null, e, null] : s = w.exec(e); + if (s && (s[1] || !n)) { + if (s[1])return n = n instanceof v ? n[0] : n, a = n && n.nodeType ? n.ownerDocument || n : i, e = v.parseHTML(s[1], a, !0), E.test(s[1]) && v.isPlainObject(n) && this.attr.call(e, n, !0), v.merge(this, e); + o = i.getElementById(s[2]); + if (o && o.parentNode) { + if (o.id !== s[2])return r.find(e); + this.length = 1, this[0] = o + } + return this.context = i, this.selector = e, this + } + return !n || n.jquery ? (n || r).find(e) : this.constructor(n).find(e) + } + return v.isFunction(e) ? r.ready(e) : (e.selector !== t && (this.selector = e.selector, this.context = e.context), v.makeArray(e, this)) + }, selector: "", jquery: "1.8.3", length: 0, size: function () { + return this.length + }, toArray: function () { + return l.call(this) + }, get: function (e) { + return e == null ? this.toArray() : e < 0 ? this[this.length + e] : this[e] + }, pushStack: function (e, t, n) { + var r = v.merge(this.constructor(), e); + return r.prevObject = this, r.context = this.context, t === "find" ? r.selector = this.selector + (this.selector ? " " : "") + n : t && (r.selector = this.selector + "." + t + "(" + n + ")"), r + }, each: function (e, t) { + return v.each(this, e, t) + }, ready: function (e) { + return v.ready.promise().done(e), this + }, eq: function (e) { + return e = +e, e === -1 ? this.slice(e) : this.slice(e, e + 1) + }, first: function () { + return this.eq(0) + }, last: function () { + return this.eq(-1) + }, slice: function () { + return this.pushStack(l.apply(this, arguments), "slice", l.call(arguments).join(",")) + }, map: function (e) { + return this.pushStack(v.map(this, function (t, n) { + return e.call(t, n, t) + })) + }, end: function () { + return this.prevObject || this.constructor(null) + }, push: f, sort: [].sort, splice: [].splice + }, v.fn.init.prototype = v.fn, v.extend = v.fn.extend = function () { + var e, n, r, i, s, o, u = arguments[0] || {}, a = 1, f = arguments.length, l = !1; + typeof u == "boolean" && (l = u, u = arguments[1] || {}, a = 2), typeof u != "object" && !v.isFunction(u) && (u = {}), f === a && (u = this, --a); + for (; a < f; a++)if ((e = arguments[a]) != null)for (n in e) { + r = u[n], i = e[n]; + if (u === i)continue; + l && i && (v.isPlainObject(i) || (s = v.isArray(i))) ? (s ? (s = !1, o = r && v.isArray(r) ? r : []) : o = r && v.isPlainObject(r) ? r : {}, u[n] = v.extend(l, o, i)) : i !== t && (u[n] = i) + } + return u + }, v.extend({ + noConflict: function (t) { + return e.$ === v && (e.$ = a), t && e.jQuery === v && (e.jQuery = u), v + }, isReady: !1, readyWait: 1, holdReady: function (e) { + e ? v.readyWait++ : v.ready(!0) + }, ready: function (e) { + if (e === !0 ? --v.readyWait : v.isReady)return; + if (!i.body)return setTimeout(v.ready, 1); + v.isReady = !0; + if (e !== !0 && --v.readyWait > 0)return; + r.resolveWith(i, [v]), v.fn.trigger && v(i).trigger("ready").off("ready") + }, isFunction: function (e) { + return v.type(e) === "function" + }, isArray: Array.isArray || function (e) { + return v.type(e) === "array" + }, isWindow: function (e) { + return e != null && e == e.window + }, isNumeric: function (e) { + return !isNaN(parseFloat(e)) && isFinite(e) + }, type: function (e) { + return e == null ? String(e) : O[h.call(e)] || "object" + }, isPlainObject: function (e) { + if (!e || v.type(e) !== "object" || e.nodeType || v.isWindow(e))return !1; + try { + if (e.constructor && !p.call(e, "constructor") && !p.call(e.constructor.prototype, "isPrototypeOf"))return !1 + } catch (n) { + return !1 + } + var r; + for (r in e); + return r === t || p.call(e, r) + }, isEmptyObject: function (e) { + var t; + for (t in e)return !1; + return !0 + }, error: function (e) { + throw new Error(e) + }, parseHTML: function (e, t, n) { + var r; + return !e || typeof e != "string" ? null : (typeof t == "boolean" && (n = t, t = 0), t = t || i, (r = E.exec(e)) ? [t.createElement(r[1])] : (r = v.buildFragment([e], t, n ? null : []), v.merge([], (r.cacheable ? v.clone(r.fragment) : r.fragment).childNodes))) + }, parseJSON: function (t) { + if (!t || typeof t != "string")return null; + t = v.trim(t); + if (e.JSON && e.JSON.parse)return e.JSON.parse(t); + if (S.test(t.replace(T, "@").replace(N, "]").replace(x, "")))return (new Function("return " + t))(); + v.error("Invalid JSON: " + t) + }, parseXML: function (n) { + var r, i; + if (!n || typeof n != "string")return null; + try { + e.DOMParser ? (i = new DOMParser, r = i.parseFromString(n, "text/xml")) : (r = new ActiveXObject("Microsoft.XMLDOM"), r.async = "false", r.loadXML(n)) + } catch (s) { + r = t + } + return (!r || !r.documentElement || r.getElementsByTagName("parsererror").length) && v.error("Invalid XML: " + n), r + }, noop: function () { + }, globalEval: function (t) { + t && g.test(t) && (e.execScript || function (t) { + e.eval.call(e, t) + })(t) + }, camelCase: function (e) { + return e.replace(C, "ms-").replace(k, L) + }, nodeName: function (e, t) { + return e.nodeName && e.nodeName.toLowerCase() === t.toLowerCase() + }, each: function (e, n, r) { + var i, s = 0, o = e.length, u = o === t || v.isFunction(e); + if (r) { + if (u) { + for (i in e)if (n.apply(e[i], r) === !1)break + } else for (; s < o;)if (n.apply(e[s++], r) === !1)break + } else if (u) { + for (i in e)if (n.call(e[i], i, e[i]) === !1)break + } else for (; s < o;)if (n.call(e[s], s, e[s++]) === !1)break; + return e + }, trim: d && !d.call("\ufeff\u00a0") ? function (e) { + return e == null ? "" : d.call(e) + } : function (e) { + return e == null ? "" : (e + "").replace(b, "") + }, makeArray: function (e, t) { + var n, r = t || []; + return e != null && (n = v.type(e), e.length == null || n === "string" || n === "function" || n === "regexp" || v.isWindow(e) ? f.call(r, e) : v.merge(r, e)), r + }, inArray: function (e, t, n) { + var r; + if (t) { + if (c)return c.call(t, e, n); + r = t.length, n = n ? n < 0 ? Math.max(0, r + n) : n : 0; + for (; n < r; n++)if (n in t && t[n] === e)return n + } + return -1 + }, merge: function (e, n) { + var r = n.length, i = e.length, s = 0; + if (typeof r == "number")for (; s < r; s++)e[i++] = n[s]; else while (n[s] !== t)e[i++] = n[s++]; + return e.length = i, e + }, grep: function (e, t, n) { + var r, i = [], s = 0, o = e.length; + n = !!n; + for (; s < o; s++)r = !!t(e[s], s), n !== r && i.push(e[s]); + return i + }, map: function (e, n, r) { + var i, s, o = [], u = 0, a = e.length, f = e instanceof v || a !== t && typeof a == "number" && (a > 0 && e[0] && e[a - 1] || a === 0 || v.isArray(e)); + if (f)for (; u < a; u++)i = n(e[u], u, r), i != null && (o[o.length] = i); else for (s in e)i = n(e[s], s, r), i != null && (o[o.length] = i); + return o.concat.apply([], o) + }, guid: 1, proxy: function (e, n) { + var r, i, s; + return typeof n == "string" && (r = e[n], n = e, e = r), v.isFunction(e) ? (i = l.call(arguments, 2), s = function () { + return e.apply(n, i.concat(l.call(arguments))) + }, s.guid = e.guid = e.guid || v.guid++, s) : t + }, access: function (e, n, r, i, s, o, u) { + var a, f = r == null, l = 0, c = e.length; + if (r && typeof r == "object") { + for (l in r)v.access(e, n, l, r[l], 1, o, i); + s = 1 + } else if (i !== t) { + a = u === t && v.isFunction(i), f && (a ? (a = n, n = function (e, t, n) { + return a.call(v(e), n) + }) : (n.call(e, i), n = null)); + if (n)for (; l < c; l++)n(e[l], r, a ? i.call(e[l], l, n(e[l], r)) : i, u); + s = 1 + } + return s ? e : f ? n.call(e) : c ? n(e[0], r) : o + }, now: function () { + return (new Date).getTime() + } + }), v.ready.promise = function (t) { + if (!r) { + r = v.Deferred(); + if (i.readyState === "complete")setTimeout(v.ready, 1); else if (i.addEventListener)i.addEventListener("DOMContentLoaded", A, !1), e.addEventListener("load", v.ready, !1); else { + i.attachEvent("onreadystatechange", A), e.attachEvent("onload", v.ready); + var n = !1; + try { + n = e.frameElement == null && i.documentElement + } catch (s) { + } + n && n.doScroll && function o() { + if (!v.isReady) { + try { + n.doScroll("left") + } catch (e) { + return setTimeout(o, 50) + } + v.ready() + } + }() + } + } + return r.promise(t) + }, v.each("Boolean Number String Function Array Date RegExp Object".split(" "), function (e, t) { + O["[object " + t + "]"] = t.toLowerCase() + }), n = v(i); + var M = {}; + v.Callbacks = function (e) { + e = typeof e == "string" ? M[e] || _(e) : v.extend({}, e); + var n, r, i, s, o, u, a = [], f = !e.once && [], l = function (t) { + n = e.memory && t, r = !0, u = s || 0, s = 0, o = a.length, i = !0; + for (; a && u < o; u++)if (a[u].apply(t[0], t[1]) === !1 && e.stopOnFalse) { + n = !1; + break + } + i = !1, a && (f ? f.length && l(f.shift()) : n ? a = [] : c.disable()) + }, c = { + add: function () { + if (a) { + var t = a.length; + (function r(t) { + v.each(t, function (t, n) { + var i = v.type(n); + i === "function" ? (!e.unique || !c.has(n)) && a.push(n) : n && n.length && i !== "string" && r(n) + }) + })(arguments), i ? o = a.length : n && (s = t, l(n)) + } + return this + }, remove: function () { + return a && v.each(arguments, function (e, t) { + var n; + while ((n = v.inArray(t, a, n)) > -1)a.splice(n, 1), i && (n <= o && o--, n <= u && u--) + }), this + }, has: function (e) { + return v.inArray(e, a) > -1 + }, empty: function () { + return a = [], this + }, disable: function () { + return a = f = n = t, this + }, disabled: function () { + return !a + }, lock: function () { + return f = t, n || c.disable(), this + }, locked: function () { + return !f + }, fireWith: function (e, t) { + return t = t || [], t = [e, t.slice ? t.slice() : t], a && (!r || f) && (i ? f.push(t) : l(t)), this + }, fire: function () { + return c.fireWith(this, arguments), this + }, fired: function () { + return !!r + } + }; + return c + }, v.extend({ + Deferred: function (e) { + var t = [["resolve", "done", v.Callbacks("once memory"), "resolved"], ["reject", "fail", v.Callbacks("once memory"), "rejected"], ["notify", "progress", v.Callbacks("memory")]], n = "pending", r = { + state: function () { + return n + }, always: function () { + return i.done(arguments).fail(arguments), this + }, then: function () { + var e = arguments; + return v.Deferred(function (n) { + v.each(t, function (t, r) { + var s = r[0], o = e[t]; + i[r[1]](v.isFunction(o) ? function () { + var e = o.apply(this, arguments); + e && v.isFunction(e.promise) ? e.promise().done(n.resolve).fail(n.reject).progress(n.notify) : n[s + "With"](this === i ? n : this, [e]) + } : n[s]) + }), e = null + }).promise() + }, promise: function (e) { + return e != null ? v.extend(e, r) : r + } + }, i = {}; + return r.pipe = r.then, v.each(t, function (e, s) { + var o = s[2], u = s[3]; + r[s[1]] = o.add, u && o.add(function () { + n = u + }, t[e ^ 1][2].disable, t[2][2].lock), i[s[0]] = o.fire, i[s[0] + "With"] = o.fireWith + }), r.promise(i), e && e.call(i, i), i + }, when: function (e) { + var t = 0, n = l.call(arguments), r = n.length, i = r !== 1 || e && v.isFunction(e.promise) ? r : 0, s = i === 1 ? e : v.Deferred(), o = function (e, t, n) { + return function (r) { + t[e] = this, n[e] = arguments.length > 1 ? l.call(arguments) : r, n === u ? s.notifyWith(t, n) : --i || s.resolveWith(t, n) + } + }, u, a, f; + if (r > 1) { + u = new Array(r), a = new Array(r), f = new Array(r); + for (; t < r; t++)n[t] && v.isFunction(n[t].promise) ? n[t].promise().done(o(t, f, n)).fail(s.reject).progress(o(t, a, u)) : --i + } + return i || s.resolveWith(f, n), s.promise() + } + }), v.support = function () { + var t, n, r, s, o, u, a, f, l, c, h, p = i.createElement("div"); + p.setAttribute("className", "t"), p.innerHTML = "
      a", n = p.getElementsByTagName("*"), r = p.getElementsByTagName("a")[0]; + if (!n || !r || !n.length)return {}; + s = i.createElement("select"), o = s.appendChild(i.createElement("option")), u = p.getElementsByTagName("input")[0], r.style.cssText = "top:1px;float:left;opacity:.5", t = { + leadingWhitespace: p.firstChild.nodeType === 3, + tbody: !p.getElementsByTagName("tbody").length, + htmlSerialize: !!p.getElementsByTagName("link").length, + style: /top/.test(r.getAttribute("style")), + hrefNormalized: r.getAttribute("href") === "/a", + opacity: /^0.5/.test(r.style.opacity), + cssFloat: !!r.style.cssFloat, + checkOn: u.value === "on", + optSelected: o.selected, + getSetAttribute: p.className !== "t", + enctype: !!i.createElement("form").enctype, + html5Clone: i.createElement("nav").cloneNode(!0).outerHTML !== "<:nav>", + boxModel: i.compatMode === "CSS1Compat", + submitBubbles: !0, + changeBubbles: !0, + focusinBubbles: !1, + deleteExpando: !0, + noCloneEvent: !0, + inlineBlockNeedsLayout: !1, + shrinkWrapBlocks: !1, + reliableMarginRight: !0, + boxSizingReliable: !0, + pixelPosition: !1 + }, u.checked = !0, t.noCloneChecked = u.cloneNode(!0).checked, s.disabled = !0, t.optDisabled = !o.disabled; + try { + delete p.test + } catch (d) { + t.deleteExpando = !1 + } + !p.addEventListener && p.attachEvent && p.fireEvent && (p.attachEvent("onclick", h = function () { + t.noCloneEvent = !1 + }), p.cloneNode(!0).fireEvent("onclick"), p.detachEvent("onclick", h)), u = i.createElement("input"), u.value = "t", u.setAttribute("type", "radio"), t.radioValue = u.value === "t", u.setAttribute("checked", "checked"), u.setAttribute("name", "t"), p.appendChild(u), a = i.createDocumentFragment(), a.appendChild(p.lastChild), t.checkClone = a.cloneNode(!0).cloneNode(!0).lastChild.checked, t.appendChecked = u.checked, a.removeChild(u), a.appendChild(p); + if (p.attachEvent)for (l in{ + submit: !0, + change: !0, + focusin: !0 + })f = "on" + l, c = f in p, c || (p.setAttribute(f, "return;"), c = typeof p[f] == "function"), t[l + "Bubbles"] = c; + return v(function () { + var n, r, s, o, u = "padding:0;margin:0;border:0;display:block;overflow:hidden;", a = i.getElementsByTagName("body")[0]; + if (!a)return; + n = i.createElement("div"), n.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px", a.insertBefore(n, a.firstChild), r = i.createElement("div"), n.appendChild(r), r.innerHTML = "
      t
      ", s = r.getElementsByTagName("td"), s[0].style.cssText = "padding:0;margin:0;border:0;display:none", c = s[0].offsetHeight === 0, s[0].style.display = "", s[1].style.display = "none", t.reliableHiddenOffsets = c && s[0].offsetHeight === 0, r.innerHTML = "", r.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;", t.boxSizing = r.offsetWidth === 4, t.doesNotIncludeMarginInBodyOffset = a.offsetTop !== 1, e.getComputedStyle && (t.pixelPosition = (e.getComputedStyle(r, null) || {}).top !== "1%", t.boxSizingReliable = (e.getComputedStyle(r, null) || {width: "4px"}).width === "4px", o = i.createElement("div"), o.style.cssText = r.style.cssText = u, o.style.marginRight = o.style.width = "0", r.style.width = "1px", r.appendChild(o), t.reliableMarginRight = !parseFloat((e.getComputedStyle(o, null) || {}).marginRight)), typeof r.style.zoom != "undefined" && (r.innerHTML = "", r.style.cssText = u + "width:1px;padding:1px;display:inline;zoom:1", t.inlineBlockNeedsLayout = r.offsetWidth === 3, r.style.display = "block", r.style.overflow = "visible", r.innerHTML = "
      ", r.firstChild.style.width = "5px", t.shrinkWrapBlocks = r.offsetWidth !== 3, n.style.zoom = 1), a.removeChild(n), n = r = s = o = null + }), a.removeChild(p), n = r = s = o = u = a = p = null, t + }(); + var D = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, P = /([A-Z])/g; + v.extend({ + cache: {}, + deletedIds: [], + uuid: 0, + expando: "jQuery" + (v.fn.jquery + Math.random()).replace(/\D/g, ""), + noData: {embed: !0, object: "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", applet: !0}, + hasData: function (e) { + return e = e.nodeType ? v.cache[e[v.expando]] : e[v.expando], !!e && !B(e) + }, + data: function (e, n, r, i) { + if (!v.acceptData(e))return; + var s, o, u = v.expando, a = typeof n == "string", f = e.nodeType, l = f ? v.cache : e, c = f ? e[u] : e[u] && u; + if ((!c || !l[c] || !i && !l[c].data) && a && r === t)return; + c || (f ? e[u] = c = v.deletedIds.pop() || v.guid++ : c = u), l[c] || (l[c] = {}, f || (l[c].toJSON = v.noop)); + if (typeof n == "object" || typeof n == "function")i ? l[c] = v.extend(l[c], n) : l[c].data = v.extend(l[c].data, n); + return s = l[c], i || (s.data || (s.data = {}), s = s.data), r !== t && (s[v.camelCase(n)] = r), a ? (o = s[n], o == null && (o = s[v.camelCase(n)])) : o = s, o + }, + removeData: function (e, t, n) { + if (!v.acceptData(e))return; + var r, i, s, o = e.nodeType, u = o ? v.cache : e, a = o ? e[v.expando] : v.expando; + if (!u[a])return; + if (t) { + r = n ? u[a] : u[a].data; + if (r) { + v.isArray(t) || (t in r ? t = [t] : (t = v.camelCase(t), t in r ? t = [t] : t = t.split(" "))); + for (i = 0, s = t.length; i < s; i++)delete r[t[i]]; + if (!(n ? B : v.isEmptyObject)(r))return + } + } + if (!n) { + delete u[a].data; + if (!B(u[a]))return + } + o ? v.cleanData([e], !0) : v.support.deleteExpando || u != u.window ? delete u[a] : u[a] = null + }, + _data: function (e, t, n) { + return v.data(e, t, n, !0) + }, + acceptData: function (e) { + var t = e.nodeName && v.noData[e.nodeName.toLowerCase()]; + return !t || t !== !0 && e.getAttribute("classid") === t + } + }), v.fn.extend({ + data: function (e, n) { + var r, i, s, o, u, a = this[0], f = 0, l = null; + if (e === t) { + if (this.length) { + l = v.data(a); + if (a.nodeType === 1 && !v._data(a, "parsedAttrs")) { + s = a.attributes; + for (u = s.length; f < u; f++)o = s[f].name, o.indexOf("data-") || (o = v.camelCase(o.substring(5)), H(a, o, l[o])); + v._data(a, "parsedAttrs", !0) + } + } + return l + } + return typeof e == "object" ? this.each(function () { + v.data(this, e) + }) : (r = e.split(".", 2), r[1] = r[1] ? "." + r[1] : "", i = r[1] + "!", v.access(this, function (n) { + if (n === t)return l = this.triggerHandler("getData" + i, [r[0]]), l === t && a && (l = v.data(a, e), l = H(a, e, l)), l === t && r[1] ? this.data(r[0]) : l; + r[1] = n, this.each(function () { + var t = v(this); + t.triggerHandler("setData" + i, r), v.data(this, e, n), t.triggerHandler("changeData" + i, r) + }) + }, null, n, arguments.length > 1, null, !1)) + }, removeData: function (e) { + return this.each(function () { + v.removeData(this, e) + }) + } + }), v.extend({ + queue: function (e, t, n) { + var r; + if (e)return t = (t || "fx") + "queue", r = v._data(e, t), n && (!r || v.isArray(n) ? r = v._data(e, t, v.makeArray(n)) : r.push(n)), r || [] + }, dequeue: function (e, t) { + t = t || "fx"; + var n = v.queue(e, t), r = n.length, i = n.shift(), s = v._queueHooks(e, t), o = function () { + v.dequeue(e, t) + }; + i === "inprogress" && (i = n.shift(), r--), i && (t === "fx" && n.unshift("inprogress"), delete s.stop, i.call(e, o, s)), !r && s && s.empty.fire() + }, _queueHooks: function (e, t) { + var n = t + "queueHooks"; + return v._data(e, n) || v._data(e, n, { + empty: v.Callbacks("once memory").add(function () { + v.removeData(e, t + "queue", !0), v.removeData(e, n, !0) + }) + }) + } + }), v.fn.extend({ + queue: function (e, n) { + var r = 2; + return typeof e != "string" && (n = e, e = "fx", r--), arguments.length < r ? v.queue(this[0], e) : n === t ? this : this.each(function () { + var t = v.queue(this, e, n); + v._queueHooks(this, e), e === "fx" && t[0] !== "inprogress" && v.dequeue(this, e) + }) + }, dequeue: function (e) { + return this.each(function () { + v.dequeue(this, e) + }) + }, delay: function (e, t) { + return e = v.fx ? v.fx.speeds[e] || e : e, t = t || "fx", this.queue(t, function (t, n) { + var r = setTimeout(t, e); + n.stop = function () { + clearTimeout(r) + } + }) + }, clearQueue: function (e) { + return this.queue(e || "fx", []) + }, promise: function (e, n) { + var r, i = 1, s = v.Deferred(), o = this, u = this.length, a = function () { + --i || s.resolveWith(o, [o]) + }; + typeof e != "string" && (n = e, e = t), e = e || "fx"; + while (u--)r = v._data(o[u], e + "queueHooks"), r && r.empty && (i++, r.empty.add(a)); + return a(), s.promise(n) + } + }); + var j, F, I, q = /[\t\r\n]/g, R = /\r/g, U = /^(?:button|input)$/i, z = /^(?:button|input|object|select|textarea)$/i, W = /^a(?:rea|)$/i, X = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, V = v.support.getSetAttribute; + v.fn.extend({ + attr: function (e, t) { + return v.access(this, v.attr, e, t, arguments.length > 1) + }, removeAttr: function (e) { + return this.each(function () { + v.removeAttr(this, e) + }) + }, prop: function (e, t) { + return v.access(this, v.prop, e, t, arguments.length > 1) + }, removeProp: function (e) { + return e = v.propFix[e] || e, this.each(function () { + try { + this[e] = t, delete this[e] + } catch (n) { + } + }) + }, addClass: function (e) { + var t, n, r, i, s, o, u; + if (v.isFunction(e))return this.each(function (t) { + v(this).addClass(e.call(this, t, this.className)) + }); + if (e && typeof e == "string") { + t = e.split(y); + for (n = 0, r = this.length; n < r; n++) { + i = this[n]; + if (i.nodeType === 1)if (!i.className && t.length === 1)i.className = e; else { + s = " " + i.className + " "; + for (o = 0, u = t.length; o < u; o++)s.indexOf(" " + t[o] + " ") < 0 && (s += t[o] + " "); + i.className = v.trim(s) + } + } + } + return this + }, removeClass: function (e) { + var n, r, i, s, o, u, a; + if (v.isFunction(e))return this.each(function (t) { + v(this).removeClass(e.call(this, t, this.className)) + }); + if (e && typeof e == "string" || e === t) { + n = (e || "").split(y); + for (u = 0, a = this.length; u < a; u++) { + i = this[u]; + if (i.nodeType === 1 && i.className) { + r = (" " + i.className + " ").replace(q, " "); + for (s = 0, o = n.length; s < o; s++)while (r.indexOf(" " + n[s] + " ") >= 0)r = r.replace(" " + n[s] + " ", " "); + i.className = e ? v.trim(r) : "" + } + } + } + return this + }, toggleClass: function (e, t) { + var n = typeof e, r = typeof t == "boolean"; + return v.isFunction(e) ? this.each(function (n) { + v(this).toggleClass(e.call(this, n, this.className, t), t) + }) : this.each(function () { + if (n === "string") { + var i, s = 0, o = v(this), u = t, a = e.split(y); + while (i = a[s++])u = r ? u : !o.hasClass(i), o[u ? "addClass" : "removeClass"](i) + } else if (n === "undefined" || n === "boolean")this.className && v._data(this, "__className__", this.className), this.className = this.className || e === !1 ? "" : v._data(this, "__className__") || "" + }) + }, hasClass: function (e) { + var t = " " + e + " ", n = 0, r = this.length; + for (; n < r; n++)if (this[n].nodeType === 1 && (" " + this[n].className + " ").replace(q, " ").indexOf(t) >= 0)return !0; + return !1 + }, val: function (e) { + var n, r, i, s = this[0]; + if (!arguments.length) { + if (s)return n = v.valHooks[s.type] || v.valHooks[s.nodeName.toLowerCase()], n && "get"in n && (r = n.get(s, "value")) !== t ? r : (r = s.value, typeof r == "string" ? r.replace(R, "") : r == null ? "" : r); + return + } + return i = v.isFunction(e), this.each(function (r) { + var s, o = v(this); + if (this.nodeType !== 1)return; + i ? s = e.call(this, r, o.val()) : s = e, s == null ? s = "" : typeof s == "number" ? s += "" : v.isArray(s) && (s = v.map(s, function (e) { + return e == null ? "" : e + "" + })), n = v.valHooks[this.type] || v.valHooks[this.nodeName.toLowerCase()]; + if (!n || !("set"in n) || n.set(this, s, "value") === t)this.value = s + }) + } + }), v.extend({ + valHooks: { + option: { + get: function (e) { + var t = e.attributes.value; + return !t || t.specified ? e.value : e.text + } + }, select: { + get: function (e) { + var t, n, r = e.options, i = e.selectedIndex, s = e.type === "select-one" || i < 0, o = s ? null : [], u = s ? i + 1 : r.length, a = i < 0 ? u : s ? i : 0; + for (; a < u; a++) { + n = r[a]; + if ((n.selected || a === i) && (v.support.optDisabled ? !n.disabled : n.getAttribute("disabled") === null) && (!n.parentNode.disabled || !v.nodeName(n.parentNode, "optgroup"))) { + t = v(n).val(); + if (s)return t; + o.push(t) + } + } + return o + }, set: function (e, t) { + var n = v.makeArray(t); + return v(e).find("option").each(function () { + this.selected = v.inArray(v(this).val(), n) >= 0 + }), n.length || (e.selectedIndex = -1), n + } + } + }, + attrFn: {}, + attr: function (e, n, r, i) { + var s, o, u, a = e.nodeType; + if (!e || a === 3 || a === 8 || a === 2)return; + if (i && v.isFunction(v.fn[n]))return v(e)[n](r); + if (typeof e.getAttribute == "undefined")return v.prop(e, n, r); + u = a !== 1 || !v.isXMLDoc(e), u && (n = n.toLowerCase(), o = v.attrHooks[n] || (X.test(n) ? F : j)); + if (r !== t) { + if (r === null) { + v.removeAttr(e, n); + return + } + return o && "set"in o && u && (s = o.set(e, r, n)) !== t ? s : (e.setAttribute(n, r + ""), r) + } + return o && "get"in o && u && (s = o.get(e, n)) !== null ? s : (s = e.getAttribute(n), s === null ? t : s) + }, + removeAttr: function (e, t) { + var n, r, i, s, o = 0; + if (t && e.nodeType === 1) { + r = t.split(y); + for (; o < r.length; o++)i = r[o], i && (n = v.propFix[i] || i, s = X.test(i), s || v.attr(e, i, ""), e.removeAttribute(V ? i : n), s && n in e && (e[n] = !1)) + } + }, + attrHooks: { + type: { + set: function (e, t) { + if (U.test(e.nodeName) && e.parentNode)v.error("type property can't be changed"); else if (!v.support.radioValue && t === "radio" && v.nodeName(e, "input")) { + var n = e.value; + return e.setAttribute("type", t), n && (e.value = n), t + } + } + }, value: { + get: function (e, t) { + return j && v.nodeName(e, "button") ? j.get(e, t) : t in e ? e.value : null + }, set: function (e, t, n) { + if (j && v.nodeName(e, "button"))return j.set(e, t, n); + e.value = t + } + } + }, + propFix: { + tabindex: "tabIndex", + readonly: "readOnly", + "for": "htmlFor", + "class": "className", + maxlength: "maxLength", + cellspacing: "cellSpacing", + cellpadding: "cellPadding", + rowspan: "rowSpan", + colspan: "colSpan", + usemap: "useMap", + frameborder: "frameBorder", + contenteditable: "contentEditable" + }, + prop: function (e, n, r) { + var i, s, o, u = e.nodeType; + if (!e || u === 3 || u === 8 || u === 2)return; + return o = u !== 1 || !v.isXMLDoc(e), o && (n = v.propFix[n] || n, s = v.propHooks[n]), r !== t ? s && "set"in s && (i = s.set(e, r, n)) !== t ? i : e[n] = r : s && "get"in s && (i = s.get(e, n)) !== null ? i : e[n] + }, + propHooks: { + tabIndex: { + get: function (e) { + var n = e.getAttributeNode("tabindex"); + return n && n.specified ? parseInt(n.value, 10) : z.test(e.nodeName) || W.test(e.nodeName) && e.href ? 0 : t + } + } + } + }), F = { + get: function (e, n) { + var r, i = v.prop(e, n); + return i === !0 || typeof i != "boolean" && (r = e.getAttributeNode(n)) && r.nodeValue !== !1 ? n.toLowerCase() : t + }, set: function (e, t, n) { + var r; + return t === !1 ? v.removeAttr(e, n) : (r = v.propFix[n] || n, r in e && (e[r] = !0), e.setAttribute(n, n.toLowerCase())), n + } + }, V || (I = {name: !0, id: !0, coords: !0}, j = v.valHooks.button = { + get: function (e, n) { + var r; + return r = e.getAttributeNode(n), r && (I[n] ? r.value !== "" : r.specified) ? r.value : t + }, set: function (e, t, n) { + var r = e.getAttributeNode(n); + return r || (r = i.createAttribute(n), e.setAttributeNode(r)), r.value = t + "" + } + }, v.each(["width", "height"], function (e, t) { + v.attrHooks[t] = v.extend(v.attrHooks[t], { + set: function (e, n) { + if (n === "")return e.setAttribute(t, "auto"), n + } + }) + }), v.attrHooks.contenteditable = { + get: j.get, set: function (e, t, n) { + t === "" && (t = "false"), j.set(e, t, n) + } + }), v.support.hrefNormalized || v.each(["href", "src", "width", "height"], function (e, n) { + v.attrHooks[n] = v.extend(v.attrHooks[n], { + get: function (e) { + var r = e.getAttribute(n, 2); + return r === null ? t : r + } + }) + }), v.support.style || (v.attrHooks.style = { + get: function (e) { + return e.style.cssText.toLowerCase() || t + }, set: function (e, t) { + return e.style.cssText = t + "" + } + }), v.support.optSelected || (v.propHooks.selected = v.extend(v.propHooks.selected, { + get: function (e) { + var t = e.parentNode; + return t && (t.selectedIndex, t.parentNode && t.parentNode.selectedIndex), null + } + })), v.support.enctype || (v.propFix.enctype = "encoding"), v.support.checkOn || v.each(["radio", "checkbox"], function () { + v.valHooks[this] = { + get: function (e) { + return e.getAttribute("value") === null ? "on" : e.value + } + } + }), v.each(["radio", "checkbox"], function () { + v.valHooks[this] = v.extend(v.valHooks[this], { + set: function (e, t) { + if (v.isArray(t))return e.checked = v.inArray(v(e).val(), t) >= 0 + } + }) + }); + var $ = /^(?:textarea|input|select)$/i, J = /^([^\.]*|)(?:\.(.+)|)$/, K = /(?:^|\s)hover(\.\S+|)\b/, Q = /^key/, G = /^(?:mouse|contextmenu)|click/, Y = /^(?:focusinfocus|focusoutblur)$/, Z = function (e) { + return v.event.special.hover ? e : e.replace(K, "mouseenter$1 mouseleave$1") + }; + v.event = { + add: function (e, n, r, i, s) { + var o, u, a, f, l, c, h, p, d, m, g; + if (e.nodeType === 3 || e.nodeType === 8 || !n || !r || !(o = v._data(e)))return; + r.handler && (d = r, r = d.handler, s = d.selector), r.guid || (r.guid = v.guid++), a = o.events, a || (o.events = a = {}), u = o.handle, u || (o.handle = u = function (e) { + return typeof v == "undefined" || !!e && v.event.triggered === e.type ? t : v.event.dispatch.apply(u.elem, arguments) + }, u.elem = e), n = v.trim(Z(n)).split(" "); + for (f = 0; f < n.length; f++) { + l = J.exec(n[f]) || [], c = l[1], h = (l[2] || "").split(".").sort(), g = v.event.special[c] || {}, c = (s ? g.delegateType : g.bindType) || c, g = v.event.special[c] || {}, p = v.extend({ + type: c, + origType: l[1], + data: i, + handler: r, + guid: r.guid, + selector: s, + needsContext: s && v.expr.match.needsContext.test(s), + namespace: h.join(".") + }, d), m = a[c]; + if (!m) { + m = a[c] = [], m.delegateCount = 0; + if (!g.setup || g.setup.call(e, i, h, u) === !1)e.addEventListener ? e.addEventListener(c, u, !1) : e.attachEvent && e.attachEvent("on" + c, u) + } + g.add && (g.add.call(e, p), p.handler.guid || (p.handler.guid = r.guid)), s ? m.splice(m.delegateCount++, 0, p) : m.push(p), v.event.global[c] = !0 + } + e = null + }, + global: {}, + remove: function (e, t, n, r, i) { + var s, o, u, a, f, l, c, h, p, d, m, g = v.hasData(e) && v._data(e); + if (!g || !(h = g.events))return; + t = v.trim(Z(t || "")).split(" "); + for (s = 0; s < t.length; s++) { + o = J.exec(t[s]) || [], u = a = o[1], f = o[2]; + if (!u) { + for (u in h)v.event.remove(e, u + t[s], n, r, !0); + continue + } + p = v.event.special[u] || {}, u = (r ? p.delegateType : p.bindType) || u, d = h[u] || [], l = d.length, f = f ? new RegExp("(^|\\.)" + f.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null; + for (c = 0; c < d.length; c++)m = d[c], (i || a === m.origType) && (!n || n.guid === m.guid) && (!f || f.test(m.namespace)) && (!r || r === m.selector || r === "**" && m.selector) && (d.splice(c--, 1), m.selector && d.delegateCount--, p.remove && p.remove.call(e, m)); + d.length === 0 && l !== d.length && ((!p.teardown || p.teardown.call(e, f, g.handle) === !1) && v.removeEvent(e, u, g.handle), delete h[u]) + } + v.isEmptyObject(h) && (delete g.handle, v.removeData(e, "events", !0)) + }, + customEvent: {getData: !0, setData: !0, changeData: !0}, + trigger: function (n, r, s, o) { + if (!s || s.nodeType !== 3 && s.nodeType !== 8) { + var u, a, f, l, c, h, p, d, m, g, y = n.type || n, b = []; + if (Y.test(y + v.event.triggered))return; + y.indexOf("!") >= 0 && (y = y.slice(0, -1), a = !0), y.indexOf(".") >= 0 && (b = y.split("."), y = b.shift(), b.sort()); + if ((!s || v.event.customEvent[y]) && !v.event.global[y])return; + n = typeof n == "object" ? n[v.expando] ? n : new v.Event(y, n) : new v.Event(y), n.type = y, n.isTrigger = !0, n.exclusive = a, n.namespace = b.join("."), n.namespace_re = n.namespace ? new RegExp("(^|\\.)" + b.join("\\.(?:.*\\.|)") + "(\\.|$)") : null, h = y.indexOf(":") < 0 ? "on" + y : ""; + if (!s) { + u = v.cache; + for (f in u)u[f].events && u[f].events[y] && v.event.trigger(n, r, u[f].handle.elem, !0); + return + } + n.result = t, n.target || (n.target = s), r = r != null ? v.makeArray(r) : [], r.unshift(n), p = v.event.special[y] || {}; + if (p.trigger && p.trigger.apply(s, r) === !1)return; + m = [[s, p.bindType || y]]; + if (!o && !p.noBubble && !v.isWindow(s)) { + g = p.delegateType || y, l = Y.test(g + y) ? s : s.parentNode; + for (c = s; l; l = l.parentNode)m.push([l, g]), c = l; + c === (s.ownerDocument || i) && m.push([c.defaultView || c.parentWindow || e, g]) + } + for (f = 0; f < m.length && !n.isPropagationStopped(); f++)l = m[f][0], n.type = m[f][1], d = (v._data(l, "events") || {})[n.type] && v._data(l, "handle"), d && d.apply(l, r), d = h && l[h], d && v.acceptData(l) && d.apply && d.apply(l, r) === !1 && n.preventDefault(); + return n.type = y, !o && !n.isDefaultPrevented() && (!p._default || p._default.apply(s.ownerDocument, r) === !1) && (y !== "click" || !v.nodeName(s, "a")) && v.acceptData(s) && h && s[y] && (y !== "focus" && y !== "blur" || n.target.offsetWidth !== 0) && !v.isWindow(s) && (c = s[h], c && (s[h] = null), v.event.triggered = y, s[y](), v.event.triggered = t, c && (s[h] = c)), n.result + } + return + }, + dispatch: function (n) { + n = v.event.fix(n || e.event); + var r, i, s, o, u, a, f, c, h, p, d = (v._data(this, "events") || {})[n.type] || [], m = d.delegateCount, g = l.call(arguments), y = !n.exclusive && !n.namespace, b = v.event.special[n.type] || {}, w = []; + g[0] = n, n.delegateTarget = this; + if (b.preDispatch && b.preDispatch.call(this, n) === !1)return; + if (m && (!n.button || n.type !== "click"))for (s = n.target; s != this; s = s.parentNode || this)if (s.disabled !== !0 || n.type !== "click") { + u = {}, f = []; + for (r = 0; r < m; r++)c = d[r], h = c.selector, u[h] === t && (u[h] = c.needsContext ? v(h, this).index(s) >= 0 : v.find(h, this, null, [s]).length), u[h] && f.push(c); + f.length && w.push({elem: s, matches: f}) + } + d.length > m && w.push({elem: this, matches: d.slice(m)}); + for (r = 0; r < w.length && !n.isPropagationStopped(); r++) { + a = w[r], n.currentTarget = a.elem; + for (i = 0; i < a.matches.length && !n.isImmediatePropagationStopped(); i++) { + c = a.matches[i]; + if (y || !n.namespace && !c.namespace || n.namespace_re && n.namespace_re.test(c.namespace))n.data = c.data, n.handleObj = c, o = ((v.event.special[c.origType] || {}).handle || c.handler).apply(a.elem, g), o !== t && (n.result = o, o === !1 && (n.preventDefault(), n.stopPropagation())) + } + } + return b.postDispatch && b.postDispatch.call(this, n), n.result + }, + props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + fixHooks: {}, + keyHooks: { + props: "char charCode key keyCode".split(" "), filter: function (e, t) { + return e.which == null && (e.which = t.charCode != null ? t.charCode : t.keyCode), e + } + }, + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function (e, n) { + var r, s, o, u = n.button, a = n.fromElement; + return e.pageX == null && n.clientX != null && (r = e.target.ownerDocument || i, s = r.documentElement, o = r.body, e.pageX = n.clientX + (s && s.scrollLeft || o && o.scrollLeft || 0) - (s && s.clientLeft || o && o.clientLeft || 0), e.pageY = n.clientY + (s && s.scrollTop || o && o.scrollTop || 0) - (s && s.clientTop || o && o.clientTop || 0)), !e.relatedTarget && a && (e.relatedTarget = a === e.target ? n.toElement : a), !e.which && u !== t && (e.which = u & 1 ? 1 : u & 2 ? 3 : u & 4 ? 2 : 0), e + } + }, + fix: function (e) { + if (e[v.expando])return e; + var t, n, r = e, s = v.event.fixHooks[e.type] || {}, o = s.props ? this.props.concat(s.props) : this.props; + e = v.Event(r); + for (t = o.length; t;)n = o[--t], e[n] = r[n]; + return e.target || (e.target = r.srcElement || i), e.target.nodeType === 3 && (e.target = e.target.parentNode), e.metaKey = !!e.metaKey, s.filter ? s.filter(e, r) : e + }, + special: { + load: {noBubble: !0}, + focus: {delegateType: "focusin"}, + blur: {delegateType: "focusout"}, + beforeunload: { + setup: function (e, t, n) { + v.isWindow(this) && (this.onbeforeunload = n) + }, teardown: function (e, t) { + this.onbeforeunload === t && (this.onbeforeunload = null) + } + } + }, + simulate: function (e, t, n, r) { + var i = v.extend(new v.Event, n, {type: e, isSimulated: !0, originalEvent: {}}); + r ? v.event.trigger(i, null, t) : v.event.dispatch.call(t, i), i.isDefaultPrevented() && n.preventDefault() + } + }, v.event.handle = v.event.dispatch, v.removeEvent = i.removeEventListener ? function (e, t, n) { + e.removeEventListener && e.removeEventListener(t, n, !1) + } : function (e, t, n) { + var r = "on" + t; + e.detachEvent && (typeof e[r] == "undefined" && (e[r] = null), e.detachEvent(r, n)) + }, v.Event = function (e, t) { + if (!(this instanceof v.Event))return new v.Event(e, t); + e && e.type ? (this.originalEvent = e, this.type = e.type, this.isDefaultPrevented = e.defaultPrevented || e.returnValue === !1 || e.getPreventDefault && e.getPreventDefault() ? tt : et) : this.type = e, t && v.extend(this, t), this.timeStamp = e && e.timeStamp || v.now(), this[v.expando] = !0 + }, v.Event.prototype = { + preventDefault: function () { + this.isDefaultPrevented = tt; + var e = this.originalEvent; + if (!e)return; + e.preventDefault ? e.preventDefault() : e.returnValue = !1 + }, stopPropagation: function () { + this.isPropagationStopped = tt; + var e = this.originalEvent; + if (!e)return; + e.stopPropagation && e.stopPropagation(), e.cancelBubble = !0 + }, stopImmediatePropagation: function () { + this.isImmediatePropagationStopped = tt, this.stopPropagation() + }, isDefaultPrevented: et, isPropagationStopped: et, isImmediatePropagationStopped: et + }, v.each({mouseenter: "mouseover", mouseleave: "mouseout"}, function (e, t) { + v.event.special[e] = { + delegateType: t, bindType: t, handle: function (e) { + var n, r = this, i = e.relatedTarget, s = e.handleObj, o = s.selector; + if (!i || i !== r && !v.contains(r, i))e.type = s.origType, n = s.handler.apply(this, arguments), e.type = t; + return n + } + } + }), v.support.submitBubbles || (v.event.special.submit = { + setup: function () { + if (v.nodeName(this, "form"))return !1; + v.event.add(this, "click._submit keypress._submit", function (e) { + var n = e.target, r = v.nodeName(n, "input") || v.nodeName(n, "button") ? n.form : t; + r && !v._data(r, "_submit_attached") && (v.event.add(r, "submit._submit", function (e) { + e._submit_bubble = !0 + }), v._data(r, "_submit_attached", !0)) + }) + }, postDispatch: function (e) { + e._submit_bubble && (delete e._submit_bubble, this.parentNode && !e.isTrigger && v.event.simulate("submit", this.parentNode, e, !0)) + }, teardown: function () { + if (v.nodeName(this, "form"))return !1; + v.event.remove(this, "._submit") + } + }), v.support.changeBubbles || (v.event.special.change = { + setup: function () { + if ($.test(this.nodeName)) { + if (this.type === "checkbox" || this.type === "radio")v.event.add(this, "propertychange._change", function (e) { + e.originalEvent.propertyName === "checked" && (this._just_changed = !0) + }), v.event.add(this, "click._change", function (e) { + this._just_changed && !e.isTrigger && (this._just_changed = !1), v.event.simulate("change", this, e, !0) + }); + return !1 + } + v.event.add(this, "beforeactivate._change", function (e) { + var t = e.target; + $.test(t.nodeName) && !v._data(t, "_change_attached") && (v.event.add(t, "change._change", function (e) { + this.parentNode && !e.isSimulated && !e.isTrigger && v.event.simulate("change", this.parentNode, e, !0) + }), v._data(t, "_change_attached", !0)) + }) + }, handle: function (e) { + var t = e.target; + if (this !== t || e.isSimulated || e.isTrigger || t.type !== "radio" && t.type !== "checkbox")return e.handleObj.handler.apply(this, arguments) + }, teardown: function () { + return v.event.remove(this, "._change"), !$.test(this.nodeName) + } + }), v.support.focusinBubbles || v.each({focus: "focusin", blur: "focusout"}, function (e, t) { + var n = 0, r = function (e) { + v.event.simulate(t, e.target, v.event.fix(e), !0) + }; + v.event.special[t] = { + setup: function () { + n++ === 0 && i.addEventListener(e, r, !0) + }, teardown: function () { + --n === 0 && i.removeEventListener(e, r, !0) + } + } + }), v.fn.extend({ + on: function (e, n, r, i, s) { + var o, u; + if (typeof e == "object") { + typeof n != "string" && (r = r || n, n = t); + for (u in e)this.on(u, n, r, e[u], s); + return this + } + r == null && i == null ? (i = n, r = n = t) : i == null && (typeof n == "string" ? (i = r, r = t) : (i = r, r = n, n = t)); + if (i === !1)i = et; else if (!i)return this; + return s === 1 && (o = i, i = function (e) { + return v().off(e), o.apply(this, arguments) + }, i.guid = o.guid || (o.guid = v.guid++)), this.each(function () { + v.event.add(this, e, i, r, n) + }) + }, one: function (e, t, n, r) { + return this.on(e, t, n, r, 1) + }, off: function (e, n, r) { + var i, s; + if (e && e.preventDefault && e.handleObj)return i = e.handleObj, v(e.delegateTarget).off(i.namespace ? i.origType + "." + i.namespace : i.origType, i.selector, i.handler), this; + if (typeof e == "object") { + for (s in e)this.off(s, n, e[s]); + return this + } + if (n === !1 || typeof n == "function")r = n, n = t; + return r === !1 && (r = et), this.each(function () { + v.event.remove(this, e, r, n) + }) + }, bind: function (e, t, n) { + return this.on(e, null, t, n) + }, unbind: function (e, t) { + return this.off(e, null, t) + }, live: function (e, t, n) { + return v(this.context).on(e, this.selector, t, n), this + }, die: function (e, t) { + return v(this.context).off(e, this.selector || "**", t), this + }, delegate: function (e, t, n, r) { + return this.on(t, e, n, r) + }, undelegate: function (e, t, n) { + return arguments.length === 1 ? this.off(e, "**") : this.off(t, e || "**", n) + }, trigger: function (e, t) { + return this.each(function () { + v.event.trigger(e, t, this) + }) + }, triggerHandler: function (e, t) { + if (this[0])return v.event.trigger(e, t, this[0], !0) + }, toggle: function (e) { + var t = arguments, n = e.guid || v.guid++, r = 0, i = function (n) { + var i = (v._data(this, "lastToggle" + e.guid) || 0) % r; + return v._data(this, "lastToggle" + e.guid, i + 1), n.preventDefault(), t[i].apply(this, arguments) || !1 + }; + i.guid = n; + while (r < t.length)t[r++].guid = n; + return this.click(i) + }, hover: function (e, t) { + return this.mouseenter(e).mouseleave(t || e) + } + }), v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "), function (e, t) { + v.fn[t] = function (e, n) { + return n == null && (n = e, e = null), arguments.length > 0 ? this.on(t, null, e, n) : this.trigger(t) + }, Q.test(t) && (v.event.fixHooks[t] = v.event.keyHooks), G.test(t) && (v.event.fixHooks[t] = v.event.mouseHooks) + }), function (e, t) { + function nt(e, t, n, r) { + n = n || [], t = t || g; + var i, s, a, f, l = t.nodeType; + if (!e || typeof e != "string")return n; + if (l !== 1 && l !== 9)return []; + a = o(t); + if (!a && !r)if (i = R.exec(e))if (f = i[1]) { + if (l === 9) { + s = t.getElementById(f); + if (!s || !s.parentNode)return n; + if (s.id === f)return n.push(s), n + } else if (t.ownerDocument && (s = t.ownerDocument.getElementById(f)) && u(t, s) && s.id === f)return n.push(s), n + } else { + if (i[2])return S.apply(n, x.call(t.getElementsByTagName(e), 0)), n; + if ((f = i[3]) && Z && t.getElementsByClassName)return S.apply(n, x.call(t.getElementsByClassName(f), 0)), n + } + return vt(e.replace(j, "$1"), t, n, r, a) + } + + function rt(e) { + return function (t) { + var n = t.nodeName.toLowerCase(); + return n === "input" && t.type === e + } + } + + function it(e) { + return function (t) { + var n = t.nodeName.toLowerCase(); + return (n === "input" || n === "button") && t.type === e + } + } + + function st(e) { + return N(function (t) { + return t = +t, N(function (n, r) { + var i, s = e([], n.length, t), o = s.length; + while (o--)n[i = s[o]] && (n[i] = !(r[i] = n[i])) + }) + }) + } + + function ot(e, t, n) { + if (e === t)return n; + var r = e.nextSibling; + while (r) { + if (r === t)return -1; + r = r.nextSibling + } + return 1 + } + + function ut(e, t) { + var n, r, s, o, u, a, f, l = L[d][e + " "]; + if (l)return t ? 0 : l.slice(0); + u = e, a = [], f = i.preFilter; + while (u) { + if (!n || (r = F.exec(u)))r && (u = u.slice(r[0].length) || u), a.push(s = []); + n = !1; + if (r = I.exec(u))s.push(n = new m(r.shift())), u = u.slice(n.length), n.type = r[0].replace(j, " "); + for (o in i.filter)(r = J[o].exec(u)) && (!f[o] || (r = f[o](r))) && (s.push(n = new m(r.shift())), u = u.slice(n.length), n.type = o, n.matches = r); + if (!n)break + } + return t ? u.length : u ? nt.error(e) : L(e, a).slice(0) + } + + function at(e, t, r) { + var i = t.dir, s = r && t.dir === "parentNode", o = w++; + return t.first ? function (t, n, r) { + while (t = t[i])if (s || t.nodeType === 1)return e(t, n, r) + } : function (t, r, u) { + if (!u) { + var a, f = b + " " + o + " ", l = f + n; + while (t = t[i])if (s || t.nodeType === 1) { + if ((a = t[d]) === l)return t.sizset; + if (typeof a == "string" && a.indexOf(f) === 0) { + if (t.sizset)return t + } else { + t[d] = l; + if (e(t, r, u))return t.sizset = !0, t; + t.sizset = !1 + } + } + } else while (t = t[i])if (s || t.nodeType === 1)if (e(t, r, u))return t + } + } + + function ft(e) { + return e.length > 1 ? function (t, n, r) { + var i = e.length; + while (i--)if (!e[i](t, n, r))return !1; + return !0 + } : e[0] + } + + function lt(e, t, n, r, i) { + var s, o = [], u = 0, a = e.length, f = t != null; + for (; u < a; u++)if (s = e[u])if (!n || n(s, r, i))o.push(s), f && t.push(u); + return o + } + + function ct(e, t, n, r, i, s) { + return r && !r[d] && (r = ct(r)), i && !i[d] && (i = ct(i, s)), N(function (s, o, u, a) { + var f, l, c, h = [], p = [], d = o.length, v = s || dt(t || "*", u.nodeType ? [u] : u, []), m = e && (s || !t) ? lt(v, h, e, u, a) : v, g = n ? i || (s ? e : d || r) ? [] : o : m; + n && n(m, g, u, a); + if (r) { + f = lt(g, p), r(f, [], u, a), l = f.length; + while (l--)if (c = f[l])g[p[l]] = !(m[p[l]] = c) + } + if (s) { + if (i || e) { + if (i) { + f = [], l = g.length; + while (l--)(c = g[l]) && f.push(m[l] = c); + i(null, g = [], f, a) + } + l = g.length; + while (l--)(c = g[l]) && (f = i ? T.call(s, c) : h[l]) > -1 && (s[f] = !(o[f] = c)) + } + } else g = lt(g === o ? g.splice(d, g.length) : g), i ? i(null, o, g, a) : S.apply(o, g) + }) + } + + function ht(e) { + var t, n, r, s = e.length, o = i.relative[e[0].type], u = o || i.relative[" "], a = o ? 1 : 0, f = at(function (e) { + return e === t + }, u, !0), l = at(function (e) { + return T.call(t, e) > -1 + }, u, !0), h = [function (e, n, r) { + return !o && (r || n !== c) || ((t = n).nodeType ? f(e, n, r) : l(e, n, r)) + }]; + for (; a < s; a++)if (n = i.relative[e[a].type])h = [at(ft(h), n)]; else { + n = i.filter[e[a].type].apply(null, e[a].matches); + if (n[d]) { + r = ++a; + for (; r < s; r++)if (i.relative[e[r].type])break; + return ct(a > 1 && ft(h), a > 1 && e.slice(0, a - 1).join("").replace(j, "$1"), n, a < r && ht(e.slice(a, r)), r < s && ht(e = e.slice(r)), r < s && e.join("")) + } + h.push(n) + } + return ft(h) + } + + function pt(e, t) { + var r = t.length > 0, s = e.length > 0, o = function (u, a, f, l, h) { + var p, d, v, m = [], y = 0, w = "0", x = u && [], T = h != null, N = c, C = u || s && i.find.TAG("*", h && a.parentNode || a), k = b += N == null ? 1 : Math.E; + T && (c = a !== g && a, n = o.el); + for (; (p = C[w]) != null; w++) { + if (s && p) { + for (d = 0; v = e[d]; d++)if (v(p, a, f)) { + l.push(p); + break + } + T && (b = k, n = ++o.el) + } + r && ((p = !v && p) && y--, u && x.push(p)) + } + y += w; + if (r && w !== y) { + for (d = 0; v = t[d]; d++)v(x, m, a, f); + if (u) { + if (y > 0)while (w--)!x[w] && !m[w] && (m[w] = E.call(l)); + m = lt(m) + } + S.apply(l, m), T && !u && m.length > 0 && y + t.length > 1 && nt.uniqueSort(l) + } + return T && (b = k, c = N), x + }; + return o.el = 0, r ? N(o) : o + } + + function dt(e, t, n) { + var r = 0, i = t.length; + for (; r < i; r++)nt(e, t[r], n); + return n + } + + function vt(e, t, n, r, s) { + var o, u, f, l, c, h = ut(e), p = h.length; + if (!r && h.length === 1) { + u = h[0] = h[0].slice(0); + if (u.length > 2 && (f = u[0]).type === "ID" && t.nodeType === 9 && !s && i.relative[u[1].type]) { + t = i.find.ID(f.matches[0].replace($, ""), t, s)[0]; + if (!t)return n; + e = e.slice(u.shift().length) + } + for (o = J.POS.test(e) ? -1 : u.length - 1; o >= 0; o--) { + f = u[o]; + if (i.relative[l = f.type])break; + if (c = i.find[l])if (r = c(f.matches[0].replace($, ""), z.test(u[0].type) && t.parentNode || t, s)) { + u.splice(o, 1), e = r.length && u.join(""); + if (!e)return S.apply(n, x.call(r, 0)), n; + break + } + } + } + return a(e, h)(r, t, s, n, z.test(e)), n + } + + function mt() { + } + + var n, r, i, s, o, u, a, f, l, c, h = !0, p = "undefined", d = ("sizcache" + Math.random()).replace(".", ""), m = String, g = e.document, y = g.documentElement, b = 0, w = 0, E = [].pop, S = [].push, x = [].slice, T = [].indexOf || function (e) { + var t = 0, n = this.length; + for (; t < n; t++)if (this[t] === e)return t; + return -1 + }, N = function (e, t) { + return e[d] = t == null || t, e + }, C = function () { + var e = {}, t = []; + return N(function (n, r) { + return t.push(n) > i.cacheLength && delete e[t.shift()], e[n + " "] = r + }, e) + }, k = C(), L = C(), A = C(), O = "[\\x20\\t\\r\\n\\f]", M = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+", _ = M.replace("w", "w#"), D = "([*^$|!~]?=)", P = "\\[" + O + "*(" + M + ")" + O + "*(?:" + D + O + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + _ + ")|)|)" + O + "*\\]", H = ":(" + M + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + P + ")|[^:]|\\\\.)*|.*))\\)|)", B = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + O + "*((?:-\\d)?\\d*)" + O + "*\\)|)(?=[^-]|$)", j = new RegExp("^" + O + "+|((?:^|[^\\\\])(?:\\\\.)*)" + O + "+$", "g"), F = new RegExp("^" + O + "*," + O + "*"), I = new RegExp("^" + O + "*([\\x20\\t\\r\\n\\f>+~])" + O + "*"), q = new RegExp(H), R = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/, U = /^:not/, z = /[\x20\t\r\n\f]*[+~]/, W = /:not\($/, X = /h\d/i, V = /input|select|textarea|button/i, $ = /\\(?!\\)/g, J = { + ID: new RegExp("^#(" + M + ")"), + CLASS: new RegExp("^\\.(" + M + ")"), + NAME: new RegExp("^\\[name=['\"]?(" + M + ")['\"]?\\]"), + TAG: new RegExp("^(" + M.replace("w", "w*") + ")"), + ATTR: new RegExp("^" + P), + PSEUDO: new RegExp("^" + H), + POS: new RegExp(B, "i"), + CHILD: new RegExp("^:(only|nth|first|last)-child(?:\\(" + O + "*(even|odd|(([+-]|)(\\d*)n|)" + O + "*(?:([+-]|)" + O + "*(\\d+)|))" + O + "*\\)|)", "i"), + needsContext: new RegExp("^" + O + "*[>+~]|" + B, "i") + }, K = function (e) { + var t = g.createElement("div"); + try { + return e(t) + } catch (n) { + return !1 + } finally { + t = null + } + }, Q = K(function (e) { + return e.appendChild(g.createComment("")), !e.getElementsByTagName("*").length + }), G = K(function (e) { + return e.innerHTML = "", e.firstChild && typeof e.firstChild.getAttribute !== p && e.firstChild.getAttribute("href") === "#" + }), Y = K(function (e) { + e.innerHTML = ""; + var t = typeof e.lastChild.getAttribute("multiple"); + return t !== "boolean" && t !== "string" + }), Z = K(function (e) { + return e.innerHTML = "", !e.getElementsByClassName || !e.getElementsByClassName("e").length ? !1 : (e.lastChild.className = "e", e.getElementsByClassName("e").length === 2) + }), et = K(function (e) { + e.id = d + 0, e.innerHTML = "
      ", y.insertBefore(e, y.firstChild); + var t = g.getElementsByName && g.getElementsByName(d).length === 2 + g.getElementsByName(d + 0).length; + return r = !g.getElementById(d), y.removeChild(e), t + }); + try { + x.call(y.childNodes, 0)[0].nodeType + } catch (tt) { + x = function (e) { + var t, n = []; + for (; t = this[e]; e++)n.push(t); + return n + } + } + nt.matches = function (e, t) { + return nt(e, null, null, t) + }, nt.matchesSelector = function (e, t) { + return nt(t, null, null, [e]).length > 0 + }, s = nt.getText = function (e) { + var t, n = "", r = 0, i = e.nodeType; + if (i) { + if (i === 1 || i === 9 || i === 11) { + if (typeof e.textContent == "string")return e.textContent; + for (e = e.firstChild; e; e = e.nextSibling)n += s(e) + } else if (i === 3 || i === 4)return e.nodeValue + } else for (; t = e[r]; r++)n += s(t); + return n + }, o = nt.isXML = function (e) { + var t = e && (e.ownerDocument || e).documentElement; + return t ? t.nodeName !== "HTML" : !1 + }, u = nt.contains = y.contains ? function (e, t) { + var n = e.nodeType === 9 ? e.documentElement : e, r = t && t.parentNode; + return e === r || !!(r && r.nodeType === 1 && n.contains && n.contains(r)) + } : y.compareDocumentPosition ? function (e, t) { + return t && !!(e.compareDocumentPosition(t) & 16) + } : function (e, t) { + while (t = t.parentNode)if (t === e)return !0; + return !1 + }, nt.attr = function (e, t) { + var n, r = o(e); + return r || (t = t.toLowerCase()), (n = i.attrHandle[t]) ? n(e) : r || Y ? e.getAttribute(t) : (n = e.getAttributeNode(t), n ? typeof e[t] == "boolean" ? e[t] ? t : null : n.specified ? n.value : null : null) + }, i = nt.selectors = { + cacheLength: 50, + createPseudo: N, + match: J, + attrHandle: G ? {} : { + href: function (e) { + return e.getAttribute("href", 2) + }, type: function (e) { + return e.getAttribute("type") + } + }, + find: { + ID: r ? function (e, t, n) { + if (typeof t.getElementById !== p && !n) { + var r = t.getElementById(e); + return r && r.parentNode ? [r] : [] + } + } : function (e, n, r) { + if (typeof n.getElementById !== p && !r) { + var i = n.getElementById(e); + return i ? i.id === e || typeof i.getAttributeNode !== p && i.getAttributeNode("id").value === e ? [i] : t : [] + } + }, TAG: Q ? function (e, t) { + if (typeof t.getElementsByTagName !== p)return t.getElementsByTagName(e) + } : function (e, t) { + var n = t.getElementsByTagName(e); + if (e === "*") { + var r, i = [], s = 0; + for (; r = n[s]; s++)r.nodeType === 1 && i.push(r); + return i + } + return n + }, NAME: et && function (e, t) { + if (typeof t.getElementsByName !== p)return t.getElementsByName(name) + }, CLASS: Z && function (e, t, n) { + if (typeof t.getElementsByClassName !== p && !n)return t.getElementsByClassName(e) + } + }, + relative: { + ">": {dir: "parentNode", first: !0}, + " ": {dir: "parentNode"}, + "+": {dir: "previousSibling", first: !0}, + "~": {dir: "previousSibling"} + }, + preFilter: { + ATTR: function (e) { + return e[1] = e[1].replace($, ""), e[3] = (e[4] || e[5] || "").replace($, ""), e[2] === "~=" && (e[3] = " " + e[3] + " "), e.slice(0, 4) + }, CHILD: function (e) { + return e[1] = e[1].toLowerCase(), e[1] === "nth" ? (e[2] || nt.error(e[0]), e[3] = +(e[3] ? e[4] + (e[5] || 1) : 2 * (e[2] === "even" || e[2] === "odd")), e[4] = +(e[6] + e[7] || e[2] === "odd")) : e[2] && nt.error(e[0]), e + }, PSEUDO: function (e) { + var t, n; + if (J.CHILD.test(e[0]))return null; + if (e[3])e[2] = e[3]; else if (t = e[4])q.test(t) && (n = ut(t, !0)) && (n = t.indexOf(")", t.length - n) - t.length) && (t = t.slice(0, n), e[0] = e[0].slice(0, n)), e[2] = t; + return e.slice(0, 3) + } + }, + filter: { + ID: r ? function (e) { + return e = e.replace($, ""), function (t) { + return t.getAttribute("id") === e + } + } : function (e) { + return e = e.replace($, ""), function (t) { + var n = typeof t.getAttributeNode !== p && t.getAttributeNode("id"); + return n && n.value === e + } + }, TAG: function (e) { + return e === "*" ? function () { + return !0 + } : (e = e.replace($, "").toLowerCase(), function (t) { + return t.nodeName && t.nodeName.toLowerCase() === e + }) + }, CLASS: function (e) { + var t = k[d][e + " "]; + return t || (t = new RegExp("(^|" + O + ")" + e + "(" + O + "|$)")) && k(e, function (e) { + return t.test(e.className || typeof e.getAttribute !== p && e.getAttribute("class") || "") + }) + }, ATTR: function (e, t, n) { + return function (r, i) { + var s = nt.attr(r, e); + return s == null ? t === "!=" : t ? (s += "", t === "=" ? s === n : t === "!=" ? s !== n : t === "^=" ? n && s.indexOf(n) === 0 : t === "*=" ? n && s.indexOf(n) > -1 : t === "$=" ? n && s.substr(s.length - n.length) === n : t === "~=" ? (" " + s + " ").indexOf(n) > -1 : t === "|=" ? s === n || s.substr(0, n.length + 1) === n + "-" : !1) : !0 + } + }, CHILD: function (e, t, n, r) { + return e === "nth" ? function (e) { + var t, i, s = e.parentNode; + if (n === 1 && r === 0)return !0; + if (s) { + i = 0; + for (t = s.firstChild; t; t = t.nextSibling)if (t.nodeType === 1) { + i++; + if (e === t)break + } + } + return i -= r, i === n || i % n === 0 && i / n >= 0 + } : function (t) { + var n = t; + switch (e) { + case"only": + case"first": + while (n = n.previousSibling)if (n.nodeType === 1)return !1; + if (e === "first")return !0; + n = t; + case"last": + while (n = n.nextSibling)if (n.nodeType === 1)return !1; + return !0 + } + } + }, PSEUDO: function (e, t) { + var n, r = i.pseudos[e] || i.setFilters[e.toLowerCase()] || nt.error("unsupported pseudo: " + e); + return r[d] ? r(t) : r.length > 1 ? (n = [e, e, "", t], i.setFilters.hasOwnProperty(e.toLowerCase()) ? N(function (e, n) { + var i, s = r(e, t), o = s.length; + while (o--)i = T.call(e, s[o]), e[i] = !(n[i] = s[o]) + }) : function (e) { + return r(e, 0, n) + }) : r + } + }, + pseudos: { + not: N(function (e) { + var t = [], n = [], r = a(e.replace(j, "$1")); + return r[d] ? N(function (e, t, n, i) { + var s, o = r(e, null, i, []), u = e.length; + while (u--)if (s = o[u])e[u] = !(t[u] = s) + }) : function (e, i, s) { + return t[0] = e, r(t, null, s, n), !n.pop() + } + }), + has: N(function (e) { + return function (t) { + return nt(e, t).length > 0 + } + }), + contains: N(function (e) { + return function (t) { + return (t.textContent || t.innerText || s(t)).indexOf(e) > -1 + } + }), + enabled: function (e) { + return e.disabled === !1 + }, + disabled: function (e) { + return e.disabled === !0 + }, + checked: function (e) { + var t = e.nodeName.toLowerCase(); + return t === "input" && !!e.checked || t === "option" && !!e.selected + }, + selected: function (e) { + return e.parentNode && e.parentNode.selectedIndex, e.selected === !0 + }, + parent: function (e) { + return !i.pseudos.empty(e) + }, + empty: function (e) { + var t; + e = e.firstChild; + while (e) { + if (e.nodeName > "@" || (t = e.nodeType) === 3 || t === 4)return !1; + e = e.nextSibling + } + return !0 + }, + header: function (e) { + return X.test(e.nodeName) + }, + text: function (e) { + var t, n; + return e.nodeName.toLowerCase() === "input" && (t = e.type) === "text" && ((n = e.getAttribute("type")) == null || n.toLowerCase() === t) + }, + radio: rt("radio"), + checkbox: rt("checkbox"), + file: rt("file"), + password: rt("password"), + image: rt("image"), + submit: it("submit"), + reset: it("reset"), + button: function (e) { + var t = e.nodeName.toLowerCase(); + return t === "input" && e.type === "button" || t === "button" + }, + input: function (e) { + return V.test(e.nodeName) + }, + focus: function (e) { + var t = e.ownerDocument; + return e === t.activeElement && (!t.hasFocus || t.hasFocus()) && !!(e.type || e.href || ~e.tabIndex) + }, + active: function (e) { + return e === e.ownerDocument.activeElement + }, + first: st(function () { + return [0] + }), + last: st(function (e, t) { + return [t - 1] + }), + eq: st(function (e, t, n) { + return [n < 0 ? n + t : n] + }), + even: st(function (e, t) { + for (var n = 0; n < t; n += 2)e.push(n); + return e + }), + odd: st(function (e, t) { + for (var n = 1; n < t; n += 2)e.push(n); + return e + }), + lt: st(function (e, t, n) { + for (var r = n < 0 ? n + t : n; --r >= 0;)e.push(r); + return e + }), + gt: st(function (e, t, n) { + for (var r = n < 0 ? n + t : n; ++r < t;)e.push(r); + return e + }) + } + }, f = y.compareDocumentPosition ? function (e, t) { + return e === t ? (l = !0, 0) : (!e.compareDocumentPosition || !t.compareDocumentPosition ? e.compareDocumentPosition : e.compareDocumentPosition(t) & 4) ? -1 : 1 + } : function (e, t) { + if (e === t)return l = !0, 0; + if (e.sourceIndex && t.sourceIndex)return e.sourceIndex - t.sourceIndex; + var n, r, i = [], s = [], o = e.parentNode, u = t.parentNode, a = o; + if (o === u)return ot(e, t); + if (!o)return -1; + if (!u)return 1; + while (a)i.unshift(a), a = a.parentNode; + a = u; + while (a)s.unshift(a), a = a.parentNode; + n = i.length, r = s.length; + for (var f = 0; f < n && f < r; f++)if (i[f] !== s[f])return ot(i[f], s[f]); + return f === n ? ot(e, s[f], -1) : ot(i[f], t, 1) + }, [0, 0].sort(f), h = !l, nt.uniqueSort = function (e) { + var t, n = [], r = 1, i = 0; + l = h, e.sort(f); + if (l) { + for (; t = e[r]; r++)t === e[r - 1] && (i = n.push(r)); + while (i--)e.splice(n[i], 1) + } + return e + }, nt.error = function (e) { + throw new Error("Syntax error, unrecognized expression: " + e) + }, a = nt.compile = function (e, t) { + var n, r = [], i = [], s = A[d][e + " "]; + if (!s) { + t || (t = ut(e)), n = t.length; + while (n--)s = ht(t[n]), s[d] ? r.push(s) : i.push(s); + s = A(e, pt(i, r)) + } + return s + }, g.querySelectorAll && function () { + var e, t = vt, n = /'|\\/g, r = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g, i = [":focus"], s = [":active"], u = y.matchesSelector || y.mozMatchesSelector || y.webkitMatchesSelector || y.oMatchesSelector || y.msMatchesSelector; + K(function (e) { + e.innerHTML = "", e.querySelectorAll("[selected]").length || i.push("\\[" + O + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)"), e.querySelectorAll(":checked").length || i.push(":checked") + }), K(function (e) { + e.innerHTML = "

      ", e.querySelectorAll("[test^='']").length && i.push("[*^$]=" + O + "*(?:\"\"|'')"), e.innerHTML = "", e.querySelectorAll(":enabled").length || i.push(":enabled", ":disabled") + }), i = new RegExp(i.join("|")), vt = function (e, r, s, o, u) { + if (!o && !u && !i.test(e)) { + var a, f, l = !0, c = d, h = r, p = r.nodeType === 9 && e; + if (r.nodeType === 1 && r.nodeName.toLowerCase() !== "object") { + a = ut(e), (l = r.getAttribute("id")) ? c = l.replace(n, "\\$&") : r.setAttribute("id", c), c = "[id='" + c + "'] ", f = a.length; + while (f--)a[f] = c + a[f].join(""); + h = z.test(e) && r.parentNode || r, p = a.join(",") + } + if (p)try { + return S.apply(s, x.call(h.querySelectorAll(p), 0)), s + } catch (v) { + } finally { + l || r.removeAttribute("id") + } + } + return t(e, r, s, o, u) + }, u && (K(function (t) { + e = u.call(t, "div"); + try { + u.call(t, "[test!='']:sizzle"), s.push("!=", H) + } catch (n) { + } + }), s = new RegExp(s.join("|")), nt.matchesSelector = function (t, n) { + n = n.replace(r, "='$1']"); + if (!o(t) && !s.test(n) && !i.test(n))try { + var a = u.call(t, n); + if (a || e || t.document && t.document.nodeType !== 11)return a + } catch (f) { + } + return nt(n, null, null, [t]).length > 0 + }) + }(), i.pseudos.nth = i.pseudos.eq, i.filters = mt.prototype = i.pseudos, i.setFilters = new mt, nt.attr = v.attr, v.find = nt, v.expr = nt.selectors, v.expr[":"] = v.expr.pseudos, v.unique = nt.uniqueSort, v.text = nt.getText, v.isXMLDoc = nt.isXML, v.contains = nt.contains + }(e); + var nt = /Until$/, rt = /^(?:parents|prev(?:Until|All))/, it = /^.[^:#\[\.,]*$/, st = v.expr.match.needsContext, ot = { + children: !0, + contents: !0, + next: !0, + prev: !0 + }; + v.fn.extend({ + find: function (e) { + var t, n, r, i, s, o, u = this; + if (typeof e != "string")return v(e).filter(function () { + for (t = 0, n = u.length; t < n; t++)if (v.contains(u[t], this))return !0 + }); + o = this.pushStack("", "find", e); + for (t = 0, n = this.length; t < n; t++) { + r = o.length, v.find(e, this[t], o); + if (t > 0)for (i = r; i < o.length; i++)for (s = 0; s < r; s++)if (o[s] === o[i]) { + o.splice(i--, 1); + break + } + } + return o + }, has: function (e) { + var t, n = v(e, this), r = n.length; + return this.filter(function () { + for (t = 0; t < r; t++)if (v.contains(this, n[t]))return !0 + }) + }, not: function (e) { + return this.pushStack(ft(this, e, !1), "not", e) + }, filter: function (e) { + return this.pushStack(ft(this, e, !0), "filter", e) + }, is: function (e) { + return !!e && (typeof e == "string" ? st.test(e) ? v(e, this.context).index(this[0]) >= 0 : v.filter(e, this).length > 0 : this.filter(e).length > 0) + }, closest: function (e, t) { + var n, r = 0, i = this.length, s = [], o = st.test(e) || typeof e != "string" ? v(e, t || this.context) : 0; + for (; r < i; r++) { + n = this[r]; + while (n && n.ownerDocument && n !== t && n.nodeType !== 11) { + if (o ? o.index(n) > -1 : v.find.matchesSelector(n, e)) { + s.push(n); + break + } + n = n.parentNode + } + } + return s = s.length > 1 ? v.unique(s) : s, this.pushStack(s, "closest", e) + }, index: function (e) { + return e ? typeof e == "string" ? v.inArray(this[0], v(e)) : v.inArray(e.jquery ? e[0] : e, this) : this[0] && this[0].parentNode ? this.prevAll().length : -1 + }, add: function (e, t) { + var n = typeof e == "string" ? v(e, t) : v.makeArray(e && e.nodeType ? [e] : e), r = v.merge(this.get(), n); + return this.pushStack(ut(n[0]) || ut(r[0]) ? r : v.unique(r)) + }, addBack: function (e) { + return this.add(e == null ? this.prevObject : this.prevObject.filter(e)) + } + }), v.fn.andSelf = v.fn.addBack, v.each({ + parent: function (e) { + var t = e.parentNode; + return t && t.nodeType !== 11 ? t : null + }, parents: function (e) { + return v.dir(e, "parentNode") + }, parentsUntil: function (e, t, n) { + return v.dir(e, "parentNode", n) + }, next: function (e) { + return at(e, "nextSibling") + }, prev: function (e) { + return at(e, "previousSibling") + }, nextAll: function (e) { + return v.dir(e, "nextSibling") + }, prevAll: function (e) { + return v.dir(e, "previousSibling") + }, nextUntil: function (e, t, n) { + return v.dir(e, "nextSibling", n) + }, prevUntil: function (e, t, n) { + return v.dir(e, "previousSibling", n) + }, siblings: function (e) { + return v.sibling((e.parentNode || {}).firstChild, e) + }, children: function (e) { + return v.sibling(e.firstChild) + }, contents: function (e) { + return v.nodeName(e, "iframe") ? e.contentDocument || e.contentWindow.document : v.merge([], e.childNodes) + } + }, function (e, t) { + v.fn[e] = function (n, r) { + var i = v.map(this, t, n); + return nt.test(e) || (r = n), r && typeof r == "string" && (i = v.filter(r, i)), i = this.length > 1 && !ot[e] ? v.unique(i) : i, this.length > 1 && rt.test(e) && (i = i.reverse()), this.pushStack(i, e, l.call(arguments).join(",")) + } + }), v.extend({ + filter: function (e, t, n) { + return n && (e = ":not(" + e + ")"), t.length === 1 ? v.find.matchesSelector(t[0], e) ? [t[0]] : [] : v.find.matches(e, t) + }, dir: function (e, n, r) { + var i = [], s = e[n]; + while (s && s.nodeType !== 9 && (r === t || s.nodeType !== 1 || !v(s).is(r)))s.nodeType === 1 && i.push(s), s = s[n]; + return i + }, sibling: function (e, t) { + var n = []; + for (; e; e = e.nextSibling)e.nodeType === 1 && e !== t && n.push(e); + return n + } + }); + var ct = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", ht = / jQuery\d+="(?:null|\d+)"/g, pt = /^\s+/, dt = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, vt = /<([\w:]+)/, mt = /]", "i"), Et = /^(?:checkbox|radio)$/, St = /checked\s*(?:[^=]|=\s*.checked.)/i, xt = /\/(java|ecma)script/i, Tt = /^\s*\s*$/g, Nt = { + option: [1, ""], + legend: [1, "
      ", "
      "], + thead: [1, "", "
      "], + tr: [2, "", "
      "], + td: [3, "", "
      "], + col: [2, "", "
      "], + area: [1, "", ""], + _default: [0, "", ""] + }, Ct = lt(i), kt = Ct.appendChild(i.createElement("div")); + Nt.optgroup = Nt.option, Nt.tbody = Nt.tfoot = Nt.colgroup = Nt.caption = Nt.thead, Nt.th = Nt.td, v.support.htmlSerialize || (Nt._default = [1, "X
      ", "
      "]), v.fn.extend({ + text: function (e) { + return v.access(this, function (e) { + return e === t ? v.text(this) : this.empty().append((this[0] && this[0].ownerDocument || i).createTextNode(e)) + }, null, e, arguments.length) + }, wrapAll: function (e) { + if (v.isFunction(e))return this.each(function (t) { + v(this).wrapAll(e.call(this, t)) + }); + if (this[0]) { + var t = v(e, this[0].ownerDocument).eq(0).clone(!0); + this[0].parentNode && t.insertBefore(this[0]), t.map(function () { + var e = this; + while (e.firstChild && e.firstChild.nodeType === 1)e = e.firstChild; + return e + }).append(this) + } + return this + }, wrapInner: function (e) { + return v.isFunction(e) ? this.each(function (t) { + v(this).wrapInner(e.call(this, t)) + }) : this.each(function () { + var t = v(this), n = t.contents(); + n.length ? n.wrapAll(e) : t.append(e) + }) + }, wrap: function (e) { + var t = v.isFunction(e); + return this.each(function (n) { + v(this).wrapAll(t ? e.call(this, n) : e) + }) + }, unwrap: function () { + return this.parent().each(function () { + v.nodeName(this, "body") || v(this).replaceWith(this.childNodes) + }).end() + }, append: function () { + return this.domManip(arguments, !0, function (e) { + (this.nodeType === 1 || this.nodeType === 11) && this.appendChild(e) + }) + }, prepend: function () { + return this.domManip(arguments, !0, function (e) { + (this.nodeType === 1 || this.nodeType === 11) && this.insertBefore(e, this.firstChild) + }) + }, before: function () { + if (!ut(this[0]))return this.domManip(arguments, !1, function (e) { + this.parentNode.insertBefore(e, this) + }); + if (arguments.length) { + var e = v.clean(arguments); + return this.pushStack(v.merge(e, this), "before", this.selector) + } + }, after: function () { + if (!ut(this[0]))return this.domManip(arguments, !1, function (e) { + this.parentNode.insertBefore(e, this.nextSibling) + }); + if (arguments.length) { + var e = v.clean(arguments); + return this.pushStack(v.merge(this, e), "after", this.selector) + } + }, remove: function (e, t) { + var n, r = 0; + for (; (n = this[r]) != null; r++)if (!e || v.filter(e, [n]).length)!t && n.nodeType === 1 && (v.cleanData(n.getElementsByTagName("*")), v.cleanData([n])), n.parentNode && n.parentNode.removeChild(n); + return this + }, empty: function () { + var e, t = 0; + for (; (e = this[t]) != null; t++) { + e.nodeType === 1 && v.cleanData(e.getElementsByTagName("*")); + while (e.firstChild)e.removeChild(e.firstChild) + } + return this + }, clone: function (e, t) { + return e = e == null ? !1 : e, t = t == null ? e : t, this.map(function () { + return v.clone(this, e, t) + }) + }, html: function (e) { + return v.access(this, function (e) { + var n = this[0] || {}, r = 0, i = this.length; + if (e === t)return n.nodeType === 1 ? n.innerHTML.replace(ht, "") : t; + if (typeof e == "string" && !yt.test(e) && (v.support.htmlSerialize || !wt.test(e)) && (v.support.leadingWhitespace || !pt.test(e)) && !Nt[(vt.exec(e) || ["", ""])[1].toLowerCase()]) { + e = e.replace(dt, "<$1>"); + try { + for (; r < i; r++)n = this[r] || {}, n.nodeType === 1 && (v.cleanData(n.getElementsByTagName("*")), n.innerHTML = e); + n = 0 + } catch (s) { + } + } + n && this.empty().append(e) + }, null, e, arguments.length) + }, replaceWith: function (e) { + return ut(this[0]) ? this.length ? this.pushStack(v(v.isFunction(e) ? e() : e), "replaceWith", e) : this : v.isFunction(e) ? this.each(function (t) { + var n = v(this), r = n.html(); + n.replaceWith(e.call(this, t, r)) + }) : (typeof e != "string" && (e = v(e).detach()), this.each(function () { + var t = this.nextSibling, n = this.parentNode; + v(this).remove(), t ? v(t).before(e) : v(n).append(e) + })) + }, detach: function (e) { + return this.remove(e, !0) + }, domManip: function (e, n, r) { + e = [].concat.apply([], e); + var i, s, o, u, a = 0, f = e[0], l = [], c = this.length; + if (!v.support.checkClone && c > 1 && typeof f == "string" && St.test(f))return this.each(function () { + v(this).domManip(e, n, r) + }); + if (v.isFunction(f))return this.each(function (i) { + var s = v(this); + e[0] = f.call(this, i, n ? s.html() : t), s.domManip(e, n, r) + }); + if (this[0]) { + i = v.buildFragment(e, this, l), o = i.fragment, s = o.firstChild, o.childNodes.length === 1 && (o = s); + if (s) { + n = n && v.nodeName(s, "tr"); + for (u = i.cacheable || c - 1; a < c; a++)r.call(n && v.nodeName(this[a], "table") ? Lt(this[a], "tbody") : this[a], a === u ? o : v.clone(o, !0, !0)) + } + o = s = null, l.length && v.each(l, function (e, t) { + t.src ? v.ajax ? v.ajax({ + url: t.src, + type: "GET", + dataType: "script", + async: !1, + global: !1, + "throws": !0 + }) : v.error("no ajax") : v.globalEval((t.text || t.textContent || t.innerHTML || "").replace(Tt, "")), t.parentNode && t.parentNode.removeChild(t) + }) + } + return this + } + }), v.buildFragment = function (e, n, r) { + var s, o, u, a = e[0]; + return n = n || i, n = !n.nodeType && n[0] || n, n = n.ownerDocument || n, e.length === 1 && typeof a == "string" && a.length < 512 && n === i && a.charAt(0) === "<" && !bt.test(a) && (v.support.checkClone || !St.test(a)) && (v.support.html5Clone || !wt.test(a)) && (o = !0, s = v.fragments[a], u = s !== t), s || (s = n.createDocumentFragment(), v.clean(e, n, s, r), o && (v.fragments[a] = u && s)), { + fragment: s, + cacheable: o + } + }, v.fragments = {}, v.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" + }, function (e, t) { + v.fn[e] = function (n) { + var r, i = 0, s = [], o = v(n), u = o.length, a = this.length === 1 && this[0].parentNode; + if ((a == null || a && a.nodeType === 11 && a.childNodes.length === 1) && u === 1)return o[t](this[0]), this; + for (; i < u; i++)r = (i > 0 ? this.clone(!0) : this).get(), v(o[i])[t](r), s = s.concat(r); + return this.pushStack(s, e, o.selector) + } + }), v.extend({ + clone: function (e, t, n) { + var r, i, s, o; + v.support.html5Clone || v.isXMLDoc(e) || !wt.test("<" + e.nodeName + ">") ? o = e.cloneNode(!0) : (kt.innerHTML = e.outerHTML, kt.removeChild(o = kt.firstChild)); + if ((!v.support.noCloneEvent || !v.support.noCloneChecked) && (e.nodeType === 1 || e.nodeType === 11) && !v.isXMLDoc(e)) { + Ot(e, o), r = Mt(e), i = Mt(o); + for (s = 0; r[s]; ++s)i[s] && Ot(r[s], i[s]) + } + if (t) { + At(e, o); + if (n) { + r = Mt(e), i = Mt(o); + for (s = 0; r[s]; ++s)At(r[s], i[s]) + } + } + return r = i = null, o + }, clean: function (e, t, n, r) { + var s, o, u, a, f, l, c, h, p, d, m, g, y = t === i && Ct, b = []; + if (!t || typeof t.createDocumentFragment == "undefined")t = i; + for (s = 0; (u = e[s]) != null; s++) { + typeof u == "number" && (u += ""); + if (!u)continue; + if (typeof u == "string")if (!gt.test(u))u = t.createTextNode(u); else { + y = y || lt(t), c = t.createElement("div"), y.appendChild(c), u = u.replace(dt, "<$1>"), a = (vt.exec(u) || ["", ""])[1].toLowerCase(), f = Nt[a] || Nt._default, l = f[0], c.innerHTML = f[1] + u + f[2]; + while (l--)c = c.lastChild; + if (!v.support.tbody) { + h = mt.test(u), p = a === "table" && !h ? c.firstChild && c.firstChild.childNodes : f[1] === "" && !h ? c.childNodes : []; + for (o = p.length - 1; o >= 0; --o)v.nodeName(p[o], "tbody") && !p[o].childNodes.length && p[o].parentNode.removeChild(p[o]) + } + !v.support.leadingWhitespace && pt.test(u) && c.insertBefore(t.createTextNode(pt.exec(u)[0]), c.firstChild), u = c.childNodes, c.parentNode.removeChild(c) + } + u.nodeType ? b.push(u) : v.merge(b, u) + } + c && (u = c = y = null); + if (!v.support.appendChecked)for (s = 0; (u = b[s]) != null; s++)v.nodeName(u, "input") ? _t(u) : typeof u.getElementsByTagName != "undefined" && v.grep(u.getElementsByTagName("input"), _t); + if (n) { + m = function (e) { + if (!e.type || xt.test(e.type))return r ? r.push(e.parentNode ? e.parentNode.removeChild(e) : e) : n.appendChild(e) + }; + for (s = 0; (u = b[s]) != null; s++)if (!v.nodeName(u, "script") || !m(u))n.appendChild(u), typeof u.getElementsByTagName != "undefined" && (g = v.grep(v.merge([], u.getElementsByTagName("script")), m), b.splice.apply(b, [s + 1, 0].concat(g)), s += g.length) + } + return b + }, cleanData: function (e, t) { + var n, r, i, s, o = 0, u = v.expando, a = v.cache, f = v.support.deleteExpando, l = v.event.special; + for (; (i = e[o]) != null; o++)if (t || v.acceptData(i)) { + r = i[u], n = r && a[r]; + if (n) { + if (n.events)for (s in n.events)l[s] ? v.event.remove(i, s) : v.removeEvent(i, s, n.handle); + a[r] && (delete a[r], f ? delete i[u] : i.removeAttribute ? i.removeAttribute(u) : i[u] = null, v.deletedIds.push(r)) + } + } + } + }), function () { + var e, t; + v.uaMatch = function (e) { + e = e.toLowerCase(); + var t = /(chrome)[ \/]([\w.]+)/.exec(e) || /(webkit)[ \/]([\w.]+)/.exec(e) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e) || /(msie) ([\w.]+)/.exec(e) || e.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e) || []; + return {browser: t[1] || "", version: t[2] || "0"} + }, e = v.uaMatch(o.userAgent), t = {}, e.browser && (t[e.browser] = !0, t.version = e.version), t.chrome ? t.webkit = !0 : t.webkit && (t.safari = !0), v.browser = t, v.sub = function () { + function e(t, n) { + return new e.fn.init(t, n) + } + + v.extend(!0, e, this), e.superclass = this, e.fn = e.prototype = this(), e.fn.constructor = e, e.sub = this.sub, e.fn.init = function (r, i) { + return i && i instanceof v && !(i instanceof e) && (i = e(i)), v.fn.init.call(this, r, i, t) + }, e.fn.init.prototype = e.fn; + var t = e(i); + return e + } + }(); + var Dt, Pt, Ht, Bt = /alpha\([^)]*\)/i, jt = /opacity=([^)]*)/, Ft = /^(top|right|bottom|left)$/, It = /^(none|table(?!-c[ea]).+)/, qt = /^margin/, Rt = new RegExp("^(" + m + ")(.*)$", "i"), Ut = new RegExp("^(" + m + ")(?!px)[a-z%]+$", "i"), zt = new RegExp("^([-+])=(" + m + ")", "i"), Wt = {BODY: "block"}, Xt = { + position: "absolute", + visibility: "hidden", + display: "block" + }, Vt = { + letterSpacing: 0, + fontWeight: 400 + }, $t = ["Top", "Right", "Bottom", "Left"], Jt = ["Webkit", "O", "Moz", "ms"], Kt = v.fn.toggle; + v.fn.extend({ + css: function (e, n) { + return v.access(this, function (e, n, r) { + return r !== t ? v.style(e, n, r) : v.css(e, n) + }, e, n, arguments.length > 1) + }, show: function () { + return Yt(this, !0) + }, hide: function () { + return Yt(this) + }, toggle: function (e, t) { + var n = typeof e == "boolean"; + return v.isFunction(e) && v.isFunction(t) ? Kt.apply(this, arguments) : this.each(function () { + (n ? e : Gt(this)) ? v(this).show() : v(this).hide() + }) + } + }), v.extend({ + cssHooks: { + opacity: { + get: function (e, t) { + if (t) { + var n = Dt(e, "opacity"); + return n === "" ? "1" : n + } + } + } + }, + cssNumber: { + fillOpacity: !0, + fontWeight: !0, + lineHeight: !0, + opacity: !0, + orphans: !0, + widows: !0, + zIndex: !0, + zoom: !0 + }, + cssProps: {"float": v.support.cssFloat ? "cssFloat" : "styleFloat"}, + style: function (e, n, r, i) { + if (!e || e.nodeType === 3 || e.nodeType === 8 || !e.style)return; + var s, o, u, a = v.camelCase(n), f = e.style; + n = v.cssProps[a] || (v.cssProps[a] = Qt(f, a)), u = v.cssHooks[n] || v.cssHooks[a]; + if (r === t)return u && "get"in u && (s = u.get(e, !1, i)) !== t ? s : f[n]; + o = typeof r, o === "string" && (s = zt.exec(r)) && (r = (s[1] + 1) * s[2] + parseFloat(v.css(e, n)), o = "number"); + if (r == null || o === "number" && isNaN(r))return; + o === "number" && !v.cssNumber[a] && (r += "px"); + if (!u || !("set"in u) || (r = u.set(e, r, i)) !== t)try { + f[n] = r + } catch (l) { + } + }, + css: function (e, n, r, i) { + var s, o, u, a = v.camelCase(n); + return n = v.cssProps[a] || (v.cssProps[a] = Qt(e.style, a)), u = v.cssHooks[n] || v.cssHooks[a], u && "get"in u && (s = u.get(e, !0, i)), s === t && (s = Dt(e, n)), s === "normal" && n in Vt && (s = Vt[n]), r || i !== t ? (o = parseFloat(s), r || v.isNumeric(o) ? o || 0 : s) : s + }, + swap: function (e, t, n) { + var r, i, s = {}; + for (i in t)s[i] = e.style[i], e.style[i] = t[i]; + r = n.call(e); + for (i in t)e.style[i] = s[i]; + return r + } + }), e.getComputedStyle ? Dt = function (t, n) { + var r, i, s, o, u = e.getComputedStyle(t, null), a = t.style; + return u && (r = u.getPropertyValue(n) || u[n], r === "" && !v.contains(t.ownerDocument, t) && (r = v.style(t, n)), Ut.test(r) && qt.test(n) && (i = a.width, s = a.minWidth, o = a.maxWidth, a.minWidth = a.maxWidth = a.width = r, r = u.width, a.width = i, a.minWidth = s, a.maxWidth = o)), r + } : i.documentElement.currentStyle && (Dt = function (e, t) { + var n, r, i = e.currentStyle && e.currentStyle[t], s = e.style; + return i == null && s && s[t] && (i = s[t]), Ut.test(i) && !Ft.test(t) && (n = s.left, r = e.runtimeStyle && e.runtimeStyle.left, r && (e.runtimeStyle.left = e.currentStyle.left), s.left = t === "fontSize" ? "1em" : i, i = s.pixelLeft + "px", s.left = n, r && (e.runtimeStyle.left = r)), i === "" ? "auto" : i + }), v.each(["height", "width"], function (e, t) { + v.cssHooks[t] = { + get: function (e, n, r) { + if (n)return e.offsetWidth === 0 && It.test(Dt(e, "display")) ? v.swap(e, Xt, function () { + return tn(e, t, r) + }) : tn(e, t, r) + }, set: function (e, n, r) { + return Zt(e, n, r ? en(e, t, r, v.support.boxSizing && v.css(e, "boxSizing") === "border-box") : 0) + } + } + }), v.support.opacity || (v.cssHooks.opacity = { + get: function (e, t) { + return jt.test((t && e.currentStyle ? e.currentStyle.filter : e.style.filter) || "") ? .01 * parseFloat(RegExp.$1) + "" : t ? "1" : "" + }, set: function (e, t) { + var n = e.style, r = e.currentStyle, i = v.isNumeric(t) ? "alpha(opacity=" + t * 100 + ")" : "", s = r && r.filter || n.filter || ""; + n.zoom = 1; + if (t >= 1 && v.trim(s.replace(Bt, "")) === "" && n.removeAttribute) { + n.removeAttribute("filter"); + if (r && !r.filter)return + } + n.filter = Bt.test(s) ? s.replace(Bt, i) : s + " " + i + } + }), v(function () { + v.support.reliableMarginRight || (v.cssHooks.marginRight = { + get: function (e, t) { + return v.swap(e, {display: "inline-block"}, function () { + if (t)return Dt(e, "marginRight") + }) + } + }), !v.support.pixelPosition && v.fn.position && v.each(["top", "left"], function (e, t) { + v.cssHooks[t] = { + get: function (e, n) { + if (n) { + var r = Dt(e, t); + return Ut.test(r) ? v(e).position()[t] + "px" : r + } + } + } + }) + }), v.expr && v.expr.filters && (v.expr.filters.hidden = function (e) { + return e.offsetWidth === 0 && e.offsetHeight === 0 || !v.support.reliableHiddenOffsets && (e.style && e.style.display || Dt(e, "display")) === "none" + }, v.expr.filters.visible = function (e) { + return !v.expr.filters.hidden(e) + }), v.each({margin: "", padding: "", border: "Width"}, function (e, t) { + v.cssHooks[e + t] = { + expand: function (n) { + var r, i = typeof n == "string" ? n.split(" ") : [n], s = {}; + for (r = 0; r < 4; r++)s[e + $t[r] + t] = i[r] || i[r - 2] || i[0]; + return s + } + }, qt.test(e) || (v.cssHooks[e + t].set = Zt) + }); + var rn = /%20/g, sn = /\[\]$/, on = /\r?\n/g, un = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, an = /^(?:select|textarea)/i; + v.fn.extend({ + serialize: function () { + return v.param(this.serializeArray()) + }, serializeArray: function () { + return this.map(function () { + return this.elements ? v.makeArray(this.elements) : this + }).filter(function () { + return this.name && !this.disabled && (this.checked || an.test(this.nodeName) || un.test(this.type)) + }).map(function (e, t) { + var n = v(this).val(); + return n == null ? null : v.isArray(n) ? v.map(n, function (e, n) { + return {name: t.name, value: e.replace(on, "\r\n")} + }) : {name: t.name, value: n.replace(on, "\r\n")} + }).get() + } + }), v.param = function (e, n) { + var r, i = [], s = function (e, t) { + t = v.isFunction(t) ? t() : t == null ? "" : t, i[i.length] = encodeURIComponent(e) + "=" + encodeURIComponent(t) + }; + n === t && (n = v.ajaxSettings && v.ajaxSettings.traditional); + if (v.isArray(e) || e.jquery && !v.isPlainObject(e))v.each(e, function () { + s(this.name, this.value) + }); else for (r in e)fn(r, e[r], n, s); + return i.join("&").replace(rn, "+") + }; + var ln, cn, hn = /#.*$/, pn = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, dn = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/, vn = /^(?:GET|HEAD)$/, mn = /^\/\//, gn = /\?/, yn = /)<[^<]*)*<\/script>/gi, bn = /([?&])_=[^&]*/, wn = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/, En = v.fn.load, Sn = {}, xn = {}, Tn = ["*/"] + ["*"]; + try { + cn = s.href + } catch (Nn) { + cn = i.createElement("a"), cn.href = "", cn = cn.href + } + ln = wn.exec(cn.toLowerCase()) || [], v.fn.load = function (e, n, r) { + if (typeof e != "string" && En)return En.apply(this, arguments); + if (!this.length)return this; + var i, s, o, u = this, a = e.indexOf(" "); + return a >= 0 && (i = e.slice(a, e.length), e = e.slice(0, a)), v.isFunction(n) ? (r = n, n = t) : n && typeof n == "object" && (s = "POST"), v.ajax({ + url: e, + type: s, + dataType: "html", + data: n, + complete: function (e, t) { + r && u.each(r, o || [e.responseText, t, e]) + } + }).done(function (e) { + o = arguments, u.html(i ? v("
      ").append(e.replace(yn, "")).find(i) : e) + }), this + }, v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function (e, t) { + v.fn[t] = function (e) { + return this.on(t, e) + } + }), v.each(["get", "post"], function (e, n) { + v[n] = function (e, r, i, s) { + return v.isFunction(r) && (s = s || i, i = r, r = t), v.ajax({ + type: n, + url: e, + data: r, + success: i, + dataType: s + }) + } + }), v.extend({ + getScript: function (e, n) { + return v.get(e, t, n, "script") + }, + getJSON: function (e, t, n) { + return v.get(e, t, n, "json") + }, + ajaxSetup: function (e, t) { + return t ? Ln(e, v.ajaxSettings) : (t = e, e = v.ajaxSettings), Ln(e, t), e + }, + ajaxSettings: { + url: cn, + isLocal: dn.test(ln[1]), + global: !0, + type: "GET", + contentType: "application/x-www-form-urlencoded; charset=UTF-8", + processData: !0, + async: !0, + accepts: { + xml: "application/xml, text/xml", + html: "text/html", + text: "text/plain", + json: "application/json, text/javascript", + "*": Tn + }, + contents: {xml: /xml/, html: /html/, json: /json/}, + responseFields: {xml: "responseXML", text: "responseText"}, + converters: {"* text": e.String, "text html": !0, "text json": v.parseJSON, "text xml": v.parseXML}, + flatOptions: {context: !0, url: !0} + }, + ajaxPrefilter: Cn(Sn), + ajaxTransport: Cn(xn), + ajax: function (e, n) { + function T(e, n, s, a) { + var l, y, b, w, S, T = n; + if (E === 2)return; + E = 2, u && clearTimeout(u), o = t, i = a || "", x.readyState = e > 0 ? 4 : 0, s && (w = An(c, x, s)); + if (e >= 200 && e < 300 || e === 304)c.ifModified && (S = x.getResponseHeader("Last-Modified"), S && (v.lastModified[r] = S), S = x.getResponseHeader("Etag"), S && (v.etag[r] = S)), e === 304 ? (T = "notmodified", l = !0) : (l = On(c, w), T = l.state, y = l.data, b = l.error, l = !b); else { + b = T; + if (!T || e)T = "error", e < 0 && (e = 0) + } + x.status = e, x.statusText = (n || T) + "", l ? d.resolveWith(h, [y, T, x]) : d.rejectWith(h, [x, T, b]), x.statusCode(g), g = t, f && p.trigger("ajax" + (l ? "Success" : "Error"), [x, c, l ? y : b]), m.fireWith(h, [x, T]), f && (p.trigger("ajaxComplete", [x, c]), --v.active || v.event.trigger("ajaxStop")) + } + + typeof e == "object" && (n = e, e = t), n = n || {}; + var r, i, s, o, u, a, f, l, c = v.ajaxSetup({}, n), h = c.context || c, p = h !== c && (h.nodeType || h instanceof v) ? v(h) : v.event, d = v.Deferred(), m = v.Callbacks("once memory"), g = c.statusCode || {}, b = {}, w = {}, E = 0, S = "canceled", x = { + readyState: 0, + setRequestHeader: function (e, t) { + if (!E) { + var n = e.toLowerCase(); + e = w[n] = w[n] || e, b[e] = t + } + return this + }, + getAllResponseHeaders: function () { + return E === 2 ? i : null + }, + getResponseHeader: function (e) { + var n; + if (E === 2) { + if (!s) { + s = {}; + while (n = pn.exec(i))s[n[1].toLowerCase()] = n[2] + } + n = s[e.toLowerCase()] + } + return n === t ? null : n + }, + overrideMimeType: function (e) { + return E || (c.mimeType = e), this + }, + abort: function (e) { + return e = e || S, o && o.abort(e), T(0, e), this + } + }; + d.promise(x), x.success = x.done, x.error = x.fail, x.complete = m.add, x.statusCode = function (e) { + if (e) { + var t; + if (E < 2)for (t in e)g[t] = [g[t], e[t]]; else t = e[x.status], x.always(t) + } + return this + }, c.url = ((e || c.url) + "").replace(hn, "").replace(mn, ln[1] + "//"), c.dataTypes = v.trim(c.dataType || "*").toLowerCase().split(y), c.crossDomain == null && (a = wn.exec(c.url.toLowerCase()), c.crossDomain = !(!a || a[1] === ln[1] && a[2] === ln[2] && (a[3] || (a[1] === "http:" ? 80 : 443)) == (ln[3] || (ln[1] === "http:" ? 80 : 443)))), c.data && c.processData && typeof c.data != "string" && (c.data = v.param(c.data, c.traditional)), kn(Sn, c, n, x); + if (E === 2)return x; + f = c.global, c.type = c.type.toUpperCase(), c.hasContent = !vn.test(c.type), f && v.active++ === 0 && v.event.trigger("ajaxStart"); + if (!c.hasContent) { + c.data && (c.url += (gn.test(c.url) ? "&" : "?") + c.data, delete c.data), r = c.url; + if (c.cache === !1) { + var N = v.now(), C = c.url.replace(bn, "$1_=" + N); + c.url = C + (C === c.url ? (gn.test(c.url) ? "&" : "?") + "_=" + N : "") + } + } + (c.data && c.hasContent && c.contentType !== !1 || n.contentType) && x.setRequestHeader("Content-Type", c.contentType), c.ifModified && (r = r || c.url, v.lastModified[r] && x.setRequestHeader("If-Modified-Since", v.lastModified[r]), v.etag[r] && x.setRequestHeader("If-None-Match", v.etag[r])), x.setRequestHeader("Accept", c.dataTypes[0] && c.accepts[c.dataTypes[0]] ? c.accepts[c.dataTypes[0]] + (c.dataTypes[0] !== "*" ? ", " + Tn + "; q=0.01" : "") : c.accepts["*"]); + for (l in c.headers)x.setRequestHeader(l, c.headers[l]); + if (!c.beforeSend || c.beforeSend.call(h, x, c) !== !1 && E !== 2) { + S = "abort"; + for (l in{success: 1, error: 1, complete: 1})x[l](c[l]); + o = kn(xn, c, n, x); + if (!o)T(-1, "No Transport"); else { + x.readyState = 1, f && p.trigger("ajaxSend", [x, c]), c.async && c.timeout > 0 && (u = setTimeout(function () { + x.abort("timeout") + }, c.timeout)); + try { + E = 1, o.send(b, T) + } catch (k) { + if (!(E < 2))throw k; + T(-1, k) + } + } + return x + } + return x.abort() + }, + active: 0, + lastModified: {}, + etag: {} + }); + var Mn = [], _n = /\?/, Dn = /(=)\?(?=&|$)|\?\?/, Pn = v.now(); + v.ajaxSetup({ + jsonp: "callback", jsonpCallback: function () { + var e = Mn.pop() || v.expando + "_" + Pn++; + return this[e] = !0, e + } + }), v.ajaxPrefilter("json jsonp", function (n, r, i) { + var s, o, u, a = n.data, f = n.url, l = n.jsonp !== !1, c = l && Dn.test(f), h = l && !c && typeof a == "string" && !(n.contentType || "").indexOf("application/x-www-form-urlencoded") && Dn.test(a); + if (n.dataTypes[0] === "jsonp" || c || h)return s = n.jsonpCallback = v.isFunction(n.jsonpCallback) ? n.jsonpCallback() : n.jsonpCallback, o = e[s], c ? n.url = f.replace(Dn, "$1" + s) : h ? n.data = a.replace(Dn, "$1" + s) : l && (n.url += (_n.test(f) ? "&" : "?") + n.jsonp + "=" + s), n.converters["script json"] = function () { + return u || v.error(s + " was not called"), u[0] + }, n.dataTypes[0] = "json", e[s] = function () { + u = arguments + }, i.always(function () { + e[s] = o, n[s] && (n.jsonpCallback = r.jsonpCallback, Mn.push(s)), u && v.isFunction(o) && o(u[0]), u = o = t + }), "script" + }), v.ajaxSetup({ + accepts: {script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"}, + contents: {script: /javascript|ecmascript/}, + converters: { + "text script": function (e) { + return v.globalEval(e), e + } + } + }), v.ajaxPrefilter("script", function (e) { + e.cache === t && (e.cache = !1), e.crossDomain && (e.type = "GET", e.global = !1) + }), v.ajaxTransport("script", function (e) { + if (e.crossDomain) { + var n, r = i.head || i.getElementsByTagName("head")[0] || i.documentElement; + return { + send: function (s, o) { + n = i.createElement("script"), n.async = "async", e.scriptCharset && (n.charset = e.scriptCharset), n.src = e.url, n.onload = n.onreadystatechange = function (e, i) { + if (i || !n.readyState || /loaded|complete/.test(n.readyState))n.onload = n.onreadystatechange = null, r && n.parentNode && r.removeChild(n), n = t, i || o(200, "success") + }, r.insertBefore(n, r.firstChild) + }, abort: function () { + n && n.onload(0, 1) + } + } + } + }); + var Hn, Bn = e.ActiveXObject ? function () { + for (var e in Hn)Hn[e](0, 1) + } : !1, jn = 0; + v.ajaxSettings.xhr = e.ActiveXObject ? function () { + return !this.isLocal && Fn() || In() + } : Fn, function (e) { + v.extend(v.support, {ajax: !!e, cors: !!e && "withCredentials"in e}) + }(v.ajaxSettings.xhr()), v.support.ajax && v.ajaxTransport(function (n) { + if (!n.crossDomain || v.support.cors) { + var r; + return { + send: function (i, s) { + var o, u, a = n.xhr(); + n.username ? a.open(n.type, n.url, n.async, n.username, n.password) : a.open(n.type, n.url, n.async); + if (n.xhrFields)for (u in n.xhrFields)a[u] = n.xhrFields[u]; + n.mimeType && a.overrideMimeType && a.overrideMimeType(n.mimeType), !n.crossDomain && !i["X-Requested-With"] && (i["X-Requested-With"] = "XMLHttpRequest"); + try { + for (u in i)a.setRequestHeader(u, i[u]) + } catch (f) { + } + a.send(n.hasContent && n.data || null), r = function (e, i) { + var u, f, l, c, h; + try { + if (r && (i || a.readyState === 4)) { + r = t, o && (a.onreadystatechange = v.noop, Bn && delete Hn[o]); + if (i)a.readyState !== 4 && a.abort(); else { + u = a.status, l = a.getAllResponseHeaders(), c = {}, h = a.responseXML, h && h.documentElement && (c.xml = h); + try { + c.text = a.responseText + } catch (p) { + } + try { + f = a.statusText + } catch (p) { + f = "" + } + !u && n.isLocal && !n.crossDomain ? u = c.text ? 200 : 404 : u === 1223 && (u = 204) + } + } + } catch (d) { + i || s(-1, d) + } + c && s(u, f, c, l) + }, n.async ? a.readyState === 4 ? setTimeout(r, 0) : (o = ++jn, Bn && (Hn || (Hn = {}, v(e).unload(Bn)), Hn[o] = r), a.onreadystatechange = r) : r() + }, abort: function () { + r && r(0, 1) + } + } + } + }); + var qn, Rn, Un = /^(?:toggle|show|hide)$/, zn = new RegExp("^(?:([-+])=|)(" + m + ")([a-z%]*)$", "i"), Wn = /queueHooks$/, Xn = [Gn], Vn = { + "*": [function (e, t) { + var n, r, i = this.createTween(e, t), s = zn.exec(t), o = i.cur(), u = +o || 0, a = 1, f = 20; + if (s) { + n = +s[2], r = s[3] || (v.cssNumber[e] ? "" : "px"); + if (r !== "px" && u) { + u = v.css(i.elem, e, !0) || n || 1; + do a = a || ".5", u /= a, v.style(i.elem, e, u + r); while (a !== (a = i.cur() / o) && a !== 1 && --f) + } + i.unit = r, i.start = u, i.end = s[1] ? u + (s[1] + 1) * n : n + } + return i + }] + }; + v.Animation = v.extend(Kn, { + tweener: function (e, t) { + v.isFunction(e) ? (t = e, e = ["*"]) : e = e.split(" "); + var n, r = 0, i = e.length; + for (; r < i; r++)n = e[r], Vn[n] = Vn[n] || [], Vn[n].unshift(t) + }, prefilter: function (e, t) { + t ? Xn.unshift(e) : Xn.push(e) + } + }), v.Tween = Yn, Yn.prototype = { + constructor: Yn, init: function (e, t, n, r, i, s) { + this.elem = e, this.prop = n, this.easing = i || "swing", this.options = t, this.start = this.now = this.cur(), this.end = r, this.unit = s || (v.cssNumber[n] ? "" : "px") + }, cur: function () { + var e = Yn.propHooks[this.prop]; + return e && e.get ? e.get(this) : Yn.propHooks._default.get(this) + }, run: function (e) { + var t, n = Yn.propHooks[this.prop]; + return this.options.duration ? this.pos = t = v.easing[this.easing](e, this.options.duration * e, 0, 1, this.options.duration) : this.pos = t = e, this.now = (this.end - this.start) * t + this.start, this.options.step && this.options.step.call(this.elem, this.now, this), n && n.set ? n.set(this) : Yn.propHooks._default.set(this), this + } + }, Yn.prototype.init.prototype = Yn.prototype, Yn.propHooks = { + _default: { + get: function (e) { + var t; + return e.elem[e.prop] == null || !!e.elem.style && e.elem.style[e.prop] != null ? (t = v.css(e.elem, e.prop, !1, ""), !t || t === "auto" ? 0 : t) : e.elem[e.prop] + }, set: function (e) { + v.fx.step[e.prop] ? v.fx.step[e.prop](e) : e.elem.style && (e.elem.style[v.cssProps[e.prop]] != null || v.cssHooks[e.prop]) ? v.style(e.elem, e.prop, e.now + e.unit) : e.elem[e.prop] = e.now + } + } + }, Yn.propHooks.scrollTop = Yn.propHooks.scrollLeft = { + set: function (e) { + e.elem.nodeType && e.elem.parentNode && (e.elem[e.prop] = e.now) + } + }, v.each(["toggle", "show", "hide"], function (e, t) { + var n = v.fn[t]; + v.fn[t] = function (r, i, s) { + return r == null || typeof r == "boolean" || !e && v.isFunction(r) && v.isFunction(i) ? n.apply(this, arguments) : this.animate(Zn(t, !0), r, i, s) + } + }), v.fn.extend({ + fadeTo: function (e, t, n, r) { + return this.filter(Gt).css("opacity", 0).show().end().animate({opacity: t}, e, n, r) + }, animate: function (e, t, n, r) { + var i = v.isEmptyObject(e), s = v.speed(t, n, r), o = function () { + var t = Kn(this, v.extend({}, e), s); + i && t.stop(!0) + }; + return i || s.queue === !1 ? this.each(o) : this.queue(s.queue, o) + }, stop: function (e, n, r) { + var i = function (e) { + var t = e.stop; + delete e.stop, t(r) + }; + return typeof e != "string" && (r = n, n = e, e = t), n && e !== !1 && this.queue(e || "fx", []), this.each(function () { + var t = !0, n = e != null && e + "queueHooks", s = v.timers, o = v._data(this); + if (n)o[n] && o[n].stop && i(o[n]); else for (n in o)o[n] && o[n].stop && Wn.test(n) && i(o[n]); + for (n = s.length; n--;)s[n].elem === this && (e == null || s[n].queue === e) && (s[n].anim.stop(r), t = !1, s.splice(n, 1)); + (t || !r) && v.dequeue(this, e) + }) + } + }), v.each({ + slideDown: Zn("show"), + slideUp: Zn("hide"), + slideToggle: Zn("toggle"), + fadeIn: {opacity: "show"}, + fadeOut: {opacity: "hide"}, + fadeToggle: {opacity: "toggle"} + }, function (e, t) { + v.fn[e] = function (e, n, r) { + return this.animate(t, e, n, r) + } + }), v.speed = function (e, t, n) { + var r = e && typeof e == "object" ? v.extend({}, e) : { + complete: n || !n && t || v.isFunction(e) && e, + duration: e, + easing: n && t || t && !v.isFunction(t) && t + }; + r.duration = v.fx.off ? 0 : typeof r.duration == "number" ? r.duration : r.duration in v.fx.speeds ? v.fx.speeds[r.duration] : v.fx.speeds._default; + if (r.queue == null || r.queue === !0)r.queue = "fx"; + return r.old = r.complete, r.complete = function () { + v.isFunction(r.old) && r.old.call(this), r.queue && v.dequeue(this, r.queue) + }, r + }, v.easing = { + linear: function (e) { + return e + }, swing: function (e) { + return .5 - Math.cos(e * Math.PI) / 2 + } + }, v.timers = [], v.fx = Yn.prototype.init, v.fx.tick = function () { + var e, n = v.timers, r = 0; + qn = v.now(); + for (; r < n.length; r++)e = n[r], !e() && n[r] === e && n.splice(r--, 1); + n.length || v.fx.stop(), qn = t + }, v.fx.timer = function (e) { + e() && v.timers.push(e) && !Rn && (Rn = setInterval(v.fx.tick, v.fx.interval)) + }, v.fx.interval = 13, v.fx.stop = function () { + clearInterval(Rn), Rn = null + }, v.fx.speeds = { + slow: 600, + fast: 200, + _default: 400 + }, v.fx.step = {}, v.expr && v.expr.filters && (v.expr.filters.animated = function (e) { + return v.grep(v.timers, function (t) { + return e === t.elem + }).length + }); + var er = /^(?:body|html)$/i; + v.fn.offset = function (e) { + if (arguments.length)return e === t ? this : this.each(function (t) { + v.offset.setOffset(this, e, t) + }); + var n, r, i, s, o, u, a, f = {top: 0, left: 0}, l = this[0], c = l && l.ownerDocument; + if (!c)return; + return (r = c.body) === l ? v.offset.bodyOffset(l) : (n = c.documentElement, v.contains(n, l) ? (typeof l.getBoundingClientRect != "undefined" && (f = l.getBoundingClientRect()), i = tr(c), s = n.clientTop || r.clientTop || 0, o = n.clientLeft || r.clientLeft || 0, u = i.pageYOffset || n.scrollTop, a = i.pageXOffset || n.scrollLeft, { + top: f.top + u - s, + left: f.left + a - o + }) : f) + }, v.offset = { + bodyOffset: function (e) { + var t = e.offsetTop, n = e.offsetLeft; + return v.support.doesNotIncludeMarginInBodyOffset && (t += parseFloat(v.css(e, "marginTop")) || 0, n += parseFloat(v.css(e, "marginLeft")) || 0), { + top: t, + left: n + } + }, setOffset: function (e, t, n) { + var r = v.css(e, "position"); + r === "static" && (e.style.position = "relative"); + var i = v(e), s = i.offset(), o = v.css(e, "top"), u = v.css(e, "left"), a = (r === "absolute" || r === "fixed") && v.inArray("auto", [o, u]) > -1, f = {}, l = {}, c, h; + a ? (l = i.position(), c = l.top, h = l.left) : (c = parseFloat(o) || 0, h = parseFloat(u) || 0), v.isFunction(t) && (t = t.call(e, n, s)), t.top != null && (f.top = t.top - s.top + c), t.left != null && (f.left = t.left - s.left + h), "using"in t ? t.using.call(e, f) : i.css(f) + } + }, v.fn.extend({ + position: function () { + if (!this[0])return; + var e = this[0], t = this.offsetParent(), n = this.offset(), r = er.test(t[0].nodeName) ? { + top: 0, + left: 0 + } : t.offset(); + return n.top -= parseFloat(v.css(e, "marginTop")) || 0, n.left -= parseFloat(v.css(e, "marginLeft")) || 0, r.top += parseFloat(v.css(t[0], "borderTopWidth")) || 0, r.left += parseFloat(v.css(t[0], "borderLeftWidth")) || 0, { + top: n.top - r.top, + left: n.left - r.left + } + }, offsetParent: function () { + return this.map(function () { + var e = this.offsetParent || i.body; + while (e && !er.test(e.nodeName) && v.css(e, "position") === "static")e = e.offsetParent; + return e || i.body + }) + } + }), v.each({scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function (e, n) { + var r = /Y/.test(n); + v.fn[e] = function (i) { + return v.access(this, function (e, i, s) { + var o = tr(e); + if (s === t)return o ? n in o ? o[n] : o.document.documentElement[i] : e[i]; + o ? o.scrollTo(r ? v(o).scrollLeft() : s, r ? s : v(o).scrollTop()) : e[i] = s + }, e, i, arguments.length, null) + } + }), v.each({Height: "height", Width: "width"}, function (e, n) { + v.each({padding: "inner" + e, content: n, "": "outer" + e}, function (r, i) { + v.fn[i] = function (i, s) { + var o = arguments.length && (r || typeof i != "boolean"), u = r || (i === !0 || s === !0 ? "margin" : "border"); + return v.access(this, function (n, r, i) { + var s; + return v.isWindow(n) ? n.document.documentElement["client" + e] : n.nodeType === 9 ? (s = n.documentElement, Math.max(n.body["scroll" + e], s["scroll" + e], n.body["offset" + e], s["offset" + e], s["client" + e])) : i === t ? v.css(n, r, i, u) : v.style(n, r, i, u) + }, n, o ? i : t, o, null) + } + }) + }), e.jQuery = e.$ = v, typeof define == "function" && define.amd && define.amd.jQuery && define("jquery", [], function () { + return v + }) +})(window); \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js index ee0d2f92470..f4e372eb236 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js +++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js @@ -1,70 +1,69 @@ -window.onhashchange = function() { - choose(window.location.href.toString()); +window.onhashchange = function () { + choose(window.location.href.toString()); } var selectionImage; function choose(url) { - var f = url.split("/").slice(-1)[0].split("?")[0]; - if(f.match(/#/g) && f.match(/#/g).length > 0) { - f = f.split("#")[0]; - } - $('div.non-sidebar').empty(); - $('div.non-sidebar').load("operations/" + f + ".html", function(){ - goToAnchor(); - // rebind the models - $(".model a").on("click", function(e){ - e.preventDefault(); - var model = $(this).parent().attr("data-model") - var parentOffset = $(this).parent().offset(); - var encodedWord = encodeURI(model); + var f = url.split("/").slice(-1)[0].split("?")[0]; + if (f.match(/#/g) && f.match(/#/g).length > 0) { + f = f.split("#")[0]; + } + $('div.non-sidebar').empty(); + $('div.non-sidebar').load("operations/" + f + ".html", function () { + goToAnchor(); + // rebind the models + $(".model a").on("click", function (e) { + e.preventDefault(); + var model = $(this).parent().attr("data-model") + var parentOffset = $(this).parent().offset(); + var encodedWord = encodeURI(model); - if(!selectionImage) { - selectionImage = $('
      ').attr({ - title: 'Model detail', - target: '_blank', - class: 'model-detail-popup' - }).hide(); - $('div.model-container').append(selectionImage); - } + if (!selectionImage) { + selectionImage = $('
      ').attr({ + title: 'Model detail', + target: '_blank', + class: 'model-detail-popup' + }).hide(); + $('div.model-container').append(selectionImage); + } - selectionImage.load("models/" + encodedWord + ".html") - selectionImage.attr('href',url.replace('{term}',encodeURI(model))).css({ - left: e.pageX + 20, - top: e.pageY - 10, - position: "absolute" - }).fadeIn(); - }) - }); + selectionImage.load("models/" + encodedWord + ".html") + selectionImage.attr('href', url.replace('{term}', encodeURI(model))).css({ + left: e.pageX + 20, + top: e.pageY - 10, + position: "absolute" + }).fadeIn(); + }) + }); - $("body").on("click",function(e) { - var target = $(e.target); - if (target.parents(".model-detail-popup").length == 0 && target.parents('.model').length != 1) { - if(document.querySelector('.model-detail-popup')) { - document.querySelector('.model-detail-popup').style.display = 'none'; - } - } - }); + $("body").on("click", function (e) { + var target = $(e.target); + if (target.parents(".model-detail-popup").length == 0 && target.parents('.model').length != 1) { + if (document.querySelector('.model-detail-popup')) { + document.querySelector('.model-detail-popup').style.display = 'none'; + } + } + }); } function goToAnchor() { - var doARead = $($('a')[0]).offset(); - var anchorArr = window.location.href.toString().split("#"); - if(anchorArr.length > 2) { - var anchor = anchorArr[anchorArr.length-1]; - window.scrollTo(0,$('a[name='+anchor+']').offset().top - 80); - } + var doARead = $($('a')[0]).offset(); + var anchorArr = window.location.href.toString().split("#"); + if (anchorArr.length > 2) { + var anchor = anchorArr[anchorArr.length - 1]; + window.scrollTo(0, $('a[name=' + anchor + ']').offset().top - 80); + } } -function resize() -{ - $(".sidebar").css('height', $(window).height() -60); - $("#content-window").css('height', $(window).height() -60); +function resize() { + $(".sidebar").css('height', $(window).height() - 60); + $("#content-window").css('height', $(window).height() - 60); } -$(function(){ +$(function () { window.onresize = resize; resize(); - $(window).bind('hashchange', function() { + $(window).bind('hashchange', function () { choose(window.location.href.toString()); }); }); \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/index.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/index.mustache index 3cfbea753c8..f7b596113c9 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/index.mustache +++ b/modules/swagger-codegen/src/main/resources/swagger-static/index.mustache @@ -1,58 +1,60 @@ - - + + - - - - - + + + + + - REST API Resources + REST API Resources -
      +
      -

      +

      -
      -
      -
      +
      +
      +
      -
      -
      -
      - Overview -
      -
        -
      • Getting Started
        • -
      +
      +
      +
      + Overview +
      +
        +
      • Getting Started
        • +
      +
      + {{#apiInfo}} + {{#apis}} +
      +
      + {{classname}} +
      +
        + {{#operations}} + {{#operation}} +
      • {{nickname}}
        • + {{/operation}} + {{/operations}} +
      +
      + {{/apis}} + {{/apiInfo}}
      - {{#apiInfo}} - {{#apis}} -
      -
      - {{classname}} -
      -
        - {{#operations}} - {{#operation}} -
      • {{nickname}}
        • - {{/operation}} - {{/operations}} -
      +
      +
      +

      Getting Started

      + +

      To begin using your fancy HTTP API, follow the steps below.

      + +

      You can add some helpful tips, here

      +
      - {{/apis}} - {{/apiInfo}} -
      -
      -
      -

      Getting Started

      -

      To begin using your fancy HTTP API, follow the steps below.

      -

      You can add some helpful tips, here

      -
      -
      \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache index a9a39ab6e91..b76e371d27d 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache +++ b/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache @@ -1,13 +1,13 @@ {{#models}} -{{#model}} + {{#model}} -

      {{classname}}

      - {{#vars}} -
        -
      • {{name}} : {{datatype}} -
        {{description}} -
        • -
      - {{/vars}} -{{/model}} +

      {{classname}}

      + {{#vars}} +
        +
      • {{name}} : {{datatype}} +
        {{description}} +
        • +
      + {{/vars}} + {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache index c2c70aa906d..80af01fbcc3 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache +++ b/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache @@ -1,35 +1,39 @@
      -

      {{className}}

      -

      This is the {{className}} API

      +

      {{className}}

      - {{#operations}} - {{#operation}} -

      {{nickname}}

      -
      -

      {{description}}

      - {{#notes}}

      {{notes}}

      {{/notes}} -

      URL

      - {{basePath}}{{path}} -

      HTTP Method

      - {{httpMethod}} -

      Response Type

      -
      {{returnType}}
      -

      Parameters

      -
        - {{#allParams}} -
      • - {{#isFormParam}}Form: {{/isFormParam}} - {{#isQueryParam}}Query: {{/isQueryParam}} - {{#isPathParam}}Path: {{/isPathParam}} - {{#isHeaderParam}}Header: {{/isHeaderParam}} - {{#isBodyParam}}Body: {{/isBodyParam}} - {{paramName}} - {{dataType}}{{#baseType}}({{baseType}}){{/baseType}} - {{#optional}}(optional){{/optional}} -

        {{description}}

        -
        • - {{/allParams}} -
      - {{/operation}} - {{/operations}} +

      This is the {{className}} API

      + + {{#operations}} + {{#operation}} +

      {{nickname}}

      +
      +

      {{description}}

      + {{#notes}}

      {{notes}}

      {{/notes}} +

      URL

      + {{basePath}}{{path}} + +

      HTTP Method

      + {{httpMethod}} + +

      Response Type

      + +
      {{returnType}}
      +

      Parameters

      +
        + {{#allParams}} +
      • + {{#isFormParam}}Form: {{/isFormParam}} + {{#isQueryParam}}Query: {{/isQueryParam}} + {{#isPathParam}}Path: {{/isPathParam}} + {{#isHeaderParam}}Header: {{/isHeaderParam}} + {{#isBodyParam}}Body: {{/isBodyParam}} + {{paramName}} + {{dataType}}{{#baseType}}({{baseType}}){{/baseType}} + {{#optional}}(optional){{/optional}} +

        {{description}}

        +
        • + {{/allParams}} +
      + {{/operation}} + {{/operations}}
      diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache index d728e9f0063..b777cfaa602 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache +++ b/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache @@ -1,12 +1,12 @@ { - "name": "swagger-docs", - "version": "1.0.0", - "main": "main.js", - "engines": { - "node": ">= 0.8.x" - }, - "dependencies": { - "express": "3.x" - }, - "license": "apache 2.0" +"name": "swagger-docs", +"version": "1.0.0", +"main": "main.js", +"engines": { +"node": ">= 0.8.x" +}, +"dependencies": { +"express": "3.x" +}, +"license": "apache 2.0" } diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/pom.xml b/modules/swagger-codegen/src/main/resources/swagger-static/pom.xml index eb3bed8e7b9..6b8adcd412c 100644 --- a/modules/swagger-codegen/src/main/resources/swagger-static/pom.xml +++ b/modules/swagger-codegen/src/main/resources/swagger-static/pom.xml @@ -1,100 +1,100 @@ - - 4.0.0 - com.wordnik - wordnik-swagger-demo - jar - wordnik-swagger-demo - 1.0.0-SNAPSHOT - - 2.2.0 - + + 4.0.0 + io.swagger + swagger-demo + jar + swagger-demo + 1.0.0-SNAPSHOT + + 2.2.0 + - - src/main/scala - src/test/scala - - - net.alchim31.maven - scala-maven-plugin - ${maven-plugin.version} - - - - compile - testCompile - - - - - - -Xms64m - -Xmx1024m - - - - - maven-surefire-plugin - - once - false - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - org.mortbay.jetty - jetty-maven-plugin - ${jetty-version} - - - / - - - - 8000 - 60000 - 8443 - - - - - - start-jetty - pre-integration-test - - run - - - 0 - true - - - - stop-jetty - post-integration-test - - stop - - - - - - - - 3.1.0 - 7.6.0.v20120127 - + + src/main/scala + src/test/scala + + + net.alchim31.maven + scala-maven-plugin + ${maven-plugin.version} + + + + compile + testCompile + + + + + + -Xms64m + -Xmx1024m + + + + + maven-surefire-plugin + + once + false + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + org.mortbay.jetty + jetty-maven-plugin + ${jetty-version} + + + / + + + + 8000 + 60000 + 8443 + + + + + + start-jetty + pre-integration-test + + run + + + 0 + true + + + + stop-jetty + post-integration-test + + stop + + + + + + + + 3.1.0 + 7.6.0.v20120127 + diff --git a/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache b/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache index 418f1c8512b..97e49d2c627 100644 --- a/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache @@ -5,17 +5,17 @@ // class APIHelper { - static func rejectNil(source: [String:AnyObject?]) -> [String:AnyObject]? { - var destination = [String:AnyObject]() - for (key, nillableValue) in source { - if let value: AnyObject = nillableValue { - destination[key] = value - } - } +static func rejectNil(source: [String:AnyObject?]) -> [String:AnyObject]? { +var destination = [String:AnyObject]() +for (key, nillableValue) in source { +if let value: AnyObject = nillableValue { +destination[key] = value +} +} - if destination.isEmpty { - return nil - } - return destination - } +if destination.isEmpty { +return nil +} +return destination +} } diff --git a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache index aa39ccfcbdd..c021eafe376 100644 --- a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache @@ -8,59 +8,64 @@ import Foundation import PromiseKit class {{projectName}}API { - static let basePath = "{{^basePathOverride}}{{basePath}}{{/basePathOverride}}{{basePathOverride}}" - static var credential: NSURLCredential? - static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory() +static let basePath = "{{^basePathOverride}}{{basePath}}{{/basePathOverride}}{{basePathOverride}}" +static var credential: NSURLCredential? +static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory() } class APIBase { - func toParameters(encodable: JSONEncodable?) -> [String: AnyObject]? { - let encoded: AnyObject? = encodable?.encode() +func toParameters(encodable: JSONEncodable?) -> [String: AnyObject]? { +let encoded: AnyObject? = encodable?.encode() - if encoded! is [AnyObject] { - var dictionary = [String:AnyObject]() - for (index, item) in enumerate(encoded as! [AnyObject]) { - dictionary["\(index)"] = item - } - return dictionary - } else { - return encoded as? [String:AnyObject] - } - } +if encoded! is [AnyObject] { +var dictionary = [String:AnyObject]() +for (index, item) in enumerate(encoded as! [AnyObject]) { +dictionary["\(index)"] = item +} +return dictionary +} else { +return encoded as? [String:AnyObject] +} +} } -class RequestBuilder { +class RequestBuilder + { var credential: NSURLCredential? var headers: [String:String] = [:] let parameters: [String:AnyObject]? let isBody: Bool let method: String let URLString: String - + required init(method: String, URLString: String, parameters: [String:AnyObject]?, isBody: Bool) { - self.method = method - self.URLString = URLString - self.parameters = parameters - self.isBody = isBody + self.method = method + self.URLString = URLString + self.parameters = parameters + self.isBody = isBody } - - func execute() -> Promise> { fatalError("Not implemented") } - func addHeader(#name: String, value: String) -> Self { + func execute() -> Promise + > { fatalError("Not implemented") } + + func addHeader(#name: String, value: String) -> Self { if !value.isEmpty { - headers[name] = value + headers[name] = value } return self - } - - func addCredential() -> Self { + } + + func addCredential() -> Self { self.credential = {{projectName}}API.credential return self - } -} + } + } -protocol RequestBuilderFactory { - func getBuilder() -> RequestBuilder.Type -} + protocol RequestBuilderFactory { + func getBuilder + () -> RequestBuilder + .Type + } diff --git a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache index 244d816332c..5b6d6a68874 100644 --- a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache @@ -8,72 +8,83 @@ import Alamofire import PromiseKit class AlamofireRequestBuilderFactory: RequestBuilderFactory { - func getBuilder() -> RequestBuilder.Type { - return AlamofireRequestBuilder.self - } -} +func getBuilder +() -> RequestBuilder + .Type { + return AlamofireRequestBuilder + .self + } + } -// Store manager to retain its reference -private var managerStore: [String: Alamofire.Manager] = [:] + // Store manager to retain its reference + private var managerStore: [String: Alamofire.Manager] = [:] -class AlamofireRequestBuilder: RequestBuilder { - required init(method: String, URLString: String, parameters: [String : AnyObject]?, isBody: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody) - } + class AlamofireRequestBuilder + : RequestBuilder + { + required init(method: String, URLString: String, parameters: [String : AnyObject]?, isBody: Bool) { + super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody) + } - override func execute() -> Promise> { - let managerId = NSUUID().UUIDString - // Create a new manager for each request to customize its request header - let configuration = NSURLSessionConfiguration.defaultSessionConfiguration() - configuration.HTTPAdditionalHeaders = buildHeaders() - let manager = Alamofire.Manager(configuration: configuration) - managerStore[managerId] = manager + override func execute() -> Promise + > { + let managerId = NSUUID().UUIDString + // Create a new manager for each request to customize its request header + let configuration = NSURLSessionConfiguration.defaultSessionConfiguration() + configuration.HTTPAdditionalHeaders = buildHeaders() + let manager = Alamofire.Manager(configuration: configuration) + managerStore[managerId] = manager - let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL - let request = manager.request(Alamofire.Method(rawValue: method)!, URLString, parameters: parameters, encoding: encoding) - if let credential = self.credential { - request.authenticate(usingCredential: credential) - } + let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL + let request = manager.request(Alamofire.Method(rawValue: method)!, URLString, parameters: + parameters, encoding: encoding) + if let credential = self.credential { + request.authenticate(usingCredential: credential) + } - let defer = Promise>.defer() - request.responseJSON(options: .AllowFragments) { (req, res, json, error) in - managerStore.removeValueForKey(managerId) + let defer = Promise + >.defer() + request.responseJSON(options: .AllowFragments) { (req, res, json, error) in + managerStore.removeValueForKey(managerId) - if let error = error { - defer.reject(error) - return - } - if res!.statusCode >= 400 { - //TODO: Add error entity - let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: [:]) - defer.reject(error) - return - } + if let error = error { + defer.reject(error) + return + } + if res!.statusCode >= 400 { + //TODO: Add error entity + let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: [:]) + defer.reject(error) + return + } - if () is T { - let response = Response(response: res!, body: () as! T) - defer.fulfill(response) - return - } - if let json: AnyObject = json { - let body = Decoders.decode(clazz: T.self, source: json) - let response = Response(response: res!, body: body) - defer.fulfill(response) - return - } - - defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) - } - return defer.promise - } + if () is T { + let response = Response(response: res!, body: () as! T) + defer.fulfill(response) + return + } + if let json: AnyObject = json { + let body = Decoders.decode(clazz: T.self, source: json) + let response = Response(response: res!, body: body) + defer.fulfill(response) + return + } + + defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable + code"])) + } + return defer.promise + } - private func buildHeaders() -> [String: AnyObject] { - var httpHeaders = Manager.defaultHTTPHeaders - for (key, value) in self.headers { - httpHeaders[key] = value - } - return httpHeaders - } -} + private func buildHeaders() -> [String: AnyObject] { + var httpHeaders = Manager.defaultHTTPHeaders + for (key, value) in self.headers { + httpHeaders[key] = value + } + return httpHeaders + } + } diff --git a/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache b/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache index c937db23fe3..2a7998f14cd 100644 --- a/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache @@ -8,45 +8,46 @@ import Alamofire import PromiseKit extension Bool: JSONEncodable { - func encode() -> AnyObject { return self } +func encode() -> AnyObject { return self } } extension Float: JSONEncodable { - func encode() -> AnyObject { return self } +func encode() -> AnyObject { return self } } extension Int: JSONEncodable { - func encode() -> AnyObject { return self } +func encode() -> AnyObject { return self } } extension Double: JSONEncodable { - func encode() -> AnyObject { return self } +func encode() -> AnyObject { return self } } extension String: JSONEncodable { - func encode() -> AnyObject { return self } +func encode() -> AnyObject { return self } } -private func encodeIfPossible(object: T) -> AnyObject { +private func encodeIfPossible +(object: T) -> AnyObject { if object is JSONEncodable { - return (object as! JSONEncodable).encode() + return (object as! JSONEncodable).encode() } else { - return object as! AnyObject + return object as! AnyObject + } } -} -extension Array: JSONEncodable { + extension Array: JSONEncodable { func encode() -> AnyObject { - return self.map(encodeIfPossible) + return self.map(encodeIfPossible) + } } -} -extension Dictionary: JSONEncodable { + extension Dictionary: JSONEncodable { func encode() -> AnyObject { - var dictionary = [NSObject:AnyObject]() - for (key, value) in self { - dictionary[key as! NSObject] = encodeIfPossible(value) - } - return dictionary + var dictionary = [NSObject:AnyObject]() + for (key, value) in self { + dictionary[key as! NSObject] = encodeIfPossible(value) + } + return dictionary + } } -} diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache index 37c497ddcb9..9e343d9f05a 100644 --- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache @@ -7,118 +7,132 @@ import Foundation protocol JSONEncodable { - func encode() -> AnyObject +func encode() -> AnyObject } -class Response { +class Response + { let statusCode: Int let header: [String: String] let body: T init(statusCode: Int, header: [String: String], body: T) { - self.statusCode = statusCode - self.header = header - self.body = body + self.statusCode = statusCode + self.header = header + self.body = body } convenience init(response: NSHTTPURLResponse, body: T) { - let rawHeader = response.allHeaderFields - var header = [String:String]() - for (key, value) in rawHeader { - header[key as! String] = value as? String - } - self.init(statusCode: response.statusCode, header: header, body: body) + let rawHeader = response.allHeaderFields + var header = [String:String]() + for (key, value) in rawHeader { + header[key as! String] = value as? String } -} - -private var once = dispatch_once_t() -class Decoders { - static private var decoders = Dictionary AnyObject)>() - - static func addDecoder(#clazz: T.Type, decoder: ((AnyObject) -> T)) { - let key = "\(T.self)" - decoders[key] = { decoder($0) as! AnyObject } + self.init(statusCode: response.statusCode, header: header, body: body) } - - static func decode(#clazz: [T].Type, source: AnyObject) -> [T] { - let array = source as! [AnyObject] - return array.map { Decoders.decode(clazz: T.self, source: $0) } } - - static func decode(#clazz: [Key:T].Type, source: AnyObject) -> [Key:T] { - let sourceDictinoary = source as! [Key: AnyObject] - var dictionary = [Key:T]() - for (key, value) in sourceDictinoary { - dictionary[key] = Decoders.decode(clazz: T.self, source: value) - } - return dictionary - } - - static func decode(#clazz: T.Type, source: AnyObject) -> T { - initialize() - if source is T { - return source as! T - } - + + private var once = dispatch_once_t() + class Decoders { + static private var decoders = Dictionary + AnyObject)>() + + static func addDecoder + (#clazz: T.Type, decoder: ((AnyObject) -> T)) { let key = "\(T.self)" - if let decoder = decoders[key] { - return decoder(source) as! T - } else { - fatalError("Source \(source) is not convertible to type \(clazz): Maybe swagger file is insufficient") + decoders[key] = { decoder($0) as! AnyObject } } - } - static func decodeOptional(#clazz: T.Type, source: AnyObject?) -> T? { - if source is NSNull { - return nil - } - return source.map { (source: AnyObject) -> T in - Decoders.decode(clazz: clazz, source: source) - } - } + static func decode + (#clazz: [T].Type, source: AnyObject) -> [T] { + let array = source as! [AnyObject] + return array.map { Decoders.decode(clazz: T.self, source: $0) } + } - static func decodeOptional(#clazz: [T].Type, source: AnyObject?) -> [T]? { - if source is NSNull { - return nil - } - return source.map { (someSource: AnyObject) -> [T] in - Decoders.decode(clazz: clazz, source: someSource) - } - } + static func decode + (#clazz: [Key:T].Type, source: AnyObject) -> [Key:T] { + let sourceDictinoary = source as! [Key: AnyObject] + var dictionary = [Key:T]() + for (key, value) in sourceDictinoary { + dictionary[key] = Decoders.decode(clazz: T.self, source: value) + } + return dictionary + } - static func decodeOptional(#clazz: [Key:T].Type, source: AnyObject?) -> [Key:T]? { - if source is NSNull { - return nil - } - return source.map { (someSource: AnyObject) -> [Key:T] in - Decoders.decode(clazz: clazz, source: someSource) - } - } - - static private func initialize() { - dispatch_once(&once) { - let dateTimeFormatter = NSDateFormatter() - dateTimeFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'" - let dateFormatter = NSDateFormatter() - dateFormatter.dateFormat = "yyyy-MM-dd" - // Decoder for NSDate - Decoders.addDecoder(clazz: NSDate.self) { (source: AnyObject) -> NSDate in - let sourceString = source as! String - if count(sourceString) == 10 { - return dateFormatter.dateFromString(sourceString)! + static func decode + (#clazz: T.Type, source: AnyObject) -> T { + initialize() + if source is T { + return source as! T } - return dateTimeFormatter.dateFromString(sourceString)! - } {{#models}}{{#model}} - - // Decoder for {{{classname}}} - Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in - let sourceDictionary = source as! [NSObject:AnyObject] - var instance = {{classname}}(){{#vars}}{{#isEnum}} - instance.{{name}} = (sourceDictionary["{{name}}"] as? String).map { {{classname}}.{{datatypeWithEnum}}(rawValue: $0)! }{{#required}}!{{/required}} {{/isEnum}}{{^isEnum}} - instance.{{name}} = Decoders.decode{{^required}}Optional{{/required}}(clazz: {{{baseType}}}.self, source: sourceDictionary["{{name}}"]{{#required}}!{{/required}}){{/isEnum}}{{/vars}} - return instance - }{{/model}} - {{/models}} - } - } -} + + let key = "\(T.self)" + if let decoder = decoders[key] { + return decoder(source) as! T + } else { + fatalError("Source \(source) is not convertible to type \(clazz): Maybe swagger file is insufficient") + } + } + + static func decodeOptional + (#clazz: T.Type, source: AnyObject?) -> T? { + if source is NSNull { + return nil + } + return source.map { (source: AnyObject) -> T in + Decoders.decode(clazz: clazz, source: source) + } + } + + static func decodeOptional + (#clazz: [T].Type, source: AnyObject?) -> [T]? { + if source is NSNull { + return nil + } + return source.map { (someSource: AnyObject) -> [T] in + Decoders.decode(clazz: clazz, source: someSource) + } + } + + static func decodeOptional + (#clazz: [Key:T].Type, source: AnyObject?) -> [Key:T]? { + if source is NSNull { + return nil + } + return source.map { (someSource: AnyObject) -> [Key:T] in + Decoders.decode(clazz: clazz, source: someSource) + } + } + + static private func initialize() { + dispatch_once(&once) { + let dateTimeFormatter = NSDateFormatter() + dateTimeFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'" + let dateFormatter = NSDateFormatter() + dateFormatter.dateFormat = "yyyy-MM-dd" + // Decoder for NSDate + Decoders.addDecoder(clazz: NSDate.self) { (source: AnyObject) -> NSDate in + let sourceString = source as! String + if count(sourceString) == 10 { + return dateFormatter.dateFromString(sourceString)! + } + return dateTimeFormatter.dateFromString(sourceString)! + } {{#models}}{{#model}} + + // Decoder for {{{classname}}} + Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in + let sourceDictionary = source as! [NSObject:AnyObject] + var instance = {{classname}}(){{#vars}}{{#isEnum}} + instance.{{name}} = (sourceDictionary["{{name}}"] as? String).map { {{classname}} + .{{datatypeWithEnum}}(rawValue: $0)! }{{#required}}!{{/required}} {{/isEnum}}{{^isEnum}} + instance.{{name}} = Decoders.decode{{^required}}Optional{{/required}}(clazz: {{{baseType}}} + .self, source: sourceDictionary["{{name}}"]{{#required}}!{{/required}}){{/isEnum}}{{/vars}} + return instance + }{{/model}} + {{/models}} + } + } + } diff --git a/modules/swagger-codegen/src/main/resources/swift/api.mustache b/modules/swagger-codegen/src/main/resources/swift/api.mustache index e24bdae6773..27c93f150b5 100644 --- a/modules/swagger-codegen/src/main/resources/swift/api.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/api.mustache @@ -9,43 +9,54 @@ import Alamofire import PromiseKit extension {{projectName}}API { - {{#description}} +{{#description}} /** {{description}} */{{/description}} - class {{classname}}: APIBase { - {{#operation}} - /** - {{#summary}} - {{{summary}}} - {{/summary}} - - {{httpMethod}} {{path}}{{#notes}} - - {{{notes}}}{{/notes}}{{#subresourceOperation}} - - subresourceOperation: {{subresourceOperation}}{{/subresourceOperation}}{{#defaultResponse}} - - defaultResponse: {{defaultResponse}}{{/defaultResponse}}{{#authMethods}} - - authMethods: {{authMethods}}{{/authMethods}}{{#responseHeaders}} - - responseHeaders: {{responseHeaders}}{{/responseHeaders}}{{#examples}} - - examples: {{{examples}}}{{/examples}}{{#externalDocs}} - - externalDocs: {{externalDocs}}{{/externalDocs}}{{#hasParams}} - {{/hasParams}}{{#allParams}} - :param: {{paramName}} ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}}{{/allParams}} +class {{classname}}: APIBase { +{{#operation}} + /** + {{#summary}} + {{{summary}}} + {{/summary}} + - {{httpMethod}} {{path}}{{#notes}} + - {{{notes}}}{{/notes}}{{#subresourceOperation}} + - subresourceOperation: {{subresourceOperation}}{{/subresourceOperation}}{{#defaultResponse}} + - defaultResponse: {{defaultResponse}}{{/defaultResponse}}{{#authMethods}} + - authMethods: {{authMethods}}{{/authMethods}}{{#responseHeaders}} + - responseHeaders: {{responseHeaders}}{{/responseHeaders}}{{#examples}} + - examples: {{{examples}}}{{/examples}}{{#externalDocs}} + - externalDocs: {{externalDocs}}{{/externalDocs}}{{#hasParams}} + {{/hasParams}}{{#allParams}} + :param: {{paramName}} ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}}{{/allParams}} - :returns: Promise> {{description}} - */ - func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { - {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = "{{path}}"{{#pathParams}} - path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString: "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}} - let url = {{projectName}}API.basePath + path - {{#bodyParam}} - let parameters = {{paramName}}{{^required}}?{{/required}}.encode() as? [String:AnyObject]{{/bodyParam}}{{^bodyParam}} - let nillableParameters: [String:AnyObject?] = {{^queryParams}}[:]{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}} - "{{paramName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}} - ]{{/hasMore}}{{/queryParams}} + :returns: Promise + > {{description}} + */ + func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/secondaryParam}}{{paramName}} + : {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder + <{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { + {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = + "{{path}}"{{#pathParams}} + path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString: + "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}} + let url = {{projectName}}API.basePath + path + {{#bodyParam}} + let parameters = {{paramName}}{{^required}}?{{/required}}.encode() as? + [String:AnyObject]{{/bodyParam}}{{^bodyParam}} + let nillableParameters: [String:AnyObject?] = {{^queryParams}} + [:]{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}} + "{{paramName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}} + ]{{/hasMore}}{{/queryParams}} let parameters = APIHelper.rejectNil(nillableParameters){{/bodyParam}} - let requestBuilder: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.getBuilder() + let requestBuilder: RequestBuilder + <{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}} + API.requestBuilderFactory.getBuilder() - return requestBuilder(method: "{{httpMethod}}", URLString: url, parameters: parameters, isBody: {{^queryParams}}true{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}}) + return requestBuilder(method: "{{httpMethod}}", URLString: url, parameters: parameters, isBody: {{^queryParams}} + true{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}}) } - {{/operation}} +{{/operation}} + } } -} {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/swift/model.mustache b/modules/swagger-codegen/src/main/resources/swift/model.mustache index a964882c97c..c868cfe7b0d 100644 --- a/modules/swagger-codegen/src/main/resources/swift/model.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/model.mustache @@ -9,27 +9,27 @@ import Foundation {{#description}} -/** {{description}} */{{/description}} + /** {{description}} */{{/description}} class {{classname}}: JSONEncodable { {{#vars}}{{#isEnum}} enum {{datatypeWithEnum}}: String { {{#allowableValues}}{{#values}} case {{enum}} = "{{raw}}"{{/values}}{{/allowableValues}} } - {{/isEnum}}{{/vars}} - {{#vars}}{{#isEnum}}{{#description}}/** {{description}} */ - {{/description}}var {{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}{{^isEnum}}{{#description}}/** {{description}} */ - {{/description}}var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}} - {{/vars}} +{{/isEnum}}{{/vars}} +{{#vars}}{{#isEnum}}{{#description}}/** {{description}} */ +{{/description}}var {{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}{{^isEnum}}{{#description}}/** {{description}} */ +{{/description}}var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}} +{{/vars}} - // MARK: JSONEncodable - func encode() -> AnyObject { - var nillableDictionary = [String:AnyObject?](){{#vars}}{{#isNotContainer}}{{#isPrimitiveType}}{{^isEnum}} - nillableDictionary["{{name}}"] = self.{{name}}{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}} - nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.rawValue{{/isEnum}}{{^isPrimitiveType}} - nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isPrimitiveType}}{{/isNotContainer}}{{#isContainer}} - nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isContainer}}{{/vars}} - let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:] - return dictionary - } +// MARK: JSONEncodable +func encode() -> AnyObject { +var nillableDictionary = [String:AnyObject?](){{#vars}}{{#isNotContainer}}{{#isPrimitiveType}}{{^isEnum}} + nillableDictionary["{{name}}"] = self.{{name}}{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}} + nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.rawValue{{/isEnum}}{{^isPrimitiveType}} + nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isPrimitiveType}}{{/isNotContainer}}{{#isContainer}} + nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isContainer}}{{/vars}} +let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:] +return dictionary +} }{{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache b/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache index 9573cc2b377..483dd92b0ab 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache @@ -9,123 +9,123 @@ namespace Swagger { {{#operations}} -{{classname}}::{{classname}}() { + {{classname}}::{{classname}}() { -} - -{{classname}}::~{{classname}}() { - -} - -{{#operation}} -void -{{nickname}}Processor(HttpResponse* pHttpResponse, void (* handler)(void*, {{prefix}}Error*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - {{#returnType}}ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + } - {{{returnType}}} out = {{{defaultResponse}}}; - jsonToValue(out, pJson, L"{{returnType}}", L"{{returnBaseType}}"); + {{classname}}::~{{classname}}() { - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - {{prefix}}Error* error = new {{prefix}}Error(0, new String(L"No parsable response received")); - handler(null, error); } - {{/returnType}}{{^returnType}}handler(null, null);{{/returnType}} - } - else { - {{prefix}}Error* error = new {{prefix}}Error(code, new String(pHttpResponse->GetStatusText())); - {{#returnType}}handler(null, error);{{/returnType}} - {{^returnType}}handler(error, null);{{/returnType}} - } -} - -{{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} -{{classname}}::{{nickname}}WithCompletion({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}},{{/hasParams}} {{#returnType}}void (* success)({{returnType}}, {{prefix}}Error*){{/returnType}}{{^returnType}}void(*success)({{prefix}}Error*){{/returnType}}) { - client = new {{prefix}}ApiClient(); - - client->success(&{{nickname}}Processor, (void(*)(void*, {{prefix}}Error*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - {{#headerParams}}{{#collectionFormat}} - int sz = {{paramName}}->GetCount(); - for(int i = 0; i < sz; i++) { - String itemAt = stringify({{paramName}}->GetAt(i), "{{baseType}}"); - headerParams->Add(new String("{{paramName}}"), new String(itemAt)); - } - {{/collectionFormat}}{{^collectionFormat}} - headerParams->Add(new String("{{baseName}}"), {{paramName}}); - {{/collectionFormat}} - {{/headerParams}} - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - {{#queryParams}}{{#collectionFormat}} - int sz = {{paramName}}->GetCount(); - for(int i = 0; i < sz; i++) { - String itemAt = stringify({{paramName}}->GetAt(i), "{{baseType}}"); - queryParams->Add(new String("{{paramName}}"), new String(itemAt)); - } - {{/collectionFormat}}{{^collectionFormat}} - queryParams->Add(new String("{{baseName}}"), {{paramName}}); - {{/collectionFormat}} - {{/queryParams}} - - String* mBody = null; - - {{#bodyParams}} - {{#isContainer}} - if({{paramName}} != null) { - mBody = new String(""); - int sz = {{paramName}}->GetCount(); - for(int i = 0; i < sz; i++) { - {{prefix}}Object * obj = ({{prefix}}Object*){{paramName}}->GetAt(i); - String json = obj->asJson(); - if(i > 0) - mBody->Append(","); - mBody->Append(json); - } - mBody->Append("]"); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - {{/isContainer}} - {{^isContainer}} - if({{paramName}} != null) { - mBody = new String({{paramName}}->asJson()); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - {{/isContainer}} - {{/bodyParams}} - - String url(L"{{{path}}}"); - - {{#pathParams}} - String s_{{paramName}}(L"{"); - s_{{paramName}}.Append(L"{{{baseName}}}"); - s_{{paramName}}.Append(L"}"); - url.Replace(s_{{paramName}}, stringify({{{paramName}}}, L"{{dataType}}")); - {{/pathParams}} - - client->execute({{classname}}::getBasePath(), url, "{{httpMethod}}", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - {{#returnType}}return null;{{/returnType}} -} - -{{/operation}} + + {{#operation}} + void + {{nickname}}Processor(HttpResponse* pHttpResponse, void (* handler)(void*, {{prefix}}Error*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + {{#returnType}}ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + {{{returnType}}} out = {{{defaultResponse}}}; + jsonToValue(out, pJson, L"{{returnType}}", L"{{returnBaseType}}"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + {{prefix}}Error* error = new {{prefix}}Error(0, new String(L"No parsable response received")); + handler(null, error); + } + {{/returnType}}{{^returnType}}handler(null, null);{{/returnType}} + } + else { + {{prefix}}Error* error = new {{prefix}}Error(code, new String(pHttpResponse->GetStatusText())); + {{#returnType}}handler(null, error);{{/returnType}} + {{^returnType}}handler(error, null);{{/returnType}} + } + } + + {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} + {{classname}}::{{nickname}}WithCompletion({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}},{{/hasParams}} {{#returnType}}void (* success)({{returnType}}, {{prefix}}Error*){{/returnType}}{{^returnType}}void(*success)({{prefix}}Error*){{/returnType}}) { + client = new {{prefix}}ApiClient(); + + client->success(&{{nickname}}Processor, (void(*)(void*, {{prefix}}Error*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + {{#headerParams}}{{#collectionFormat}} + int sz = {{paramName}}->GetCount(); + for(int i = 0; i < sz; i++) { + String itemAt = stringify({{paramName}}->GetAt(i), "{{baseType}}"); + headerParams->Add(new String("{{paramName}}"), new String(itemAt)); + } + {{/collectionFormat}}{{^collectionFormat}} + headerParams->Add(new String("{{baseName}}"), {{paramName}}); + {{/collectionFormat}} + {{/headerParams}} + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + {{#queryParams}}{{#collectionFormat}} + int sz = {{paramName}}->GetCount(); + for(int i = 0; i < sz; i++) { + String itemAt = stringify({{paramName}}->GetAt(i), "{{baseType}}"); + queryParams->Add(new String("{{paramName}}"), new String(itemAt)); + } + {{/collectionFormat}}{{^collectionFormat}} + queryParams->Add(new String("{{baseName}}"), {{paramName}}); + {{/collectionFormat}} + {{/queryParams}} + + String* mBody = null; + + {{#bodyParams}} + {{#isContainer}} + if({{paramName}} != null) { + mBody = new String(""); + int sz = {{paramName}}->GetCount(); + for(int i = 0; i < sz; i++) { + {{prefix}}Object * obj = ({{prefix}}Object*){{paramName}}->GetAt(i); + String json = obj->asJson(); + if(i > 0) + mBody->Append(","); + mBody->Append(json); + } + mBody->Append("]"); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + {{/isContainer}} + {{^isContainer}} + if({{paramName}} != null) { + mBody = new String({{paramName}}->asJson()); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + {{/isContainer}} + {{/bodyParams}} + + String url(L"{{{path}}}"); + + {{#pathParams}} + String s_{{paramName}}(L"{"); + s_{{paramName}}.Append(L"{{{baseName}}}"); + s_{{paramName}}.Append(L"}"); + url.Replace(s_{{paramName}}, stringify({{{paramName}}}, L"{{dataType}}")); + {{/pathParams}} + + client->execute({{classname}}::getBasePath(), url, "{{httpMethod}}", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + {{#returnType}}return null;{{/returnType}} + } + + {{/operation}} {{/operations}} } /* namespace Swagger */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/api-header.mustache b/modules/swagger-codegen/src/main/resources/tizen/api-header.mustache index 2a1daf95158..f13f6811206 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/api-header.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/api-header.mustache @@ -1,37 +1,40 @@ #ifndef {{classname}}_H_ #define {{classname}}_H_ -#include -#include "{{prefix}}ApiClient.h" -#include "{{prefix}}Error.h" +#include + + #include "{{prefix}}ApiClient.h" + #include "{{prefix}}Error.h" -{{#imports}}{{{import}}} -{{/imports}} + {{#imports}}{{{import}}} + {{/imports}} -using namespace Tizen::Net::Http; + using namespace Tizen::Net::Http; -namespace Swagger { + namespace Swagger { -{{#operations}} -class {{classname}} { -public: - {{classname}}(); - virtual ~{{classname}}(); + {{#operations}} + class {{classname}} { + public: + {{classname}}(); + virtual ~{{classname}}(); - {{#operation}} - {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} - {{nickname}}WithCompletion({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}},{{/hasParams}} {{#returnType}}void (* handler)({{returnType}}, {{prefix}}Error*){{/returnType}}{{^returnType}}void(* handler)({{prefix}}Error*){{/returnType}}); - {{/operation}} - static String getBasePath() { - return L"{{basePath}}"; - } + {{#operation}} + {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} + {{nickname}}WithCompletion({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}} + , {{/hasMore}}{{/allParams}}{{#hasParams}},{{/hasParams}} {{#returnType}}void (* handler)({{returnType}} + , {{prefix}}Error*){{/returnType}}{{^returnType}}void(* handler)({{prefix}}Error*){{/returnType}}); + {{/operation}} + static String getBasePath() { + return L"{{basePath}}"; + } -private: - {{prefix}}ApiClient* client; -}; + private: + {{prefix}}ApiClient* client; + }; -{{/operations}} -} /* namespace Swagger */ + {{/operations}} + } /* namespace Swagger */ -#endif /* {{classname}}_H_ */ + #endif /* {{classname}}_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/apiclient-body.mustache b/modules/swagger-codegen/src/main/resources/tizen/apiclient-body.mustache index a8442e6b02e..0e231259910 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/apiclient-body.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/apiclient-body.mustache @@ -5,120 +5,120 @@ using namespace Tizen::Base::Utility; namespace Swagger { {{prefix}}ApiClient::{{prefix}}ApiClient() { - enc = new Utf8Encoding(); +enc = new Utf8Encoding(); } void {{prefix}}ApiClient::success(void (*success) (HttpResponse*, void (*cb)(void*, {{prefix}}Error*)), void (*cb)(void*, {{prefix}}Error*)) { - this->successFunction = success; - this->cb = cb; +this->successFunction = success; +this->cb = cb; } {{prefix}}ApiClient::~{{prefix}}ApiClient() { - if(enc) - delete enc; +if(enc) +delete enc; } result {{prefix}}ApiClient::execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* formParams, String contentType) { - NetHttpMethod httpMethod; - if(method.Equals(L"GET", false)) { - httpMethod = NET_HTTP_METHOD_GET; - } - else if(method.Equals(L"PUT", false)) { - httpMethod = NET_HTTP_METHOD_PUT; - } - else if(method.Equals(L"POST", false)) { - httpMethod = NET_HTTP_METHOD_POST; - } - else if(method.Equals(L"DELETE", false)) { - httpMethod = NET_HTTP_METHOD_DELETE; - } - else if(method.Equals(L"OPTIONS", false)) { - httpMethod = NET_HTTP_METHOD_OPTIONS; - } - else if(method.Equals(L"HEAD", false)) { - httpMethod = NET_HTTP_METHOD_HEAD; - } - else if(method.Equals(L"TRACE", false)) { - httpMethod = NET_HTTP_METHOD_TRACE; - } - - String uri = String(host); - uri.Append(path); - - HttpSession* __pHttpSession = null; - HttpTransaction* pHttpTransaction = null; - HttpRequest* pHttpRequest = null; - - if (__pHttpSession == null) { - __pHttpSession = new (std::nothrow) HttpSession(); - __pHttpSession->Construct(NET_HTTP_SESSION_MODE_NORMAL, null, uri, null); - __pHttpSession->SetAutoRedirectionEnabled(true); - } - pHttpTransaction = __pHttpSession->OpenTransactionN(); - pHttpTransaction->AddHttpTransactionListener(*this); - - pHttpRequest = const_cast< HttpRequest* >(pHttpTransaction->GetRequest()); - - HttpHeader *pHeader = pHttpRequest->GetHeader(); - if(contentType != null && !contentType.Equals(L"", true)) { - pHeader->AddField(L"Accept", contentType); - } - if(queryParams != null) { - IMapEnumerator* pMapEnum = queryParams->GetMapEnumeratorN(); - String queryParam = L""; - while (pMapEnum->MoveNext() == E_SUCCESS) { - if(queryParam.GetLength() == 0) - queryParam.Append(L"?"); - else - queryParam.Append(L"&"); - - String* pKey = static_cast< String* > (pMapEnum->GetKey()); - String* pValue = static_cast< String* > (pMapEnum->GetValue()); - String encoded; - UrlEncoder::Encode(*pKey, L"UTF-8", encoded); - - queryParam.Append(encoded); - queryParam.Append("="); - UrlEncoder::Encode(*pValue, L"UTF-8", encoded); - queryParam.Append(encoded); - } - uri.Append(queryParam); - delete queryParams; - } - if(headerParams != null) { - IMapEnumerator* pMapEnum = headerParams->GetMapEnumeratorN(); - while (pMapEnum->MoveNext() == E_SUCCESS) { - String* pKey = static_cast< String* > (pMapEnum->GetKey()); - String* pValue = static_cast< String* > (pMapEnum->GetValue()); - pHeader->AddField(*pKey, *pValue); - } - delete headerParams; - } - if(body != null) { - HttpStringEntity * pEntity = new HttpStringEntity(); - String* cp = new String(*body); - result res = pEntity->Construct(*body, L"application/json", "utf-8", *enc); - res = pHttpRequest->SetEntity(*pEntity); - } - - pHttpRequest->SetUri(uri); - pHttpRequest->SetMethod(httpMethod); - - AppLog("%ls", uri.GetPointer()); - return pHttpTransaction->Submit(); +NetHttpMethod httpMethod; +if(method.Equals(L"GET", false)) { +httpMethod = NET_HTTP_METHOD_GET; +} +else if(method.Equals(L"PUT", false)) { +httpMethod = NET_HTTP_METHOD_PUT; +} +else if(method.Equals(L"POST", false)) { +httpMethod = NET_HTTP_METHOD_POST; +} +else if(method.Equals(L"DELETE", false)) { +httpMethod = NET_HTTP_METHOD_DELETE; +} +else if(method.Equals(L"OPTIONS", false)) { +httpMethod = NET_HTTP_METHOD_OPTIONS; +} +else if(method.Equals(L"HEAD", false)) { +httpMethod = NET_HTTP_METHOD_HEAD; +} +else if(method.Equals(L"TRACE", false)) { +httpMethod = NET_HTTP_METHOD_TRACE; +} + +String uri = String(host); +uri.Append(path); + +HttpSession* __pHttpSession = null; +HttpTransaction* pHttpTransaction = null; +HttpRequest* pHttpRequest = null; + +if (__pHttpSession == null) { +__pHttpSession = new (std::nothrow) HttpSession(); +__pHttpSession->Construct(NET_HTTP_SESSION_MODE_NORMAL, null, uri, null); +__pHttpSession->SetAutoRedirectionEnabled(true); +} +pHttpTransaction = __pHttpSession->OpenTransactionN(); +pHttpTransaction->AddHttpTransactionListener(*this); + +pHttpRequest = const_cast< HttpRequest* >(pHttpTransaction->GetRequest()); + +HttpHeader *pHeader = pHttpRequest->GetHeader(); +if(contentType != null && !contentType.Equals(L"", true)) { +pHeader->AddField(L"Accept", contentType); +} +if(queryParams != null) { +IMapEnumerator* pMapEnum = queryParams->GetMapEnumeratorN(); +String queryParam = L""; +while (pMapEnum->MoveNext() == E_SUCCESS) { +if(queryParam.GetLength() == 0) +queryParam.Append(L"?"); +else +queryParam.Append(L"&"); + +String* pKey = static_cast< String* > (pMapEnum->GetKey()); +String* pValue = static_cast< String* > (pMapEnum->GetValue()); +String encoded; +UrlEncoder::Encode(*pKey, L"UTF-8", encoded); + +queryParam.Append(encoded); +queryParam.Append("="); +UrlEncoder::Encode(*pValue, L"UTF-8", encoded); +queryParam.Append(encoded); +} +uri.Append(queryParam); +delete queryParams; +} +if(headerParams != null) { +IMapEnumerator* pMapEnum = headerParams->GetMapEnumeratorN(); +while (pMapEnum->MoveNext() == E_SUCCESS) { +String* pKey = static_cast< String* > (pMapEnum->GetKey()); +String* pValue = static_cast< String* > (pMapEnum->GetValue()); +pHeader->AddField(*pKey, *pValue); +} +delete headerParams; +} +if(body != null) { +HttpStringEntity * pEntity = new HttpStringEntity(); +String* cp = new String(*body); +result res = pEntity->Construct(*body, L"application/json", "utf-8", *enc); +res = pHttpRequest->SetEntity(*pEntity); +} + +pHttpRequest->SetUri(uri); +pHttpRequest->SetMethod(httpMethod); + +AppLog("%ls", uri.GetPointer()); +return pHttpTransaction->Submit(); } void {{prefix}}ApiClient::OnTransactionCompleted(HttpSession& httpSession, HttpTransaction& pHttpTransaction) { - HttpResponse* pHttpResponse = pHttpTransaction.GetResponse(); +HttpResponse* pHttpResponse = pHttpTransaction.GetResponse(); - if(successFunction != null) { - successFunction(pHttpResponse, cb); - } - delete &httpSession; - delete &pHttpTransaction; +if(successFunction != null) { +successFunction(pHttpResponse, cb); +} +delete &httpSession; +delete &pHttpTransaction; } } /* namespace Swagger */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/apiclient-header.mustache b/modules/swagger-codegen/src/main/resources/tizen/apiclient-header.mustache index 959e8cbb6f2..8c7bda252d6 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/apiclient-header.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/apiclient-header.mustache @@ -1,73 +1,75 @@ -#include +#include + -#include "{{prefix}}Helpers.h" -#include "{{prefix}}Error.h" + #include "{{prefix}}Helpers.h" + #include "{{prefix}}Error.h" -using namespace Tizen::Net::Http; -using namespace Tizen::Base; -using namespace Tizen::Base::Collection; -using namespace Tizen::Text; + using namespace Tizen::Net::Http; + using namespace Tizen::Base; + using namespace Tizen::Base::Collection; + using namespace Tizen::Text; -#ifndef APICLIENT_H_ -#define APICLIENT_H_ + #ifndef APICLIENT_H_ + #define APICLIENT_H_ -namespace Swagger { + namespace Swagger { -class {{prefix}}ApiClient: public IHttpTransactionEventListener { -public: - {{prefix}}ApiClient(); - virtual ~{{prefix}}ApiClient(); + class {{prefix}}ApiClient: public IHttpTransactionEventListener { + public: + {{prefix}}ApiClient(); + virtual ~{{prefix}}ApiClient(); - result - execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* formParams, String contentType); + result + execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* + formParams, String contentType); - void success(void (*res) (HttpResponse*, void (*cb)(void*, {{prefix}}Error*)), void (*cb)(void*, {{prefix}}Error*)); + void success(void (*res) (HttpResponse*, void (*cb)(void*, {{prefix}}Error*)), void (*cb)(void*, {{prefix}}Error*)); - virtual void - OnTransactionCompleted(HttpSession& httpSession, HttpTransaction& pHttpTransaction); + virtual void + OnTransactionCompleted(HttpSession& httpSession, HttpTransaction& pHttpTransaction); - virtual void - OnAudioInAudioFocusChanged(void) { + virtual void + OnAudioInAudioFocusChanged(void) { AppLog("OnAudioInAudioFocusChanged"); - } + } - virtual void - OnTransactionCertVerificationRequiredN(HttpSession& httpSession, HttpTransaction& httpTransaction, - Tizen::Base::String* pCert) { + virtual void + OnTransactionCertVerificationRequiredN(HttpSession& httpSession, HttpTransaction& httpTransaction, + Tizen::Base::String* pCert) { AppLog("OnTransactionCertVerificationRequiredN"); httpTransaction.Resume(); delete pCert; - } - - virtual void - OnTransactionReadyToWrite(HttpSession& httpSession, HttpTransaction& httpTransaction, int recommendedChunkSize) { + } + + virtual void + OnTransactionReadyToWrite(HttpSession& httpSession, HttpTransaction& httpTransaction, int recommendedChunkSize) { AppLog("OnTransactionReadyToWrite"); - } + } - virtual void - OnTransactionReadyToRead(HttpSession& httpSession, HttpTransaction& httpTransaction, int availableBodyLen) { + virtual void + OnTransactionReadyToRead(HttpSession& httpSession, HttpTransaction& httpTransaction, int availableBodyLen) { AppLog("OnTransactionReadyToRead"); - } - - virtual void - OnTransactionAborted(HttpSession& httpSession, HttpTransaction& httpTransaction, result r) { + } + + virtual void + OnTransactionAborted(HttpSession& httpSession, HttpTransaction& httpTransaction, result r) { AppLog("OnTransactionAborted: %ls", GetErrorMessage(r)); delete &httpTransaction; - } - - virtual void - OnTransactionHeaderCompleted(HttpSession& httpSession, HttpTransaction& httpTransaction, int headerLen, bool - bAuthRequired) { + } + + virtual void + OnTransactionHeaderCompleted(HttpSession& httpSession, HttpTransaction& httpTransaction, int headerLen, bool + bAuthRequired) { AppLog("OnTransactionHeaderCompleted"); -} + } -private: - void (*successFunction) (HttpResponse*, void (*success)(void*, {{prefix}}Error*)); - void (*cb)(void*, {{prefix}}Error*); - Utf8Encoding* enc; -}; + private: + void (*successFunction) (HttpResponse*, void (*success)(void*, {{prefix}}Error*)); + void (*cb)(void*, {{prefix}}Error*); + Utf8Encoding* enc; + }; -} /* namespace Swagger */ -#endif /* APICLIENT_H_ */ + } /* namespace Swagger */ + #endif /* APICLIENT_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/error-body.mustache b/modules/swagger-codegen/src/main/resources/tizen/error-body.mustache index 6c169bdcee5..b6fac0a2430 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/error-body.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/error-body.mustache @@ -6,49 +6,49 @@ using namespace Tizen::System; namespace Swagger { {{prefix}}Error::{{prefix}}Error() { - init(); +init(); } {{prefix}}Error::{{prefix}}Error(int code, String* message) { - init(); - this->setCode(code); - this->setMessage(message); +init(); +this->setCode(code); +this->setMessage(message); } {{prefix}}Error::~{{prefix}}Error() { - this->cleanup(); +this->cleanup(); } void {{prefix}}Error::init() { - pCode = 0; - pMessage = null; +pCode = 0; +pMessage = null; } void {{prefix}}Error::cleanup() { - if(pMessage != null) { - delete pMessage; - pMessage = null; - } +if(pMessage != null) { +delete pMessage; +pMessage = null; +} } int {{prefix}}Error::getCode() { - return pCode; +return pCode; } void {{prefix}}Error::setCode(int pCode) { - this->pCode = pCode; +this->pCode = pCode; } String* {{prefix}}Error::getMessage() { - return pMessage; +return pMessage; } void {{prefix}}Error::setMessage(String* pMessage) { - this->pMessage = pMessage; +this->pMessage = pMessage; } } /* namespace Swagger */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/error-header.mustache b/modules/swagger-codegen/src/main/resources/tizen/error-header.mustache index 0e94b25d267..5711665e222 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/error-header.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/error-header.mustache @@ -1,14 +1,15 @@ #ifndef {{prefix}}Error_H_ #define {{prefix}}Error_H_ -#include +#include + -using namespace Tizen::Base; + using namespace Tizen::Base; -namespace Swagger { + namespace Swagger { -class {{prefix}}Error { -public: + class {{prefix}}Error { + public: {{prefix}}Error(); {{prefix}}Error(int code, String* message); virtual ~{{prefix}}Error(); @@ -20,16 +21,16 @@ public: int getCode(); void setCode(int pCode); - + String* getMessage(); void setMessage(String* pMessage); - -private: + + private: int pCode; String* pMessage; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* {{prefix}}Error_H_ */ + #endif /* {{prefix}}Error_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/helpers-body.mustache b/modules/swagger-codegen/src/main/resources/tizen/helpers-body.mustache index 67dfd5ce022..563c5fc0621 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/helpers-body.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/helpers-body.mustache @@ -9,265 +9,265 @@ using namespace Tizen::Locales; using namespace Tizen::System; namespace Swagger { - JsonObject* - toJson(void* ptr, String type, String containerType) { - if(ptr == null) - return null; - if(containerType != null && !type.Equals(L"", false)) { - if(containerType.Equals(L"array", false)) { - if(type != null) { - IList* list = static_cast< IList* >(ptr); - JsonArray* array = new JsonArray(); - int sz = list->GetCount(); - for(int i = 0; i < sz; i++) { - void* itemAt = list->GetAt(i); - JsonObject* item = toJson(itemAt, type, null); - if(item != null) - array->Add(item); - } - return (JsonObject*)array; - } - return null; - } - } - else if(type.Equals(L"Boolean", false)) { - Boolean* v = static_cast< Boolean* >(ptr); - return (JsonObject*) new JsonBool(*v); - } - else if(type.Equals(L"String", false)) { - String* v = static_cast< String* >(ptr); - return (JsonObject*) new JsonString(*v); - } - else if(type.Equals(L"Integer", false)) { - Integer* v = static_cast< Integer* >(ptr); - return (JsonObject*) new JsonNumber(v->ToInt()); - } - else if(type.Equals(L"Long", false)) { - Long* v = static_cast< Long* >(ptr); - return (JsonObject*) new JsonNumber(v->ToInt()); - } - else if(type.Equals(L"Float", false)) { - Float* v = static_cast< Float* >(ptr); - return (JsonObject*) new JsonNumber(v->ToFloat()); - } - else if(type.Equals(L"Double", false)) { - Double* v = static_cast< Double* >(ptr); - return (JsonObject*) new JsonNumber(v->ToDouble()); - } - else if(type.Equals(L"DateTime", false)) { - DateTime* v = static_cast< DateTime* >(ptr); - DateTimeFormatter* pFormatter = DateTimeFormatter::CreateDateTimeFormatterN(); - String date; - pFormatter->ApplyPattern(L"yyyy-MM-dd"); - pFormatter->Format(*v, date); +JsonObject* +toJson(void* ptr, String type, String containerType) { +if(ptr == null) +return null; +if(containerType != null && !type.Equals(L"", false)) { +if(containerType.Equals(L"array", false)) { +if(type != null) { +IList* list = static_cast< IList* >(ptr); +JsonArray* array = new JsonArray(); +int sz = list->GetCount(); +for(int i = 0; i < sz; i++) { +void* itemAt = list->GetAt(i); +JsonObject* item = toJson(itemAt, type, null); +if(item != null) +array->Add(item); +} +return (JsonObject*)array; +} +return null; +} +} +else if(type.Equals(L"Boolean", false)) { +Boolean* v = static_cast< Boolean* >(ptr); +return (JsonObject*) new JsonBool(*v); +} +else if(type.Equals(L"String", false)) { +String* v = static_cast< String* >(ptr); +return (JsonObject*) new JsonString(*v); +} +else if(type.Equals(L"Integer", false)) { +Integer* v = static_cast< Integer* >(ptr); +return (JsonObject*) new JsonNumber(v->ToInt()); +} +else if(type.Equals(L"Long", false)) { +Long* v = static_cast< Long* >(ptr); +return (JsonObject*) new JsonNumber(v->ToInt()); +} +else if(type.Equals(L"Float", false)) { +Float* v = static_cast< Float* >(ptr); +return (JsonObject*) new JsonNumber(v->ToFloat()); +} +else if(type.Equals(L"Double", false)) { +Double* v = static_cast< Double* >(ptr); +return (JsonObject*) new JsonNumber(v->ToDouble()); +} +else if(type.Equals(L"DateTime", false)) { +DateTime* v = static_cast< DateTime* >(ptr); +DateTimeFormatter* pFormatter = DateTimeFormatter::CreateDateTimeFormatterN(); +String date; +pFormatter->ApplyPattern(L"yyyy-MM-dd"); +pFormatter->Format(*v, date); - String time; - pFormatter->ApplyPattern(L"hh:mm:ss"); - pFormatter->Format(*v, time); - String formattedString = date + "T" + time; - delete pFormatter; - return (JsonObject*)new JsonString(formattedString); - } - else if(type.StartsWith(L"{{prefix}}", 0)) { - {{prefix}}Object* obj = static_cast< {{prefix}}Object* >(ptr); - return obj->asJsonObject(); - } - return null; - } +String time; +pFormatter->ApplyPattern(L"hh:mm:ss"); +pFormatter->Format(*v, time); +String formattedString = date + "T" + time; +delete pFormatter; +return (JsonObject*)new JsonString(formattedString); +} +else if(type.StartsWith(L"{{prefix}}", 0)) { +{{prefix}}Object* obj = static_cast< {{prefix}}Object* >(ptr); +return obj->asJsonObject(); +} +return null; +} - void - toISO8601(String str, DateTime* dt) { - int idx, start; - int year, month, day, hour, minute, second; +void +toISO8601(String str, DateTime* dt) { +int idx, start; +int year, month, day, hour, minute, second; - start = 0; - str.IndexOf(L"-", start, idx); - String yearString; - str.SubString(0, idx, yearString); - Integer::Parse(yearString, year); +start = 0; +str.IndexOf(L"-", start, idx); +String yearString; +str.SubString(0, idx, yearString); +Integer::Parse(yearString, year); - start = idx+1; - str.IndexOf(L"-", start, idx); - String monthString; - str.SubString(start, idx - start, monthString); - Integer::Parse(monthString, month); +start = idx+1; +str.IndexOf(L"-", start, idx); +String monthString; +str.SubString(start, idx - start, monthString); +Integer::Parse(monthString, month); - start = idx+1; - str.IndexOf(L"T", start, idx); - String dayString; - str.SubString(start, idx - start, dayString); - Integer::Parse(dayString, day); +start = idx+1; +str.IndexOf(L"T", start, idx); +String dayString; +str.SubString(start, idx - start, dayString); +Integer::Parse(dayString, day); - start = idx+1; - str.IndexOf(L":", start, idx); - if(idx > 0) { - String hourString; - str.SubString(start, idx - start, hourString); - Integer::Parse(hourString, hour); - } +start = idx+1; +str.IndexOf(L":", start, idx); +if(idx > 0) { +String hourString; +str.SubString(start, idx - start, hourString); +Integer::Parse(hourString, hour); +} - start = idx+1; - str.IndexOf(L":", start, idx); - if(idx > 0) { - String minuteString; - str.SubString(start, idx - start, minuteString); - Integer::Parse(minuteString, minute); - } +start = idx+1; +str.IndexOf(L":", start, idx); +if(idx > 0) { +String minuteString; +str.SubString(start, idx - start, minuteString); +Integer::Parse(minuteString, minute); +} - start = idx+1; - str.IndexOf(L"+", start, idx); - if(idx > 0) { - String secondString; - str.SubString(start, idx - start, secondString); - Integer::Parse(secondString, second); - } +start = idx+1; +str.IndexOf(L"+", start, idx); +if(idx > 0) { +String secondString; +str.SubString(start, idx - start, secondString); +Integer::Parse(secondString, second); +} - dt->SetValue(year, month, day, hour, minute, second); - } +dt->SetValue(year, month, day, hour, minute, second); +} - void - jsonToValue(void* target, IJsonValue* ptr, String type, String innerType) { - if(target == null || ptr == null) { - return; - } - if(type.StartsWith(L"Boolean", 0)) { - JsonBool* json = static_cast< JsonBool* >(ptr); - Boolean* val = static_cast< Boolean* > (target); - val->value = json->ToBool(); - } - else if(type.StartsWith(L"String", 0)) { - JsonString* json = static_cast< JsonString* >(ptr); - String* val = static_cast< String* > (target); - val->Clear(); - val->Append(json->GetPointer()); - } - else if(type.StartsWith(L"Integer", 0)) { - JsonNumber* json = static_cast< JsonNumber* >(ptr); - Integer* val = static_cast< Integer* > (target); - *val = json->ToInt(); - } - else if(type.StartsWith(L"Long", 0)) { - JsonNumber* json = static_cast< JsonNumber* >(ptr); - Long* val = static_cast< Long* > (target); - *val = json->ToLong(); - } - else if(type.StartsWith(L"DateTime", 0)) { - JsonString* json = static_cast< JsonString* >(ptr); - String str; - str.Append(json->GetPointer()); +void +jsonToValue(void* target, IJsonValue* ptr, String type, String innerType) { +if(target == null || ptr == null) { +return; +} +if(type.StartsWith(L"Boolean", 0)) { +JsonBool* json = static_cast< JsonBool* >(ptr); +Boolean* val = static_cast< Boolean* > (target); +val->value = json->ToBool(); +} +else if(type.StartsWith(L"String", 0)) { +JsonString* json = static_cast< JsonString* >(ptr); +String* val = static_cast< String* > (target); +val->Clear(); +val->Append(json->GetPointer()); +} +else if(type.StartsWith(L"Integer", 0)) { +JsonNumber* json = static_cast< JsonNumber* >(ptr); +Integer* val = static_cast< Integer* > (target); +*val = json->ToInt(); +} +else if(type.StartsWith(L"Long", 0)) { +JsonNumber* json = static_cast< JsonNumber* >(ptr); +Long* val = static_cast< Long* > (target); +*val = json->ToLong(); +} +else if(type.StartsWith(L"DateTime", 0)) { +JsonString* json = static_cast< JsonString* >(ptr); +String str; +str.Append(json->GetPointer()); - DateTime* val = static_cast< DateTime* > (target); - toISO8601(str, val); - } - else if(type.StartsWith(L"{{prefix}}", 0)) { - {{prefix}}Object* obj = static_cast< {{prefix}}Object* > (target); - obj->fromJsonObject(ptr); - } - else if(type.StartsWith(L"IList", 0)) { - IList* obj = static_cast< IList* >(target); - JsonArray* pJsonArray = static_cast< JsonArray* >(ptr); +DateTime* val = static_cast< DateTime* > (target); +toISO8601(str, val); +} +else if(type.StartsWith(L"{{prefix}}", 0)) { +{{prefix}}Object* obj = static_cast< {{prefix}}Object* > (target); +obj->fromJsonObject(ptr); +} +else if(type.StartsWith(L"IList", 0)) { +IList* obj = static_cast< IList* >(target); +JsonArray* pJsonArray = static_cast< JsonArray* >(ptr); - IEnumeratorT< IJsonValue* >* pEnum = pJsonArray->GetEnumeratorN(); - while (pEnum->MoveNext() == E_SUCCESS) { - IJsonValue* pJsonValue = null; - pEnum->GetCurrent(pJsonValue); - void* updatedTarget = null; - updatedTarget = create(innerType); +IEnumeratorT< IJsonValue* >* pEnum = pJsonArray->GetEnumeratorN(); +while (pEnum->MoveNext() == E_SUCCESS) { +IJsonValue* pJsonValue = null; +pEnum->GetCurrent(pJsonValue); +void* updatedTarget = null; +updatedTarget = create(innerType); - if(updatedTarget != null) { - jsonToValue(updatedTarget, pJsonValue, innerType, L""); - obj->Add((Object*)updatedTarget); - } - } - delete pEnum; - } - } +if(updatedTarget != null) { +jsonToValue(updatedTarget, pJsonValue, innerType, L""); +obj->Add((Object*)updatedTarget); +} +} +delete pEnum; +} +} - Integer* - jsonToInteger(IJsonValue* value) { - if(value == null) - return null; - switch(value->GetType()) { - case JSON_TYPE_STRING: - break; - case JSON_TYPE_NUMBER: { - JsonNumber* number = static_cast< JsonNumber* >(value); - int num = number->ToInt(); - return new Integer(num); - } - case JSON_TYPE_OBJECT: - break; - case JSON_TYPE_ARRAY: - break; - case JSON_TYPE_BOOL: - break; - case JSON_TYPE_NULL: - break; - } - return null; - } +Integer* +jsonToInteger(IJsonValue* value) { +if(value == null) +return null; +switch(value->GetType()) { +case JSON_TYPE_STRING: +break; +case JSON_TYPE_NUMBER: { +JsonNumber* number = static_cast< JsonNumber* >(value); +int num = number->ToInt(); +return new Integer(num); +} +case JSON_TYPE_OBJECT: +break; +case JSON_TYPE_ARRAY: +break; +case JSON_TYPE_BOOL: +break; +case JSON_TYPE_NULL: +break; +} +return null; +} - Long* - jsonToLong(IJsonValue* value) { - if(value == null) - return null; - switch(value->GetType()) { - case JSON_TYPE_STRING: - break; - case JSON_TYPE_NUMBER: { - JsonNumber* number = static_cast< JsonNumber* >(value); - long int num = number->ToLong(); - return new Long(num); - } - case JSON_TYPE_OBJECT: - break; - case JSON_TYPE_ARRAY: - break; - case JSON_TYPE_BOOL: - break; - case JSON_TYPE_NULL: - break; - } - return null; - } +Long* +jsonToLong(IJsonValue* value) { +if(value == null) +return null; +switch(value->GetType()) { +case JSON_TYPE_STRING: +break; +case JSON_TYPE_NUMBER: { +JsonNumber* number = static_cast< JsonNumber* >(value); +long int num = number->ToLong(); +return new Long(num); +} +case JSON_TYPE_OBJECT: +break; +case JSON_TYPE_ARRAY: +break; +case JSON_TYPE_BOOL: +break; +case JSON_TYPE_NULL: +break; +} +return null; +} - String* - jsonToString(IJsonValue* value) { - if(value == null) - return null; - switch(value->GetType()) { - case JSON_TYPE_STRING: { - JsonString* string = static_cast< JsonString* >(value); - return new String(string->GetPointer()); - } - case JSON_TYPE_NUMBER: - break; - case JSON_TYPE_OBJECT: - break; - case JSON_TYPE_ARRAY: - break; - case JSON_TYPE_BOOL: - break; - case JSON_TYPE_NULL: - break; - } - return null; - } +String* +jsonToString(IJsonValue* value) { +if(value == null) +return null; +switch(value->GetType()) { +case JSON_TYPE_STRING: { +JsonString* string = static_cast< JsonString* >(value); +return new String(string->GetPointer()); +} +case JSON_TYPE_NUMBER: +break; +case JSON_TYPE_OBJECT: +break; +case JSON_TYPE_ARRAY: +break; +case JSON_TYPE_BOOL: +break; +case JSON_TYPE_NULL: +break; +} +return null; +} - String - stringify(void* ptr, String type) { - if(type.StartsWith(L"String", 0)) { - String * str = static_cast< String* > (ptr); - return String(str->GetPointer()); - } - if(type.StartsWith(L"Integer", 0)) { - Integer* pInt = static_cast< Integer* > (ptr); - return pInt->ToString(); - } - if(type.StartsWith(L"Long", 0)) { - Long* pLong = static_cast< Long* > (ptr); - return pLong->ToString(); - } - return L""; - } +String +stringify(void* ptr, String type) { +if(type.StartsWith(L"String", 0)) { +String * str = static_cast< String* > (ptr); +return String(str->GetPointer()); +} +if(type.StartsWith(L"Integer", 0)) { +Integer* pInt = static_cast< Integer* > (ptr); +return pInt->ToString(); +} +if(type.StartsWith(L"Long", 0)) { +Long* pLong = static_cast< Long* > (ptr); +return pLong->ToString(); +} +return L""; +} } /* namespace Swagger */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/helpers-header.mustache b/modules/swagger-codegen/src/main/resources/tizen/helpers-header.mustache index a897e097ca5..52c222de2d5 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/helpers-header.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/helpers-header.mustache @@ -1,45 +1,50 @@ #ifndef HELPERS_H_ #define HELPERS_H_ -#include -#include -#include -#include -#include -#include "{{prefix}}Helpers.h" -#include "{{prefix}}Object.h" - -using Tizen::Base::String; -using Tizen::Base::DateTime; -using namespace Tizen::Web::Json; -using namespace Tizen::Base::Collection; - -using Tizen::Base::Long; -using Tizen::Base::DateTime; -using Tizen::Base::String; -using Tizen::Base::Integer; - -namespace Swagger { -JsonObject* -toJson(void* v, String type, String containerType); - -void -jsonToValue(void* target, IJsonValue* ptr, String type, String innerType); - -Integer* -jsonToInteger(IJsonValue* value); - -Long* -jsonToLong(IJsonValue* value); - -String* -jsonToString(IJsonValue* value); - -DateTime* -jsonToDateTime(IJsonValue* value); - -String -stringify(void* ptr, String type); - -} /* namespace Swagger */ -#endif /* HELPERS_H_ */ +#include + + #include + + #include + + #include + + #include + + #include "{{prefix}}Helpers.h" + #include "{{prefix}}Object.h" + + using Tizen::Base::String; + using Tizen::Base::DateTime; + using namespace Tizen::Web::Json; + using namespace Tizen::Base::Collection; + + using Tizen::Base::Long; + using Tizen::Base::DateTime; + using Tizen::Base::String; + using Tizen::Base::Integer; + + namespace Swagger { + JsonObject* + toJson(void* v, String type, String containerType); + + void + jsonToValue(void* target, IJsonValue* ptr, String type, String innerType); + + Integer* + jsonToInteger(IJsonValue* value); + + Long* + jsonToLong(IJsonValue* value); + + String* + jsonToString(IJsonValue* value); + + DateTime* + jsonToDateTime(IJsonValue* value); + + String + stringify(void* ptr, String type); + + } /* namespace Swagger */ + #endif /* HELPERS_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/model-body.mustache b/modules/swagger-codegen/src/main/resources/tizen/model-body.mustache index a8387a15a16..dd6abf5359f 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/model-body.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/model-body.mustache @@ -1,158 +1,159 @@ {{#models}}{{#model}} -#include "{{classname}}.h" -#include + #include "{{classname}}.h" + #include + -using namespace Tizen::Base; -using namespace Tizen::System; -using namespace Tizen::Base::Utility; -using namespace Tizen::Base::Collection; -using namespace Tizen::Web::Json; -using namespace Tizen::Locales; + using namespace Tizen::Base; + using namespace Tizen::System; + using namespace Tizen::Base::Utility; + using namespace Tizen::Base::Collection; + using namespace Tizen::Web::Json; + using namespace Tizen::Locales; -namespace Swagger { + namespace Swagger { -{{classname}}::{{classname}}() { - init(); -} + {{classname}}::{{classname}}() { + init(); + } -{{classname}}::~{{classname}}() { - this->cleanup(); -} + {{classname}}::~{{classname}}() { + this->cleanup(); + } -void -{{classname}}::init() { + void + {{classname}}::init() { {{#vars}}{{name}} = null; {{/vars}} -} + } -void -{{classname}}::cleanup() { + void + {{classname}}::cleanup() { {{#vars}}if({{name}} != null) { - {{#isContainer}}{{name}}->RemoveAll(true);{{/isContainer}} + {{#isContainer}}{{name}}->RemoveAll(true);{{/isContainer}} delete {{name}}; - {{name}} = null; - } + {{name}} = null; + } {{/vars}} -} - - -{{classname}}* -{{classname}}::fromJson(String* json) { - this->cleanup(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; - return this; -} - - -void -{{classname}}::fromJsonObject(IJsonValue* pJson) { - JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); - - if(pJsonObject != null) { - {{#vars}}JsonString* {{name}}Key = new JsonString(L"{{baseName}}"); + } + + + {{classname}}* + {{classname}}::fromJson(String* json) { + this->cleanup(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + return this; + } + + + void + {{classname}}::fromJsonObject(IJsonValue* pJson) { + JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); + + if(pJsonObject != null) { + {{#vars}}JsonString* {{name}}Key = new JsonString(L"{{baseName}}"); IJsonValue* {{name}}Val = null; pJsonObject->GetValue({{name}}Key, {{name}}Val); if({{name}}Val != null) { - {{#isContainer}}{{name}} = {{defaultValue}};{{/isContainer}} - {{#isNotContainer}}{{name}} = {{defaultValue}};{{/isNotContainer}} - jsonToValue({{name}}, {{name}}Val, L"{{baseType}}", L"{{complexType}}"); + {{#isContainer}}{{name}} = {{defaultValue}};{{/isContainer}} + {{#isNotContainer}}{{name}} = {{defaultValue}};{{/isNotContainer}} + jsonToValue({{name}}, {{name}}Val, L"{{baseType}}", L"{{complexType}}"); } delete {{name}}Key; - {{/vars}} - } -} - -{{classname}}::{{classname}}(String* json) { - init(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; -} - -String -{{classname}}::asJson () -{ - JsonObject* pJsonObject = asJsonObject(); - - char *pComposeBuf = new char[256]; - JsonWriter::Compose(pJsonObject, pComposeBuf, 256); - String s = String(pComposeBuf); - - delete pComposeBuf; - pJsonObject->RemoveAll(true); - delete pJsonObject; - - return s; -} - -JsonObject* -{{classname}}::asJsonObject() { - JsonObject *pJsonObject = new JsonObject(); - pJsonObject->Construct(); + {{/vars}} + } + } + + {{classname}}::{{classname}}(String* json) { + init(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + } + + String + {{classname}}::asJson () + { + JsonObject* pJsonObject = asJsonObject(); + + char *pComposeBuf = new char[256]; + JsonWriter::Compose(pJsonObject, pComposeBuf, 256); + String s = String(pComposeBuf); + + delete pComposeBuf; + pJsonObject->RemoveAll(true); + delete pJsonObject; + + return s; + } + + JsonObject* + {{classname}}::asJsonObject() { + JsonObject *pJsonObject = new JsonObject(); + pJsonObject->Construct(); {{#vars}} - JsonString *{{name}}Key = new JsonString(L"{{baseName}}"); - pJsonObject->Add({{name}}Key, toJson({{getter}}(), "{{complexType}}", "{{containerType}}")); + JsonString *{{name}}Key = new JsonString(L"{{baseName}}"); + pJsonObject->Add({{name}}Key, toJson({{getter}}(), "{{complexType}}", "{{containerType}}")); {{/vars}} - return pJsonObject; -} + return pJsonObject; + } -{{#vars}} -{{datatype}} -{{classname}}::{{getter}}() { - return {{name}}; -} -void -{{classname}}::{{setter}}({{datatype}} {{name}}) { - this->{{name}} = {{name}}; -} + {{#vars}} + {{datatype}} + {{classname}}::{{getter}}() { + return {{name}}; + } + void + {{classname}}::{{setter}}({{datatype}} {{name}}) { + this->{{name}} = {{name}}; + } -{{/vars}} + {{/vars}} -} /* namespace Swagger */ + } /* namespace Swagger */ {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/tizen/model-header.mustache b/modules/swagger-codegen/src/main/resources/tizen/model-header.mustache index 1a2a831f5ac..de2eb05066a 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/model-header.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/model-header.mustache @@ -1,58 +1,62 @@ {{#models}}{{#model}}/* - * {{classname}}.h - * - * {{description}} - */ +* {{classname}}.h +* +* {{description}} +*/ #ifndef {{classname}}_H_ #define {{classname}}_H_ -#include -#include -#include -#include -#include "{{prefix}}Helpers.h" -#include "{{prefix}}Object.h" +#include + + #include + + #include + + #include + + #include "{{prefix}}Helpers.h" + #include "{{prefix}}Object.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; {{/model}}{{/models}} {{#imports}}{{{import}}} {{/imports}} {{#models}}{{#model}} -namespace Swagger { + namespace Swagger { -class {{classname}}: public {{prefix}}Object { -public: + class {{classname}}: public {{prefix}}Object { + public: {{classname}}(); {{classname}}(String* json); - virtual ~{{classname}}(); + virtual ~{{classname}}(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); {{classname}}* fromJson(String* obj); {{#vars}} - {{datatype}} {{getter}}(); - void {{setter}}({{datatype}} {{name}}); + {{datatype}} {{getter}}(); + void {{setter}}({{datatype}} {{name}}); {{/vars}} -private: + private: {{#vars}}{{datatype}} {{name}}; {{/vars}} -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* {{classname}}_H_ */ + #endif /* {{classname}}_H_ */ {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/tizen/modelFactory.mustache b/modules/swagger-codegen/src/main/resources/tizen/modelFactory.mustache index 395203bde6b..12efcb35e6b 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/modelFactory.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/modelFactory.mustache @@ -3,29 +3,29 @@ #include "{{prefix}}Object.h" {{#models}}{{#model}} -#include "{{classname}}.h"{{/model}}{{/models}} + #include "{{classname}}.h"{{/model}}{{/models}} namespace Swagger { - void* - create(String type) { - {{#models}}{{#model}}if(type.Equals(L"{{classname}}", true)) { - return new {{classname}}(); - } - {{/model}}{{/models}} - if(type.Equals(L"String", true)) { - return new String(); - } - if(type.Equals(L"Integer", true)) { - return new Integer(); - } - if(type.Equals(L"Long", true)) { - return new Long(); - } - if(type.Equals(L"DateTime", true)) { - return new DateTime(); - } - return null; - } +void* +create(String type) { +{{#models}}{{#model}}if(type.Equals(L"{{classname}}", true)) { +return new {{classname}}(); +} +{{/model}}{{/models}} +if(type.Equals(L"String", true)) { +return new String(); +} +if(type.Equals(L"Integer", true)) { +return new Integer(); +} +if(type.Equals(L"Long", true)) { +return new Long(); +} +if(type.Equals(L"DateTime", true)) { +return new DateTime(); +} +return null; +} } /* namespace Swagger */ #endif /* ModelFactory_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/tizen/object.mustache b/modules/swagger-codegen/src/main/resources/tizen/object.mustache index 8cbbe07fb61..e7911b82dd0 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/object.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/object.mustache @@ -1,27 +1,30 @@ #ifndef _{{prefix}}_OBJECT_H_ #define _{{prefix}}_OBJECT_H_ -#include -#include -#include +#include + + #include + + #include + -using Tizen::Base::String; + using Tizen::Base::String; -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; -class {{prefix}}Object { - public: - virtual JsonObject* asJsonObject() { - return null; - } - virtual ~{{prefix}}Object() {} - virtual {{prefix}}Object* fromJson(String* obj) { - return null; - } - virtual void fromJsonObject(IJsonValue* obj) {} - virtual String asJson() { - return L""; - } -}; + class {{prefix}}Object { + public: + virtual JsonObject* asJsonObject() { + return null; + } + virtual ~{{prefix}}Object() {} + virtual {{prefix}}Object* fromJson(String* obj) { + return null; + } + virtual void fromJsonObject(IJsonValue* obj) {} + virtual String asJson() { + return L""; + } + }; -#endif /* _{{prefix}}_OBJECT_H_ */ + #endif /* _{{prefix}}_OBJECT_H_ */ diff --git a/modules/swagger-codegen/src/main/resources/validator/index.mustache b/modules/swagger-codegen/src/main/resources/validator/index.mustache index 24ac8de38ef..9b469fc8702 100644 --- a/modules/swagger-codegen/src/main/resources/validator/index.mustache +++ b/modules/swagger-codegen/src/main/resources/validator/index.mustache @@ -33,8 +33,6 @@ font-weight: bold; } - - body { font-family: "Droid Sans", sans-serif; font-size: 0.9em; @@ -70,7 +68,7 @@ clear: none; float: left; padding: 20px 0 20px 60px; - background: transparent url('http://swagger.wordnik.com/images/logo.png') no-repeat left center; + background: transparent url('http://swagger.io/images/logo.png') no-repeat left center; color: white; text-decoration: none; } @@ -155,7 +153,7 @@ margin-bottom: 15px; } - #content .head-info{ + #content .head-info { font-size: 1.2em; } @@ -177,6 +175,7 @@ border-color: gray; background-color: white; } + table#validation-results th { border-width: 1px; padding: 10px; @@ -186,15 +185,18 @@ text-align: left; font-weight: bold;; } + table#validation-results td { border-width: 1px; padding: 10px; border-style: solid; border-color: gray; } + table#validation-results tr:nth-child(even) { background-color: rgb(240, 240, 230); } + table#validation-results tr:nth-child(odd) { background-color: rgb(250, 250, 240); } @@ -207,13 +209,13 @@ @@ -247,12 +249,12 @@
      {{#messages}} - - - - - - + + + + + + {{/messages}}
      {{level}}{{elementType}}{{elementId}}{{message}}
      {{level}}{{elementType}}{{elementId}}{{message}}
      diff --git a/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs b/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs index 370eca562a7..7207d603310 100644 --- a/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs +++ b/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs @@ -31,18 +31,18 @@ "grantTypes": { "implicit": { "loginEndpoint": { - "url": "http://petstore.swagger.wordnik.com/oauth/dialog" + "url": "http://petstore.swagger.io/api/oauth/dialog" }, "tokenName": "access_token" }, "authorization_code": { "tokenRequestEndpoint": { - "url": "http://petstore.swagger.wordnik.com/oauth/requestToken", + "url": "http://petstore.swagger.io/api/oauth/requestToken", "clientIdName": "client_id", "clientSecretName": "client_secret" }, "tokenEndpoint": { - "url": "http://petstore.swagger.wordnik.com/oauth/token", + "url": "http://petstore.swagger.io/api/oauth/token", "tokenName": "access_code" } } @@ -52,8 +52,8 @@ "info": { "title": "Swagger Sample App", "description": "This is a sample server Petstore server. You can find out more about Swagger \n at http://swagger.wordnik.com or on irc.freenode.net, #swagger. For this sample,\n you can use the api key \"special-key\" to test the authorization filters", - "termsOfServiceUrl": "http://helloreverb.com/terms/", - "contact": "apiteam@wordnik.com", + "termsOfServiceUrl": "http://swagger.io/terms/", + "contact": "apiteam@swagger.io", "license": "Apache 2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html" } diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json index 30c53134633..66762d74b2b 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json +++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json @@ -4,9 +4,9 @@ "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://helloreverb.com/terms/", + "termsOfService": "http://swagger.io/terms/", "contact": { - "email": "apiteam@wordnik.com" + "email": "apiteam@swagger.io" }, "license": { "name": "Apache 2.0", diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig b/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig index b4678fc3ab9..7422817fea7 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig +++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig @@ -4,9 +4,9 @@ "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://helloreverb.com/terms/", + "termsOfService": "http://swagger.io/terms/", "contact": { - "email": "apiteam@wordnik.com" + "email": "apiteam@swagger.io" }, "license": { "name": "Apache 2.0", diff --git a/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json b/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json index e2a917c6744..31de5d80094 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json +++ b/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json @@ -4,9 +4,9 @@ "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://helloreverb.com/terms/", + "termsOfService": "http://swagger.io/terms/", "contact": { - "name": "apiteam@wordnik.com" + "name": "apiteam@swagger.io" }, "license": { "name": "Apache 2.0", @@ -86,7 +86,7 @@ "properties": { "id": { "type": "integer", - "format": "int64" + "format": "int64" } } }, diff --git a/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json b/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json index 88106746d29..aaf79e10f89 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json +++ b/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json @@ -4,9 +4,9 @@ "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://helloreverb.com/terms/", + "termsOfService": "http://swagger.io/terms/", "contact": { - "email": "apiteam@wordnik.com" + "email": "apiteam@swagger.io" }, "license": { "name": "Apache 2.0", @@ -77,7 +77,9 @@ }, "definitions": { "CustomModel": { - "required": ["id"], + "required": [ + "id" + ], "properties": { "id": { "type": "integer", diff --git a/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json b/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json index f698c96425a..e31ae09488c 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json +++ b/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json @@ -4,9 +4,9 @@ "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://helloreverb.com/terms/", + "termsOfService": "http://swagger.io/terms/", "contact": { - "email": "apiteam@wordnik.com" + "email": "apiteam@swagger.io" }, "license": { "name": "Apache 2.0", @@ -123,7 +123,9 @@ }, "definitions": { "CustomModel": { - "required": ["id"], + "required": [ + "id" + ], "properties": { "id": { "type": "integer", diff --git a/modules/swagger-codegen/src/test/resources/2_0/v1beta3.json b/modules/swagger-codegen/src/test/resources/2_0/v1beta3.json index c5e7d8d5986..eb874ab3c78 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/v1beta3.json +++ b/modules/swagger-codegen/src/test/resources/2_0/v1beta3.json @@ -4,313 +4,313 @@ "basePath": "https://127.0.0.1:6443", "resourcePath": "/api/v1beta3", "apis": [ - { - "path": "/api/v1beta3/namespaces/{namespaces}/bindings", - "description": "API at /api/v1beta3 version v1beta3", - "operations": [ - { - "type": "v1beta3.Binding", - "method": "POST", - "summary": "create a Binding", - "nickname": "createBinding", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "v1beta3.Binding", - "paramType": "body", - "name": "body", - "description": "", - "required": true, - "allowMultiple": false - } - ], - "responseMessages": [ - { - "code": 200, - "message": "OK", - "responseModel": "v1beta3.Binding" - } - ], - "produces": [ - "application/json" - ], - "consumes": [ - "*/*" - ] - } - ] - }, - { - "path": "/api/v1beta3/namespaces/{namespaces}/componentstatuses", - "description": "API at /api/v1beta3 version v1beta3", - "operations": [ - { - "type": "v1beta3.ComponentStatusList", - "method": "GET", - "summary": "list objects of kind ComponentStatus", - "nickname": "listComponentStatus", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "query", - "name": "fieldSelector", - "description": "a selector to restrict the list of returned objects by their fields; defaults to everything", - "required": false, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "query", - "name": "labelSelector", - "description": "a selector to restrict the list of returned objects by their labels; defaults to everything", - "required": false, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "query", - "name": "resourceVersion", - "description": "when specified with a watch call, shows changes that occur after that particular version of a resource; defaults to changes from the beginning of history", - "required": false, - "allowMultiple": false - }, - { - "type": "boolean", - "paramType": "query", - "name": "watch", - "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", - "required": false, - "allowMultiple": false - } - ], - "responseMessages": [ - { - "code": 200, - "message": "OK", - "responseModel": "v1beta3.ComponentStatusList" - } - ], - "produces": [ - "application/json" - ], - "consumes": [ - "*/*" - ] - } - ] - }, - { - "path": "/api/v1beta3/namespaces/{namespaces}/componentstatuses/{name}", - "description": "API at /api/v1beta3 version v1beta3", - "operations": [ - { - "type": "v1beta3.ComponentStatus", - "method": "GET", - "summary": "read the specified ComponentStatus", - "nickname": "readComponentStatus", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the ComponentStatus", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - } - ], - "responseMessages": [ - { - "code": 200, - "message": "OK", - "responseModel": "v1beta3.ComponentStatus" - } - ], - "produces": [ - "application/json" - ], - "consumes": [ - "*/*" - ] - } - ] - } + { + "path": "/api/v1beta3/namespaces/{namespaces}/bindings", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.Binding", + "method": "POST", + "summary": "create a Binding", + "nickname": "createBinding", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "namespaces", + "description": "object name and auth scope, such as for teams and projects", + "required": true, + "allowMultiple": false + }, + { + "type": "v1beta3.Binding", + "paramType": "body", + "name": "body", + "description": "", + "required": true, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta3.Binding" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, + { + "path": "/api/v1beta3/namespaces/{namespaces}/componentstatuses", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.ComponentStatusList", + "method": "GET", + "summary": "list objects of kind ComponentStatus", + "nickname": "listComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "namespaces", + "description": "object name and auth scope, such as for teams and projects", + "required": true, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "fieldSelector", + "description": "a selector to restrict the list of returned objects by their fields; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "labelSelector", + "description": "a selector to restrict the list of returned objects by their labels; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "resourceVersion", + "description": "when specified with a watch call, shows changes that occur after that particular version of a resource; defaults to changes from the beginning of history", + "required": false, + "allowMultiple": false + }, + { + "type": "boolean", + "paramType": "query", + "name": "watch", + "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta3.ComponentStatusList" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, + { + "path": "/api/v1beta3/namespaces/{namespaces}/componentstatuses/{name}", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.ComponentStatus", + "method": "GET", + "summary": "read the specified ComponentStatus", + "nickname": "readComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the ComponentStatus", + "required": true, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "namespaces", + "description": "object name and auth scope, such as for teams and projects", + "required": true, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta3.ComponentStatus" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + } ], "models": { - "v1beta3.ComponentStatus": { - "id": "v1beta3.ComponentStatus", - "properties": { - "apiVersion": { - "type": "string", - "description": "version of the schema the object should have" - }, - "conditions": { - "type": "array", - "items": { - "$ref": "v1beta3.ObjectReference" - }, - "description": "list of component conditions observed" - }, - "kind": { - "type": "string", - "description": "kind of object, in CamelCase; cannot be updated" - }, - "metadata": { - "$ref": "v1beta3.ObjectMeta", - "description": "standard object metadata; see http://docs.k8s.io/api-conventions.md#metadata" - } - } - }, - "v1beta3.ComponentStatusList": { - "id": "v1beta3.ComponentStatusList", - "required": [ - "items" - ], - "properties": { - "apiVersion": { - "type": "string", - "description": "version of the schema the object should have" - }, - "items": { - "type": "array", - "items": { - "$ref": "v1beta3.ComponentStatus" - }, - "description": "list of component status objects" - }, - "kind": { - "type": "string", - "description": "kind of object, in CamelCase; cannot be updated" - }, - "metadata": { - "$ref": "v1beta3.ObjectMeta", - "description": "standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata" - } - } - }, - "v1beta3.Binding": { - "id": "v1beta3.Binding", - "required": [ - "target" - ], - "properties": { - "apiVersion": { - "type": "string", - "description": "version of the schema the object should have" - }, - "kind": { - "type": "string", - "description": "kind of object, in CamelCase; cannot be updated" - }, - "metadata": { - "$ref": "v1beta3.ObjectMeta", - "description": "standard object metadata; see http://docs.k8s.io/api-conventions.md#metadata" - }, - "target": { - "$ref": "v1beta3.ObjectReference", - "description": "an object to bind to" - } - } - }, - "v1beta3.ObjectReference": { - "id": "v1beta3.ObjectReference", - "properties": { - "apiVersion": { - "type": "string", - "description": "API version of the referent" - }, - "fieldPath": { - "type": "string", - "description": "if referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]" - }, - "kind": { - "type": "string", - "description": "kind of the referent" - }, - "name": { - "type": "string", - "description": "name of the referent" - }, - "namespace": { - "type": "string", - "description": "namespace of the referent" - }, - "resourceVersion": { - "type": "string", - "description": "specific resourceVersion to which this reference is made, if any: http://docs.k8s.io/api-conventions.md#concurrency-control-and-consistency" - }, - "uid": { - "type": "string", - "description": "uid of the referent" - } - } - }, - "v1beta3.ObjectMeta": { - "id": "v1beta3.ObjectMeta", - "properties": { - "annotations": { - "type": "any", - "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" - }, - "creationTimestamp": { - "type": "string", - "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" - }, - "deletionTimestamp": { - "type": "string", - "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" - }, - "generateName": { - "type": "string", - "description": "an optional prefix to use to generate a unique name; has the same validation rules as name; optional, and is applied only name if is not specified" - }, - "labels": { - "type": "any", - "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" - }, - "name": { - "type": "string", - "description": "string that identifies an object. Must be unique within a namespace; cannot be updated" - }, - "namespace": { - "type": "string", - "description": "namespace of the object; cannot be updated" - }, - "resourceVersion": { - "type": "string", - "description": "string that identifies the internal version of this object that can be used by clients to determine when objects have changed; populated by the system, read-only; value must be treated as opaque by clients and passed unmodified back to the server: http://docs.k8s.io/api-conventions.md#concurrency-control-and-consistency" - }, - "selfLink": { - "type": "string", - "description": "URL for the object; populated by the system, read-only" - }, - "uid": { - "type": "string", - "description": "unique UUID across space and time; populated by the system; read-only" - } - } - } + "v1beta3.ComponentStatus": { + "id": "v1beta3.ComponentStatus", + "properties": { + "apiVersion": { + "type": "string", + "description": "version of the schema the object should have" + }, + "conditions": { + "type": "array", + "items": { + "$ref": "v1beta3.ObjectReference" + }, + "description": "list of component conditions observed" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "metadata": { + "$ref": "v1beta3.ObjectMeta", + "description": "standard object metadata; see http://docs.k8s.io/api-conventions.md#metadata" + } + } + }, + "v1beta3.ComponentStatusList": { + "id": "v1beta3.ComponentStatusList", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "type": "string", + "description": "version of the schema the object should have" + }, + "items": { + "type": "array", + "items": { + "$ref": "v1beta3.ComponentStatus" + }, + "description": "list of component status objects" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "metadata": { + "$ref": "v1beta3.ObjectMeta", + "description": "standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata" + } + } + }, + "v1beta3.Binding": { + "id": "v1beta3.Binding", + "required": [ + "target" + ], + "properties": { + "apiVersion": { + "type": "string", + "description": "version of the schema the object should have" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "metadata": { + "$ref": "v1beta3.ObjectMeta", + "description": "standard object metadata; see http://docs.k8s.io/api-conventions.md#metadata" + }, + "target": { + "$ref": "v1beta3.ObjectReference", + "description": "an object to bind to" + } + } + }, + "v1beta3.ObjectReference": { + "id": "v1beta3.ObjectReference", + "properties": { + "apiVersion": { + "type": "string", + "description": "API version of the referent" + }, + "fieldPath": { + "type": "string", + "description": "if referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]" + }, + "kind": { + "type": "string", + "description": "kind of the referent" + }, + "name": { + "type": "string", + "description": "name of the referent" + }, + "namespace": { + "type": "string", + "description": "namespace of the referent" + }, + "resourceVersion": { + "type": "string", + "description": "specific resourceVersion to which this reference is made, if any: http://docs.k8s.io/api-conventions.md#concurrency-control-and-consistency" + }, + "uid": { + "type": "string", + "description": "uid of the referent" + } + } + }, + "v1beta3.ObjectMeta": { + "id": "v1beta3.ObjectMeta", + "properties": { + "annotations": { + "type": "any", + "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" + }, + "creationTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" + }, + "deletionTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" + }, + "generateName": { + "type": "string", + "description": "an optional prefix to use to generate a unique name; has the same validation rules as name; optional, and is applied only name if is not specified" + }, + "labels": { + "type": "any", + "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" + }, + "name": { + "type": "string", + "description": "string that identifies an object. Must be unique within a namespace; cannot be updated" + }, + "namespace": { + "type": "string", + "description": "namespace of the object; cannot be updated" + }, + "resourceVersion": { + "type": "string", + "description": "string that identifies the internal version of this object that can be used by clients to determine when objects have changed; populated by the system, read-only; value must be treated as opaque by clients and passed unmodified back to the server: http://docs.k8s.io/api-conventions.md#concurrency-control-and-consistency" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + }, + "uid": { + "type": "string", + "description": "unique UUID across space and time; populated by the system; read-only" + } + } + } } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/test/resources/2_0/wordnik.json b/modules/swagger-codegen/src/test/resources/2_0/wordnik.json index d201b15c5df..ca4ec3ef45c 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/wordnik.json +++ b/modules/swagger-codegen/src/test/resources/2_0/wordnik.json @@ -472,7 +472,7 @@ ], "responses": { "200": { - "description": "success", + "description": "success", "$ref": "/definitions/ExampleSearchResults" }, "400": { diff --git a/modules/swagger-codegen/src/test/scala/ClientAuthInputTest.scala b/modules/swagger-codegen/src/test/scala/ClientAuthInputTest.scala index 83c3be06f93..959a62569fd 100644 --- a/modules/swagger-codegen/src/test/scala/ClientAuthInputTest.scala +++ b/modules/swagger-codegen/src/test/scala/ClientAuthInputTest.scala @@ -1,13 +1,7 @@ -import com.wordnik.swagger.codegen._ - -import com.wordnik.swagger.models.auth.AuthorizationValue - +import io.swagger.codegen._ import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers - -import scala.collection.JavaConverters._ @RunWith(classOf[JUnitRunner]) class ClientAuthInputTest extends FlatSpec with Matchers { @@ -19,26 +13,26 @@ class ClientAuthInputTest extends FlatSpec with Matchers { val header = "api_key:special-key,api_key:hello,X-AUTHORIZATION:0e6c11d79a,Authorization:Basic 1jz0" input.setAuth(header) val authValues = input.getAuthorizationValues() - authValues.size() should be (4) + authValues.size() should be(4) val a1 = authValues.get(0) - a1.getKeyName should be ("api_key") - a1.getValue should be ("special-key") - a1.getType should be ("header") + a1.getKeyName should be("api_key") + a1.getValue should be("special-key") + a1.getType should be("header") val a2 = authValues.get(1) - a2.getKeyName should be ("api_key") - a2.getValue should be ("hello") - a2.getType should be ("header") + a2.getKeyName should be("api_key") + a2.getValue should be("hello") + a2.getType should be("header") val a3 = authValues.get(2) - a3.getKeyName should be ("X-AUTHORIZATION") - a3.getValue should be ("0e6c11d79a") - a3.getType should be ("header") + a3.getKeyName should be("X-AUTHORIZATION") + a3.getValue should be("0e6c11d79a") + a3.getType should be("header") val a4 = authValues.get(3) - a4.getKeyName should be ("Authorization") - a4.getValue should be ("Basic 1jz0") - a4.getType should be ("header") + a4.getKeyName should be("Authorization") + a4.getValue should be("Basic 1jz0") + a4.getType should be("header") } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/test/scala/CodegenTest.scala b/modules/swagger-codegen/src/test/scala/CodegenTest.scala index 5ce35825159..0e76f5088df 100644 --- a/modules/swagger-codegen/src/test/scala/CodegenTest.scala +++ b/modules/swagger-codegen/src/test/scala/CodegenTest.scala @@ -1,5 +1,5 @@ -import com.wordnik.swagger.codegen.DefaultCodegen -import com.wordnik.swagger.models.properties.Property +import io.swagger.codegen.DefaultCodegen +import io.swagger.models.properties.Property import io.swagger.parser._ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @@ -18,25 +18,25 @@ class CodegenTest extends FlatSpec with Matchers { val p = model.getPaths().get(path).getPost() val op = codegen.fromOperation(path, "post", p, model.getDefinitions()) - op.operationId should be ("uploadFile") - op.httpMethod should be ("POST") - op.hasConsumes should equal (true) + op.operationId should be("uploadFile") + op.httpMethod should be("POST") + op.hasConsumes should equal(true) op.consumes.size should be(1) - op.consumes.get(0).get("mediaType") should be ("multipart/form-data") + op.consumes.get(0).get("mediaType") should be("multipart/form-data") - op.hasProduces should equal (true) + op.hasProduces should equal(true) val allParams = op.allParams - allParams.size should be (3) + allParams.size should be(3) val formParams = op.formParams - formParams.size should be (2) + formParams.size should be(2) val file = formParams.get(1) - file.isFormParam should equal (true) - file.dataType should be ("file") - file.required should equal (null) - file.isFile should equal (true) - file.hasMore should be (null) + file.isFormParam should equal(true) + file.dataType should be("file") + file.required should equal(null) + file.isFile should equal(true) + file.hasMore should be(null) } it should "read formParam values from a 2.0 spec" in { @@ -48,45 +48,45 @@ class CodegenTest extends FlatSpec with Matchers { val p = model.getPaths().get(path).getPost() val op = codegen.fromOperation(path, "post", p, model.getDefinitions()) - op.operationId should be ("updatePetWithForm") - op.httpMethod should be ("POST") - op.hasConsumes should equal (true) + op.operationId should be("updatePetWithForm") + op.httpMethod should be("POST") + op.hasConsumes should equal(true) op.consumes.size should be(1) - op.consumes.get(0).get("mediaType") should be ("application/x-www-form-urlencoded") + op.consumes.get(0).get("mediaType") should be("application/x-www-form-urlencoded") - op.hasProduces should equal (true) + op.hasProduces should equal(true) op.produces.size should be(2) - op.produces.get(0).get("mediaType") should be ("application/json") - op.produces.get(0).get("hasMore") should be ("true") - op.produces.get(1).get("mediaType") should be ("application/xml") + op.produces.get(0).get("mediaType") should be("application/json") + op.produces.get(0).get("hasMore") should be("true") + op.produces.get(1).get("mediaType") should be("application/xml") val pathParams = op.pathParams - pathParams.size should be (1) + pathParams.size should be(1) val idParam = pathParams.get(0) - idParam.isPathParam should equal (true) - idParam.dataType should be ("String") - idParam.required should equal (true) - idParam.hasMore should be (null) + idParam.isPathParam should equal(true) + idParam.dataType should be("String") + idParam.required should equal(true) + idParam.hasMore should be(null) val allParams = op.allParams - allParams.size should be (3) + allParams.size should be(3) val formParams = op.formParams - formParams.size should be (2) + formParams.size should be(2) val nameParam = formParams.get(0) - nameParam.isFormParam should equal (true) - nameParam.notFile should equal (true) - nameParam.dataType should be ("String") - nameParam.required should equal (null) - nameParam.hasMore should equal (true) + nameParam.isFormParam should equal(true) + nameParam.notFile should equal(true) + nameParam.dataType should be("String") + nameParam.required should equal(null) + nameParam.hasMore should equal(true) val statusParam = formParams.get(1) - statusParam.isFormParam should equal (true) - statusParam.notFile should equal (true) - statusParam.dataType should be ("String") - statusParam.required should equal (null) - statusParam.hasMore should be (null) + statusParam.isFormParam should equal(true) + statusParam.notFile should equal(true) + statusParam.dataType should be("String") + statusParam.required should equal(null) + statusParam.hasMore should be(null) } it should "handle required parameters from a 2.0 spec as required when figuring out Swagger types" in { diff --git a/modules/swagger-codegen/src/test/scala/ExampleGeneratorTest.scala b/modules/swagger-codegen/src/test/scala/ExampleGeneratorTest.scala index 09ffbf0e16c..51cc5978dda 100644 --- a/modules/swagger-codegen/src/test/scala/ExampleGeneratorTest.scala +++ b/modules/swagger-codegen/src/test/scala/ExampleGeneratorTest.scala @@ -1,19 +1,11 @@ -import scala.collection.JavaConverters.asScalaBufferConverter -import scala.collection.JavaConverters.mapAsJavaMapConverter -import scala.collection.JavaConverters.seqAsJavaListConverter - +import io.swagger.codegen.examples.ExampleGenerator +import io.swagger.models.{Model, ModelImpl, Xml} +import io.swagger.models.properties.{ArrayProperty, RefProperty, StringProperty} import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.Matchers +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import com.wordnik.swagger.codegen.examples.ExampleGenerator -import com.wordnik.swagger.models.Model -import com.wordnik.swagger.models.ModelImpl -import com.wordnik.swagger.models.Xml -import com.wordnik.swagger.models.properties.ArrayProperty -import com.wordnik.swagger.models.properties.RefProperty -import com.wordnik.swagger.models.properties.StringProperty +import scala.collection.JavaConverters.{asScalaBufferConverter, mapAsJavaMapConverter, seqAsJavaListConverter} @RunWith(classOf[JUnitRunner]) class ExampleGeneratorTest extends FlatSpec with Matchers { @@ -42,18 +34,18 @@ class ExampleGeneratorTest extends FlatSpec with Matchers { item.get("contentType") match { case `xml` => { types += xml - example should be ("\n" + - " \n" + - " string\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " string\n" + - " \n" + - " \n" + - " \n" + - "") + example should be("\n" + + " \n" + + " string\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " string\n" + + " \n" + + " \n" + + " \n" + + "") } case `json` => { types += json @@ -62,6 +54,6 @@ class ExampleGeneratorTest extends FlatSpec with Matchers { } } } - types should be (expectedTypes) + types should be(expectedTypes) } } diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaInheritanceTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaInheritanceTest.scala index 1b6cfc0ecfd..577234bac39 100644 --- a/modules/swagger-codegen/src/test/scala/Java/JavaInheritanceTest.scala +++ b/modules/swagger-codegen/src/test/scala/Java/JavaInheritanceTest.scala @@ -1,16 +1,13 @@ package Java -import scala.collection.JavaConverters._ - +import io.swagger.codegen.languages.JavaClientCodegen +import io.swagger.models.{ComposedModel, ModelImpl, RefModel} +import io.swagger.models.properties.StringProperty import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.Matchers +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import com.wordnik.swagger.codegen.languages.JavaClientCodegen -import com.wordnik.swagger.models.ComposedModel -import com.wordnik.swagger.models.ModelImpl -import com.wordnik.swagger.models.RefModel -import com.wordnik.swagger.models.properties.StringProperty + +import scala.collection.JavaConverters._ @RunWith(classOf[JUnitRunner]) class JavaInheritanceTest extends FlatSpec with Matchers { @@ -23,6 +20,6 @@ class JavaInheritanceTest extends FlatSpec with Matchers { cm.name should be("sample") cm.classname should be("Sample") cm.parent should be("Base") - cm.imports.asScala should be (Set("Base")) + cm.imports.asScala should be(Set("Base")) } } diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala index e621b18565d..e5191e1ae23 100644 --- a/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala +++ b/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala @@ -1,11 +1,11 @@ package Java -import com.wordnik.swagger.codegen.languages.JavaClientCodegen -import com.wordnik.swagger.models._ -import com.wordnik.swagger.models.properties._ +import io.swagger.codegen.languages.JavaClientCodegen +import io.swagger.models._ +import io.swagger.models.properties._ import org.junit.runner.RunWith -import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner +import org.scalatest.{FlatSpec, Matchers} import scala.collection.JavaConverters._ @@ -23,8 +23,8 @@ class JavaModelEnumTest extends FlatSpec with Matchers { cm.vars.size should be(1) val enumVar = cm.vars.get(0) - enumVar.baseName should be ("name") - enumVar.datatype should be ("String") + enumVar.baseName should be("name") + enumVar.datatype should be("String") enumVar.datatypeWithEnum should be("NameEnum") enumVar.name should be("name") enumVar.defaultValue should be("null") diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala index f5b26bf78e8..fc819f1f195 100644 --- a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala +++ b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala @@ -1,14 +1,11 @@ package Java -import com.wordnik.swagger.codegen.languages.JavaClientCodegen -import com.wordnik.swagger.util.Json -import com.wordnik.swagger.models._ -import com.wordnik.swagger.models.properties._ - +import io.swagger.codegen.languages.JavaClientCodegen +import io.swagger.models._ +import io.swagger.models.properties._ import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers import scala.collection.JavaConverters._ @@ -26,44 +23,44 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (3) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(3) val vars = cm.vars - vars.get(0).baseName should be ("id") - vars.get(0).getter should be ("getId") - vars.get(0).setter should be ("setId") - vars.get(0).datatype should be ("Long") - vars.get(0).name should be ("id") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("Long") - vars.get(0).hasMore should equal (true) - vars.get(0).required should equal (true) - vars.get(0).isNotContainer should equal (true) - - vars.get(1).baseName should be ("name") - vars.get(1).getter should be ("getName") - vars.get(1).setter should be ("setName") - vars.get(1).datatype should be ("String") - vars.get(1).name should be ("name") - vars.get(1).defaultValue should be ("null") - vars.get(1).baseType should be ("String") - vars.get(1).hasMore should equal (true) - vars.get(1).required should equal (true) - vars.get(1).isNotContainer should equal (true) - - vars.get(2).baseName should be ("createdAt") - vars.get(2).getter should be ("getCreatedAt") - vars.get(2).setter should be ("setCreatedAt") - vars.get(2).datatype should be ("Date") - vars.get(2).name should be ("createdAt") - vars.get(2).defaultValue should be ("null") - vars.get(2).baseType should be ("Date") - vars.get(2).hasMore should equal (null) - vars.get(2).required should equal (null) - vars.get(2).isNotContainer should equal (true) + vars.get(0).baseName should be("id") + vars.get(0).getter should be("getId") + vars.get(0).setter should be("setId") + vars.get(0).datatype should be("Long") + vars.get(0).name should be("id") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("Long") + vars.get(0).hasMore should equal(true) + vars.get(0).required should equal(true) + vars.get(0).isNotContainer should equal(true) + + vars.get(1).baseName should be("name") + vars.get(1).getter should be("getName") + vars.get(1).setter should be("setName") + vars.get(1).datatype should be("String") + vars.get(1).name should be("name") + vars.get(1).defaultValue should be("null") + vars.get(1).baseType should be("String") + vars.get(1).hasMore should equal(true) + vars.get(1).required should equal(true) + vars.get(1).isNotContainer should equal(true) + + vars.get(2).baseName should be("createdAt") + vars.get(2).getter should be("getCreatedAt") + vars.get(2).setter should be("setCreatedAt") + vars.get(2).datatype should be("Date") + vars.get(2).name should be("createdAt") + vars.get(2).defaultValue should be("null") + vars.get(2).baseType should be("Date") + vars.get(2).hasMore should equal(null) + vars.get(2).required should equal(null) + vars.get(2).isNotContainer should equal(true) } it should "convert a model with list property" in { @@ -71,56 +68,56 @@ class JavaModelTest extends FlatSpec with Matchers { .description("a sample model") .property("id", new LongProperty()) .property("urls", new ArrayProperty() - .items(new StringProperty())) + .items(new StringProperty())) .required("id") val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (2) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(2) val vars = cm.vars - vars.get(1).baseName should be ("urls") - vars.get(1).getter should be ("getUrls") - vars.get(1).setter should be ("setUrls") - vars.get(1).datatype should be ("List") - vars.get(1).name should be ("urls") - vars.get(1).defaultValue should be ("new ArrayList() ") - vars.get(1).baseType should be ("List") - vars.get(1).containerType should be ("array") - vars.get(1).required should equal (null) - vars.get(1).isContainer should equal (true) + vars.get(1).baseName should be("urls") + vars.get(1).getter should be("getUrls") + vars.get(1).setter should be("setUrls") + vars.get(1).datatype should be("List") + vars.get(1).name should be("urls") + vars.get(1).defaultValue should be("new ArrayList() ") + vars.get(1).baseType should be("List") + vars.get(1).containerType should be("array") + vars.get(1).required should equal(null) + vars.get(1).isContainer should equal(true) } it should "convert a model with a map property" in { val model = new ModelImpl() .description("a sample model") .property("translations", new MapProperty() - .additionalProperties(new StringProperty())) + .additionalProperties(new StringProperty())) .required("id") val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("translations") - vars.get(0).getter should be ("getTranslations") - vars.get(0).setter should be ("setTranslations") - vars.get(0).datatype should be ("Map") - vars.get(0).name should be ("translations") - vars.get(0).defaultValue should be ("new HashMap() ") - vars.get(0).baseType should be ("Map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("translations") + vars.get(0).getter should be("getTranslations") + vars.get(0).setter should be("setTranslations") + vars.get(0).datatype should be("Map") + vars.get(0).name should be("translations") + vars.get(0).defaultValue should be("new HashMap() ") + vars.get(0).baseType should be("Map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } @@ -128,30 +125,30 @@ class JavaModelTest extends FlatSpec with Matchers { val model = new ModelImpl() .description("a sample model") .property("translations", new MapProperty() - .additionalProperties( - new ArrayProperty().items(new RefProperty("Pet"))) - ) + .additionalProperties( + new ArrayProperty().items(new RefProperty("Pet"))) + ) .required("id") val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("translations") - vars.get(0).getter should be ("getTranslations") - vars.get(0).setter should be ("setTranslations") - vars.get(0).datatype should be ("Map>") - vars.get(0).name should be ("translations") - vars.get(0).defaultValue should be ("new HashMap>() ") - vars.get(0).baseType should be ("Map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("translations") + vars.get(0).getter should be("getTranslations") + vars.get(0).setter should be("setTranslations") + vars.get(0).datatype should be("Map>") + vars.get(0).name should be("translations") + vars.get(0).defaultValue should be("new HashMap>() ") + vars.get(0).baseType should be("Map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } it should "convert a model with complex properties" in { @@ -162,79 +159,79 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).getter should be ("getChildren") - vars.get(0).setter should be ("setChildren") - vars.get(0).datatype should be ("Children") - vars.get(0).name should be ("children") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("Children") - vars.get(0).required should equal (null) - vars.get(0).isNotContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).getter should be("getChildren") + vars.get(0).setter should be("setChildren") + vars.get(0).datatype should be("Children") + vars.get(0).name should be("children") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("Children") + vars.get(0).required should equal(null) + vars.get(0).isNotContainer should equal(true) } it should "convert a model with complex list property" in { val model = new ModelImpl() .description("a sample model") .property("children", new ArrayProperty() - .items(new RefProperty("#/definitions/Children"))) + .items(new RefProperty("#/definitions/Children"))) val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("Children") - vars.get(0).getter should be ("getChildren") - vars.get(0).setter should be ("setChildren") - vars.get(0).datatype should be ("List") - vars.get(0).name should be ("children") - vars.get(0).defaultValue should be ("new ArrayList() ") - vars.get(0).baseType should be ("List") - vars.get(0).containerType should be ("array") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("Children") + vars.get(0).getter should be("getChildren") + vars.get(0).setter should be("setChildren") + vars.get(0).datatype should be("List") + vars.get(0).name should be("children") + vars.get(0).defaultValue should be("new ArrayList() ") + vars.get(0).baseType should be("List") + vars.get(0).containerType should be("array") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } it should "convert a model with complex map property" in { val model = new ModelImpl() .description("a sample model") .property("children", new MapProperty() - .additionalProperties(new RefProperty("#/definitions/Children"))) + .additionalProperties(new RefProperty("#/definitions/Children"))) val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) - (cm.imports.asScala.toSet & Set("Map", "List", "Children")).size should be (3) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) + (cm.imports.asScala.toSet & Set("Map", "List", "Children")).size should be(3) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("Children") - vars.get(0).getter should be ("getChildren") - vars.get(0).setter should be ("setChildren") - vars.get(0).datatype should be ("Map") - vars.get(0).name should be ("children") - vars.get(0).defaultValue should be ("new HashMap() ") - vars.get(0).baseType should be ("Map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) - vars.get(0).isNotContainer should be (null) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("Children") + vars.get(0).getter should be("getChildren") + vars.get(0).setter should be("setChildren") + vars.get(0).datatype should be("Map") + vars.get(0).name should be("children") + vars.get(0).defaultValue should be("new HashMap() ") + vars.get(0).baseType should be("Map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) + vars.get(0).isNotContainer should be(null) } it should "convert an array model" in { @@ -244,13 +241,13 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("an array model") - cm.vars.size should be (0) - cm.parent should be ("ArrayList") - cm.imports.size should be (3) - (cm.imports.asScala.toSet & Set("List", "ArrayList", "Children")).size should be (3) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("an array model") + cm.vars.size should be(0) + cm.parent should be("ArrayList") + cm.imports.size should be(3) + (cm.imports.asScala.toSet & Set("List", "ArrayList", "Children")).size should be(3) } it should "convert an map model" in { @@ -261,13 +258,13 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("an map model") - cm.vars.size should be (0) - cm.parent should be ("HashMap") - cm.imports.size should be (3) - (cm.imports.asScala.toSet & Set("Map", "HashMap", "Children")).size should be (3) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("an map model") + cm.vars.size should be(0) + cm.parent should be("HashMap") + cm.imports.size should be(3) + (cm.imports.asScala.toSet & Set("Map", "HashMap", "Children")).size should be(3) } it should "convert a model with upper-case property names" in { @@ -279,21 +276,21 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("NAME") - vars.get(0).getter should be ("getNAME") - vars.get(0).setter should be ("setNAME") - vars.get(0).datatype should be ("String") - vars.get(0).name should be ("NAME") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("String") - vars.get(0).hasMore should equal (null) - vars.get(0).required should equal (true) - vars.get(0).isNotContainer should equal (true) + vars.get(0).baseName should be("NAME") + vars.get(0).getter should be("getNAME") + vars.get(0).setter should be("setNAME") + vars.get(0).datatype should be("String") + vars.get(0).name should be("NAME") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("String") + vars.get(0).hasMore should equal(null) + vars.get(0).required should equal(true) + vars.get(0).isNotContainer should equal(true) } it should "convert a model with a 2nd char upper-case property names" in { @@ -305,21 +302,21 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("pId") - vars.get(0).getter should be ("getPId") - vars.get(0).setter should be ("setPId") - vars.get(0).datatype should be ("String") - vars.get(0).name should be ("pId") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("String") - vars.get(0).hasMore should equal (null) - vars.get(0).required should equal (true) - vars.get(0).isNotContainer should equal (true) + vars.get(0).baseName should be("pId") + vars.get(0).getter should be("getPId") + vars.get(0).setter should be("setPId") + vars.get(0).datatype should be("String") + vars.get(0).name should be("pId") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("String") + vars.get(0).hasMore should equal(null) + vars.get(0).required should equal(true) + vars.get(0).isNotContainer should equal(true) } it should "convert hyphens per issue 503" in { @@ -331,9 +328,9 @@ class JavaModelTest extends FlatSpec with Matchers { val cm = codegen.fromModel("sample", model) val vars = cm.vars vars.get(0).baseName should be("created-at") - vars.get(0).getter should be ("getCreatedAt") - vars.get(0).setter should be ("setCreatedAt") - vars.get(0).name should be ("createdAt") + vars.get(0).getter should be("getCreatedAt") + vars.get(0).setter should be("setCreatedAt") + vars.get(0).name should be("createdAt") } it should "properly escape names per 567" in { @@ -344,6 +341,6 @@ class JavaModelTest extends FlatSpec with Matchers { val codegen = new JavaClientCodegen() val cm = codegen.fromModel("with.dots", model) val vars = cm.vars - cm.classname should be ("WithDots") + cm.classname should be("WithDots") } } diff --git a/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala b/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala index 4de884885e4..6cfac9a0eff 100644 --- a/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala +++ b/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala @@ -1,16 +1,12 @@ package Objc -import com.wordnik.swagger.codegen.languages.ObjcClientCodegen -import com.wordnik.swagger.util.Json -import com.wordnik.swagger.models._ -import com.wordnik.swagger.models.properties._ - +import io.swagger.codegen.languages.ObjcClientCodegen +import io.swagger.models._ +import io.swagger.models.properties._ import io.swagger.parser.SwaggerParser - import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers import scala.collection.JavaConverters._ @@ -29,40 +25,40 @@ class ObjcModelTest extends FlatSpec with Matchers { val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("a sample model") - cm.vars.size should be (3) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("a sample model") + cm.vars.size should be(3) val vars = cm.vars - vars.get(0).baseName should be ("id") - vars.get(0).datatype should be ("NSNumber*") - vars.get(0).name should be ("_id") - vars.get(0).defaultValue should be (null) - vars.get(0).baseType should be ("NSNumber") - vars.get(0).hasMore should equal (true) - vars.get(0).required should equal (true) - vars.get(0).isPrimitiveType should equal (true) - vars.get(0).isNotContainer should equal (true) - - vars.get(1).baseName should be ("name") - vars.get(1).datatype should be ("NSString*") - vars.get(1).name should be ("name") - vars.get(1).defaultValue should be (null) - vars.get(1).baseType should be ("NSString") - vars.get(1).hasMore should equal (true) - vars.get(1).required should equal (true) - vars.get(0).isPrimitiveType should equal (true) - vars.get(1).isNotContainer should equal (true) - - vars.get(2).baseName should be ("createdAt") - vars.get(2).datatype should be ("NSDate*") - vars.get(2).name should be ("createdAt") - vars.get(2).defaultValue should be (null) - vars.get(2).baseType should be ("NSDate") - vars.get(2).hasMore should equal (null) - vars.get(2).required should equal (null) - vars.get(2).isNotContainer should equal (true) + vars.get(0).baseName should be("id") + vars.get(0).datatype should be("NSNumber*") + vars.get(0).name should be("_id") + vars.get(0).defaultValue should be(null) + vars.get(0).baseType should be("NSNumber") + vars.get(0).hasMore should equal(true) + vars.get(0).required should equal(true) + vars.get(0).isPrimitiveType should equal(true) + vars.get(0).isNotContainer should equal(true) + + vars.get(1).baseName should be("name") + vars.get(1).datatype should be("NSString*") + vars.get(1).name should be("name") + vars.get(1).defaultValue should be(null) + vars.get(1).baseType should be("NSString") + vars.get(1).hasMore should equal(true) + vars.get(1).required should equal(true) + vars.get(0).isPrimitiveType should equal(true) + vars.get(1).isNotContainer should equal(true) + + vars.get(2).baseName should be("createdAt") + vars.get(2).datatype should be("NSDate*") + vars.get(2).name should be("createdAt") + vars.get(2).defaultValue should be(null) + vars.get(2).baseType should be("NSDate") + vars.get(2).hasMore should equal(null) + vars.get(2).required should equal(null) + vars.get(2).isNotContainer should equal(true) } @@ -71,64 +67,64 @@ class ObjcModelTest extends FlatSpec with Matchers { .description("a sample model") .property("id", new LongProperty()) .property("urls", new ArrayProperty() - .items(new StringProperty())) + .items(new StringProperty())) .required("id") val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("a sample model") - cm.vars.size should be (2) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("a sample model") + cm.vars.size should be(2) val vars = cm.vars - vars.get(0).baseName should be ("id") - vars.get(0).datatype should be ("NSNumber*") - vars.get(0).name should be ("_id") - vars.get(0).defaultValue should be (null) - vars.get(0).baseType should be ("NSNumber") - vars.get(0).hasMore should equal (true) - vars.get(0).required should equal (true) - vars.get(0).isPrimitiveType should equal (true) - vars.get(0).isNotContainer should equal (true) - - vars.get(1).baseName should be ("urls") - vars.get(1).datatype should be ("NSArray*") - vars.get(1).name should be ("urls") + vars.get(0).baseName should be("id") + vars.get(0).datatype should be("NSNumber*") + vars.get(0).name should be("_id") + vars.get(0).defaultValue should be(null) + vars.get(0).baseType should be("NSNumber") + vars.get(0).hasMore should equal(true) + vars.get(0).required should equal(true) + vars.get(0).isPrimitiveType should equal(true) + vars.get(0).isNotContainer should equal(true) + + vars.get(1).baseName should be("urls") + vars.get(1).datatype should be("NSArray*") + vars.get(1).name should be("urls") // vars.get(1).defaultValue should be ("null") - vars.get(1).baseType should be ("NSArray") - vars.get(1).hasMore should be (null) - vars.get(1).containerType should equal ("array") - vars.get(1).required should equal (null) - vars.get(1).isPrimitiveType should equal (true) - vars.get(1).isContainer should equal (true) + vars.get(1).baseType should be("NSArray") + vars.get(1).hasMore should be(null) + vars.get(1).containerType should equal("array") + vars.get(1).required should equal(null) + vars.get(1).isPrimitiveType should equal(true) + vars.get(1).isContainer should equal(true) } it should "convert a model with a map property" in { val model = new ModelImpl() .description("a sample model") .property("translations", new MapProperty() - .additionalProperties(new StringProperty())) + .additionalProperties(new StringProperty())) .required("id") val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("translations") - vars.get(0).datatype should be ("NSDictionary*") - vars.get(0).name should be ("translations") - vars.get(0).baseType should be ("NSDictionary") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) - vars.get(0).isPrimitiveType should equal (true) + vars.get(0).baseName should be("translations") + vars.get(0).datatype should be("NSDictionary*") + vars.get(0).name should be("translations") + vars.get(0).baseType should be("NSDictionary") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) + vars.get(0).isPrimitiveType should equal(true) } it should "convert a model with complex property" in { @@ -139,70 +135,70 @@ class ObjcModelTest extends FlatSpec with Matchers { val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).datatype should be ("SWGChildren*") - vars.get(0).name should be ("children") - vars.get(0).baseType should be ("SWGChildren") - vars.get(0).required should equal (null) - vars.get(0).isNotContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).datatype should be("SWGChildren*") + vars.get(0).name should be("children") + vars.get(0).baseType should be("SWGChildren") + vars.get(0).required should equal(null) + vars.get(0).isNotContainer should equal(true) } it should "convert a model with complex list property" in { val model = new ModelImpl() .description("a sample model") .property("children", new ArrayProperty() - .items(new RefProperty("#/definitions/Children"))) + .items(new RefProperty("#/definitions/Children"))) val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("SWGChildren") - vars.get(0).datatype should be ("NSArray*") - vars.get(0).name should be ("children") - vars.get(0).baseType should be ("NSArray") - vars.get(0).containerType should be ("array") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("SWGChildren") + vars.get(0).datatype should be("NSArray*") + vars.get(0).name should be("children") + vars.get(0).baseType should be("NSArray") + vars.get(0).containerType should be("array") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } it should "convert a model with complex map property" in { val model = new ModelImpl() .description("a sample model") .property("children", new MapProperty() - .additionalProperties(new RefProperty("#/definitions/Children"))) + .additionalProperties(new RefProperty("#/definitions/Children"))) val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("a sample model") - cm.vars.size should be (1) - (cm.imports.asScala.toSet & Set("SWGChildren")).size should be (1) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("a sample model") + cm.vars.size should be(1) + (cm.imports.asScala.toSet & Set("SWGChildren")).size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("SWGChildren") - vars.get(0).datatype should be ("NSDictionary*") - vars.get(0).name should be ("children") - vars.get(0).baseType should be ("NSDictionary") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) - vars.get(0).isNotContainer should be (null) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("SWGChildren") + vars.get(0).datatype should be("NSDictionary*") + vars.get(0).name should be("children") + vars.get(0).baseType should be("NSDictionary") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) + vars.get(0).isNotContainer should be(null) } it should "convert an array model" in { @@ -212,13 +208,13 @@ class ObjcModelTest extends FlatSpec with Matchers { val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("an array model") - cm.vars.size should be (0) - cm.parent should be ("NSMutableArray") - cm.imports.size should be (1) - (cm.imports.asScala.toSet & Set("SWGChildren")).size should be (1) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("an array model") + cm.vars.size should be(0) + cm.parent should be("NSMutableArray") + cm.imports.size should be(1) + (cm.imports.asScala.toSet & Set("SWGChildren")).size should be(1) } it should "convert an map model" in { @@ -229,13 +225,13 @@ class ObjcModelTest extends FlatSpec with Matchers { val codegen = new ObjcClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("SWGSample") - cm.description should be ("an map model") - cm.vars.size should be (0) - cm.parent should be ("NSMutableDictionary") - cm.imports.size should be (1) - (cm.imports.asScala.toSet & Set("SWGChildren")).size should be (1) + cm.name should be("sample") + cm.classname should be("SWGSample") + cm.description should be("an map model") + cm.vars.size should be(0) + cm.parent should be("NSMutableDictionary") + cm.imports.size should be(1) + (cm.imports.asScala.toSet & Set("SWGChildren")).size should be(1) } it should "create proper imports per #316" in { @@ -246,14 +242,14 @@ class ObjcModelTest extends FlatSpec with Matchers { val animalOps = animalPaths.get("/animals") animalOps.getPost() should not be (null) val animalCo = codegen.fromOperation("/animals", "POST", animalOps.getPost(), model.getDefinitions()) - animalCo.imports.size should be (1) - animalCo.imports.contains("SWGAnimal") should equal (true) + animalCo.imports.size should be(1) + animalCo.imports.contains("SWGAnimal") should equal(true) val insectPaths = model.getPaths() val insectOps = insectPaths.get("/insects") insectOps.getPost() should not be (null) val insectCo = codegen.fromOperation("/insects", "POST", insectOps.getPost(), model.getDefinitions()) - insectCo.imports.size should be (1) - insectCo.imports.contains("SWGInsect") should equal (true) + insectCo.imports.size should be(1) + insectCo.imports.contains("SWGInsect") should equal(true) } } diff --git a/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala b/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala index b05059a218a..21b62b29d78 100644 --- a/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala +++ b/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala @@ -1,14 +1,7 @@ -import com.wordnik.swagger.models._ import io.swagger.parser._ - -import com.wordnik.swagger.util.Json - import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers - -import scala.collection.JavaConverters._ @RunWith(classOf[JUnitRunner]) class SwaggerMigratorTest extends FlatSpec with Matchers { @@ -17,6 +10,5 @@ class SwaggerMigratorTest extends FlatSpec with Matchers { it should "read a 1.2 spec" in { val loader = new SwaggerParser() val swagger = loader.read("src/test/resources/1_2/petstore-1.2/api-docs") - Json.prettyPrint(swagger) } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala b/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala index 1e4926d43d7..ade8a09e80d 100644 --- a/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala +++ b/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala @@ -1,16 +1,11 @@ package php -import com.wordnik.swagger.codegen.languages.PhpClientCodegen -import com.wordnik.swagger.util.Json -import com.wordnik.swagger.models._ -import com.wordnik.swagger.models.properties._ - -import io.swagger.parser.SwaggerParser - +import io.swagger.codegen.languages.PhpClientCodegen +import io.swagger.models._ +import io.swagger.models.properties._ import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers import scala.collection.JavaConverters._ @@ -29,43 +24,43 @@ class PhpModelTest extends FlatSpec with Matchers { val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (3) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(3) val vars = cm.vars - vars.get(0).baseName should be ("id") - vars.get(0).datatype should be ("int") - vars.get(0).name should be ("id") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("int") - vars.get(0).hasMore should equal (true) - vars.get(0).required should equal (true) - vars.get(0).isPrimitiveType should equal (true) - vars.get(0).isNotContainer should equal (true) - - vars.get(1).baseName should be ("name") - vars.get(1).datatype should be ("string") - vars.get(1).name should be ("name") - vars.get(1).defaultValue should be ("null") - vars.get(1).baseType should be ("string") - vars.get(1).hasMore should equal (true) - vars.get(1).required should equal (true) - vars.get(0).isPrimitiveType should equal (true) - vars.get(1).isNotContainer should equal (true) - - vars.get(2).baseName should be ("createdAt") - vars.get(2).complexType should be (null) - vars.get(2).datatype should be ("DateTime") - vars.get(2).name should be ("created_at") - vars.get(2).defaultValue should be ("null") - vars.get(2).baseType should be ("DateTime") - vars.get(2).hasMore should equal (null) - vars.get(2).required should equal (null) - vars.get(2).isNotContainer should equal (true) - - cm.imports.size() should be (0) + vars.get(0).baseName should be("id") + vars.get(0).datatype should be("int") + vars.get(0).name should be("id") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("int") + vars.get(0).hasMore should equal(true) + vars.get(0).required should equal(true) + vars.get(0).isPrimitiveType should equal(true) + vars.get(0).isNotContainer should equal(true) + + vars.get(1).baseName should be("name") + vars.get(1).datatype should be("string") + vars.get(1).name should be("name") + vars.get(1).defaultValue should be("null") + vars.get(1).baseType should be("string") + vars.get(1).hasMore should equal(true) + vars.get(1).required should equal(true) + vars.get(0).isPrimitiveType should equal(true) + vars.get(1).isNotContainer should equal(true) + + vars.get(2).baseName should be("createdAt") + vars.get(2).complexType should be(null) + vars.get(2).datatype should be("DateTime") + vars.get(2).name should be("created_at") + vars.get(2).defaultValue should be("null") + vars.get(2).baseType should be("DateTime") + vars.get(2).hasMore should equal(null) + vars.get(2).required should equal(null) + vars.get(2).isNotContainer should equal(true) + + cm.imports.size() should be(0) } it should "convert a model with list property" in { @@ -73,63 +68,63 @@ class PhpModelTest extends FlatSpec with Matchers { .description("a sample model") .property("id", new LongProperty()) .property("urls", new ArrayProperty() - .items(new StringProperty())) + .items(new StringProperty())) .required("id") val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (2) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(2) val vars = cm.vars - vars.get(0).baseName should be ("id") - vars.get(0).datatype should be ("int") - vars.get(0).name should be ("id") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("int") - vars.get(0).hasMore should equal (true) - vars.get(0).required should equal (true) - vars.get(0).isPrimitiveType should equal (true) - vars.get(0).isNotContainer should equal (true) - - vars.get(1).baseName should be ("urls") - vars.get(1).datatype should be ("array[string]") - vars.get(1).name should be ("urls") - vars.get(1).baseType should be ("array") - vars.get(1).hasMore should be (null) - vars.get(1).containerType should equal ("array") - vars.get(1).required should equal (null) - vars.get(1).isPrimitiveType should equal (true) - vars.get(1).isContainer should equal (true) + vars.get(0).baseName should be("id") + vars.get(0).datatype should be("int") + vars.get(0).name should be("id") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("int") + vars.get(0).hasMore should equal(true) + vars.get(0).required should equal(true) + vars.get(0).isPrimitiveType should equal(true) + vars.get(0).isNotContainer should equal(true) + + vars.get(1).baseName should be("urls") + vars.get(1).datatype should be("array[string]") + vars.get(1).name should be("urls") + vars.get(1).baseType should be("array") + vars.get(1).hasMore should be(null) + vars.get(1).containerType should equal("array") + vars.get(1).required should equal(null) + vars.get(1).isPrimitiveType should equal(true) + vars.get(1).isContainer should equal(true) } it should "convert a model with a map property" in { val model = new ModelImpl() .description("a sample model") .property("translations", new MapProperty() - .additionalProperties(new StringProperty())) + .additionalProperties(new StringProperty())) .required("id") val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("translations") - vars.get(0).datatype should be ("map[string,string]") - vars.get(0).name should be ("translations") - vars.get(0).baseType should be ("map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) - vars.get(0).isPrimitiveType should equal (true) + vars.get(0).baseName should be("translations") + vars.get(0).datatype should be("map[string,string]") + vars.get(0).name should be("translations") + vars.get(0).baseType should be("map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) + vars.get(0).isPrimitiveType should equal(true) } it should "convert a model with complex property" in { @@ -140,70 +135,70 @@ class PhpModelTest extends FlatSpec with Matchers { val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).datatype should be ("Children") - vars.get(0).name should be ("children") - vars.get(0).baseType should be ("Children") - vars.get(0).required should equal (null) - vars.get(0).isNotContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).datatype should be("Children") + vars.get(0).name should be("children") + vars.get(0).baseType should be("Children") + vars.get(0).required should equal(null) + vars.get(0).isNotContainer should equal(true) } it should "convert a model with complex list property" in { val model = new ModelImpl() .description("a sample model") .property("children", new ArrayProperty() - .items(new RefProperty("#/definitions/Children"))) + .items(new RefProperty("#/definitions/Children"))) val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("Children") - vars.get(0).datatype should be ("array[Children]") - vars.get(0).name should be ("children") - vars.get(0).baseType should be ("array") - vars.get(0).containerType should be ("array") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("Children") + vars.get(0).datatype should be("array[Children]") + vars.get(0).name should be("children") + vars.get(0).baseType should be("array") + vars.get(0).containerType should be("array") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } it should "convert a model with complex map property" in { val model = new ModelImpl() .description("a sample model") .property("children", new MapProperty() - .additionalProperties(new RefProperty("#/definitions/Children"))) + .additionalProperties(new RefProperty("#/definitions/Children"))) val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) - (cm.imports.asScala.toSet & Set("Children")).size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) + (cm.imports.asScala.toSet & Set("Children")).size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("Children") - vars.get(0).datatype should be ("map[string,Children]") - vars.get(0).name should be ("children") - vars.get(0).baseType should be ("map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) - vars.get(0).isNotContainer should be (null) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("Children") + vars.get(0).datatype should be("map[string,Children]") + vars.get(0).name should be("children") + vars.get(0).baseType should be("map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) + vars.get(0).isNotContainer should be(null) } it should "convert an array model" in { @@ -213,10 +208,10 @@ class PhpModelTest extends FlatSpec with Matchers { val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("an array model") - cm.vars.size should be (0) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("an array model") + cm.vars.size should be(0) // skip import test as import is not used by PHP codegen //cm.imports.size should be (1) //(cm.imports.asScala.toSet & Set("Children")).size should be (1) @@ -230,12 +225,12 @@ class PhpModelTest extends FlatSpec with Matchers { val codegen = new PhpClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("an map model") - cm.vars.size should be (0) - cm.imports.size should be (2) - (cm.imports.asScala.toSet & Set("Children")).size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("an map model") + cm.vars.size should be(0) + cm.imports.size should be(2) + (cm.imports.asScala.toSet & Set("Children")).size should be(1) } // skip import test as import is not used by PHP codegen diff --git a/modules/swagger-codegen/src/test/scala/python/PythonTest.scala b/modules/swagger-codegen/src/test/scala/python/PythonTest.scala index ec42985586c..9f9570a3e79 100644 --- a/modules/swagger-codegen/src/test/scala/python/PythonTest.scala +++ b/modules/swagger-codegen/src/test/scala/python/PythonTest.scala @@ -1,12 +1,10 @@ package python -import com.wordnik.swagger.codegen.languages.{PythonClientCodegen} +import io.swagger.codegen.languages.PythonClientCodegen import io.swagger.parser.SwaggerParser import org.junit.runner.RunWith - +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers @RunWith(classOf[JUnitRunner]) class PythonTest extends FlatSpec with Matchers { diff --git a/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala b/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala index 39d76ca168c..cf99149c49c 100644 --- a/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala +++ b/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala @@ -1,14 +1,11 @@ -package scala - -import com.wordnik.swagger.codegen.languages.ScalaClientCodegen -import com.wordnik.swagger.util.Json -import com.wordnik.swagger.models._ -import com.wordnik.swagger.models.properties._ +package Scala +import io.swagger.codegen.languages.ScalaClientCodegen +import io.swagger.models._ +import io.swagger.models.properties._ import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers import scala.collection.JavaConverters._ @@ -27,44 +24,44 @@ class ScalaModelTest extends FlatSpec with Matchers { val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (3) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(3) val vars = cm.vars - vars.get(0).baseName should be ("id") - vars.get(0).getter should be ("getId") - vars.get(0).setter should be ("setId") - vars.get(0).datatype should be ("Long") - vars.get(0).name should be ("id") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("Long") - vars.get(0).hasMore should equal (true) - vars.get(0).required should equal (true) - vars.get(0).isNotContainer should equal (true) - - vars.get(1).baseName should be ("name") - vars.get(1).getter should be ("getName") - vars.get(1).setter should be ("setName") - vars.get(1).datatype should be ("String") - vars.get(1).name should be ("name") - vars.get(1).defaultValue should be ("null") - vars.get(1).baseType should be ("String") - vars.get(1).hasMore should equal (true) - vars.get(1).required should equal (true) - vars.get(1).isNotContainer should equal (true) - - vars.get(2).baseName should be ("createdAt") - vars.get(2).getter should be ("getCreatedAt") - vars.get(2).setter should be ("setCreatedAt") - vars.get(2).datatype should be ("DateTime") - vars.get(2).name should be ("createdAt") - vars.get(2).defaultValue should be ("null") - vars.get(2).baseType should be ("DateTime") - vars.get(2).hasMore should equal (null) - vars.get(2).required should equal (null) - vars.get(2).isNotContainer should equal (true) + vars.get(0).baseName should be("id") + vars.get(0).getter should be("getId") + vars.get(0).setter should be("setId") + vars.get(0).datatype should be("Long") + vars.get(0).name should be("id") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("Long") + vars.get(0).hasMore should equal(true) + vars.get(0).required should equal(true) + vars.get(0).isNotContainer should equal(true) + + vars.get(1).baseName should be("name") + vars.get(1).getter should be("getName") + vars.get(1).setter should be("setName") + vars.get(1).datatype should be("String") + vars.get(1).name should be("name") + vars.get(1).defaultValue should be("null") + vars.get(1).baseType should be("String") + vars.get(1).hasMore should equal(true) + vars.get(1).required should equal(true) + vars.get(1).isNotContainer should equal(true) + + vars.get(2).baseName should be("createdAt") + vars.get(2).getter should be("getCreatedAt") + vars.get(2).setter should be("setCreatedAt") + vars.get(2).datatype should be("DateTime") + vars.get(2).name should be("createdAt") + vars.get(2).defaultValue should be("null") + vars.get(2).baseType should be("DateTime") + vars.get(2).hasMore should equal(null) + vars.get(2).required should equal(null) + vars.get(2).isNotContainer should equal(true) } it should "convert a model with list property" in { @@ -72,55 +69,55 @@ class ScalaModelTest extends FlatSpec with Matchers { .description("a sample model") .property("id", new LongProperty()) .property("urls", new ArrayProperty() - .items(new StringProperty())) + .items(new StringProperty())) .required("id") val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (2) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(2) val vars = cm.vars - vars.get(1).baseName should be ("urls") - vars.get(1).getter should be ("getUrls") - vars.get(1).setter should be ("setUrls") - vars.get(1).datatype should be ("List[String]") - vars.get(1).name should be ("urls") - vars.get(1).defaultValue should be ("new ListBuffer[String]() ") - vars.get(1).baseType should be ("List") - vars.get(1).containerType should be ("array") - vars.get(1).required should equal (null) - vars.get(1).isContainer should equal (true) + vars.get(1).baseName should be("urls") + vars.get(1).getter should be("getUrls") + vars.get(1).setter should be("setUrls") + vars.get(1).datatype should be("List[String]") + vars.get(1).name should be("urls") + vars.get(1).defaultValue should be("new ListBuffer[String]() ") + vars.get(1).baseType should be("List") + vars.get(1).containerType should be("array") + vars.get(1).required should equal(null) + vars.get(1).isContainer should equal(true) } it should "convert a model with a map property" in { val model = new ModelImpl() .description("a sample model") .property("translations", new MapProperty() - .additionalProperties(new StringProperty())) + .additionalProperties(new StringProperty())) .required("id") val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("translations") - vars.get(0).getter should be ("getTranslations") - vars.get(0).setter should be ("setTranslations") - vars.get(0).datatype should be ("Map[String, String]") - vars.get(0).name should be ("translations") - vars.get(0).defaultValue should be ("new HashMap[String, String]() ") - vars.get(0).baseType should be ("Map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("translations") + vars.get(0).getter should be("getTranslations") + vars.get(0).setter should be("setTranslations") + vars.get(0).datatype should be("Map[String, String]") + vars.get(0).name should be("translations") + vars.get(0).defaultValue should be("new HashMap[String, String]() ") + vars.get(0).baseType should be("Map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } it should "convert a model with complex properties" in { @@ -131,79 +128,79 @@ class ScalaModelTest extends FlatSpec with Matchers { val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).getter should be ("getChildren") - vars.get(0).setter should be ("setChildren") - vars.get(0).datatype should be ("Children") - vars.get(0).name should be ("children") - vars.get(0).defaultValue should be ("null") - vars.get(0).baseType should be ("Children") - vars.get(0).required should equal (null) - vars.get(0).isNotContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).getter should be("getChildren") + vars.get(0).setter should be("setChildren") + vars.get(0).datatype should be("Children") + vars.get(0).name should be("children") + vars.get(0).defaultValue should be("null") + vars.get(0).baseType should be("Children") + vars.get(0).required should equal(null) + vars.get(0).isNotContainer should equal(true) } it should "convert a model with complex list property" in { val model = new ModelImpl() .description("a sample model") .property("children", new ArrayProperty() - .items(new RefProperty("#/definitions/Children"))) + .items(new RefProperty("#/definitions/Children"))) val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("Children") - vars.get(0).getter should be ("getChildren") - vars.get(0).setter should be ("setChildren") - vars.get(0).datatype should be ("List[Children]") - vars.get(0).name should be ("children") - vars.get(0).defaultValue should be ("new ListBuffer[Children]() ") - vars.get(0).baseType should be ("List") - vars.get(0).containerType should be ("array") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("Children") + vars.get(0).getter should be("getChildren") + vars.get(0).setter should be("setChildren") + vars.get(0).datatype should be("List[Children]") + vars.get(0).name should be("children") + vars.get(0).defaultValue should be("new ListBuffer[Children]() ") + vars.get(0).baseType should be("List") + vars.get(0).containerType should be("array") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) } it should "convert a model with complex map property" in { val model = new ModelImpl() .description("a sample model") .property("children", new MapProperty() - .additionalProperties(new RefProperty("#/definitions/Children"))) + .additionalProperties(new RefProperty("#/definitions/Children"))) val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("a sample model") - cm.vars.size should be (1) - (cm.imports.asScala.toSet & Set("Children")).size should be (1) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("a sample model") + cm.vars.size should be(1) + (cm.imports.asScala.toSet & Set("Children")).size should be(1) val vars = cm.vars - vars.get(0).baseName should be ("children") - vars.get(0).complexType should be ("Children") - vars.get(0).getter should be ("getChildren") - vars.get(0).setter should be ("setChildren") - vars.get(0).datatype should be ("Map[String, Children]") - vars.get(0).name should be ("children") - vars.get(0).defaultValue should be ("new HashMap[String, Children]() ") - vars.get(0).baseType should be ("Map") - vars.get(0).containerType should be ("map") - vars.get(0).required should equal (null) - vars.get(0).isContainer should equal (true) - vars.get(0).isNotContainer should be (null) + vars.get(0).baseName should be("children") + vars.get(0).complexType should be("Children") + vars.get(0).getter should be("getChildren") + vars.get(0).setter should be("setChildren") + vars.get(0).datatype should be("Map[String, Children]") + vars.get(0).name should be("children") + vars.get(0).defaultValue should be("new HashMap[String, Children]() ") + vars.get(0).baseType should be("Map") + vars.get(0).containerType should be("map") + vars.get(0).required should equal(null) + vars.get(0).isContainer should equal(true) + vars.get(0).isNotContainer should be(null) } it should "convert an array model" in { @@ -213,13 +210,13 @@ class ScalaModelTest extends FlatSpec with Matchers { val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("an array model") - cm.vars.size should be (0) - cm.parent should be ("ListBuffer[Children]") - cm.imports.size should be (2) - (cm.imports.asScala.toSet & Set("ListBuffer", "Children")).size should be (2) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("an array model") + cm.vars.size should be(0) + cm.parent should be("ListBuffer[Children]") + cm.imports.size should be(2) + (cm.imports.asScala.toSet & Set("ListBuffer", "Children")).size should be(2) } it should "convert an map model" in { @@ -230,12 +227,12 @@ class ScalaModelTest extends FlatSpec with Matchers { val codegen = new ScalaClientCodegen() val cm = codegen.fromModel("sample", model) - cm.name should be ("sample") - cm.classname should be ("Sample") - cm.description should be ("an map model") - cm.vars.size should be (0) - cm.parent should be ("HashMap[String, Children]") - cm.imports.size should be (2) - (cm.imports.asScala.toSet & Set("HashMap", "Children")).size should be (2) + cm.name should be("sample") + cm.classname should be("Sample") + cm.description should be("an map model") + cm.vars.size should be(0) + cm.parent should be("HashMap[String, Children]") + cm.imports.size should be(2) + (cm.imports.asScala.toSet & Set("HashMap", "Children")).size should be(2) } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/test/scala/staticDocs/StaticOperationTest.scala b/modules/swagger-codegen/src/test/scala/staticDocs/StaticOperationTest.scala index f46201faa5b..f755361a3d4 100644 --- a/modules/swagger-codegen/src/test/scala/staticDocs/StaticOperationTest.scala +++ b/modules/swagger-codegen/src/test/scala/staticDocs/StaticOperationTest.scala @@ -1,16 +1,10 @@ package staticDocs -import com.wordnik.swagger.codegen.languages.StaticDocCodegen -import com.wordnik.swagger.util.Json -import com.wordnik.swagger.models._ -import com.wordnik.swagger.models.properties._ - +import io.swagger.codegen.languages.StaticDocCodegen +import io.swagger.models.properties._ import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers - -import scala.collection.JavaConverters._ @RunWith(classOf[JUnitRunner]) class StaticOperationTest extends FlatSpec with Matchers { @@ -20,11 +14,11 @@ class StaticOperationTest extends FlatSpec with Matchers { val codegen = new StaticDocCodegen() val cp = codegen.fromProperty("property", property) - cp.baseName should be ("property") - cp.datatype should be ("String") - cp.name should be ("property") - cp.baseType should be ("string") - cp.isNotContainer should equal (true) + cp.baseName should be("property") + cp.datatype should be("String") + cp.name should be("property") + cp.baseType should be("string") + cp.isNotContainer should equal(true) } it should "convert a complex parameter" in { @@ -33,15 +27,15 @@ class StaticOperationTest extends FlatSpec with Matchers { val codegen = new StaticDocCodegen() val cp = codegen.fromProperty("property", property) - cp.baseName should be ("property") - cp.complexType should be ("Children") - cp.getter should be ("getProperty") - cp.setter should be ("setProperty") - cp.datatype should be ("Children") - cp.name should be ("property") - cp.defaultValue should be ("null") - cp.baseType should be ("Children") - cp.isNotContainer should equal (true) + cp.baseName should be("property") + cp.complexType should be("Children") + cp.getter should be("getProperty") + cp.setter should be("setProperty") + cp.datatype should be("Children") + cp.name should be("property") + cp.defaultValue should be("null") + cp.baseType should be("Children") + cp.isNotContainer should equal(true) } it should "convert a complex list parameter" in { @@ -51,15 +45,15 @@ class StaticOperationTest extends FlatSpec with Matchers { val codegen = new StaticDocCodegen() val cp = codegen.fromProperty("property", property) - cp.baseName should be ("property") - cp.complexType should be ("Children") - cp.getter should be ("getProperty") - cp.setter should be ("setProperty") - cp.datatype should be ("List") - cp.name should be ("property") - cp.baseType should be ("array") - cp.containerType should be ("array") - cp.isContainer should equal (true) + cp.baseName should be("property") + cp.complexType should be("Children") + cp.getter should be("getProperty") + cp.setter should be("setProperty") + cp.datatype should be("List") + cp.name should be("property") + cp.baseType should be("array") + cp.containerType should be("array") + cp.isContainer should equal(true) } } \ No newline at end of file diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index e5b7b2c341f..121c489d551 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -1,238 +1,277 @@ - - 4.0.0 - - com.wordnik - swagger-codegen-project - 2.1.1-M2-SNAPSHOT - ../.. - - swagger-generator - war - swagger-generator - - src/main/java - - - src/main/resources - - logback.xml - - - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - net.alchim31.maven - scala-maven-plugin - - - scala-test-compile - process-test-resources - - testCompile - - - - - - incremental - - - -Xmx384m - - - -target:jvm-1.6 - -deprecation - - - - run-scalatest - org.scalatest.tools.Runner - - -p - ${project.build.testOutputDirectory} - - - -Xmx512m - - - - - - - org.apache.maven.plugins - maven-war-plugin + + 4.0.0 + + io.swagger + swagger-codegen-project 2.1.1 - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty-version} - - - / - - target/${project.artifactId}-${project.version} - 8079 - stopit - - 8001 - 60000 - - - - - start-jetty - pre-integration-test - - start - - - 0 - true - - - - stop-jetty - post-integration-test - - stop - - - - - - - - - com.wordnik - swagger-jersey2-jaxrs - ${swagger-core-version} - - - com.wordnik - swagger-codegen - ${project.parent.version} - - - ch.qos.logback - logback-classic - ${logback-version} - - - ch.qos.logback - logback-core - ${logback-version} - - - org.scalatest - scalatest_2.10 - ${scala-test-version} - test - - - junit - junit - ${junit-version} - test - - - javax.servlet - servlet-api - ${servlet-api-version} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey2-version} - - - org.glassfish.jersey.media - jersey-media-multipart - ${jersey2-version} - - - net.lingala.zip4j - zip4j - ${zip-version} - - - org.eclipse.jetty - jetty-server - ${jetty-version} - - - org.eclipse.jetty - jetty-start - ${jetty-version} - - - org.eclipse.jetty - jetty-xml - ${jetty-version} - - - org.eclipse.jetty - jetty-webapp - ${jetty-version} - - - org.eclipse.jetty - jetty-deploy - ${jetty-version} - + ../.. + + swagger-generator + war + swagger-generator + + src/main/java + + + src/main/resources + + logback.xml + + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + net.alchim31.maven + scala-maven-plugin + + + scala-test-compile + process-test-resources + + testCompile + + + + + + incremental + + + -Xmx384m + + + -target:jvm-1.6 + -deprecation + + + + run-scalatest + org.scalatest.tools.Runner + + -p + ${project.build.testOutputDirectory} + + + -Xmx512m + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-version} + + + / + + target/${project.artifactId}-${project.version} + 8079 + stopit + + 8001 + 60000 + + + + + start-jetty + pre-integration-test + + start + + + 0 + true + + + + stop-jetty + post-integration-test + + stop + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.2.1 + + + swagger-ui + + wget + + + https://github.com/swagger-api/swagger-ui/archive/master.tar.gz + true + ${project.build.directory} + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + target/${project.artifactId}-${project.version} + + + ${project.build.directory}/swagger-ui-master/dist + true + + index.html + + + + + + + + + + + + io.swagger + swagger-jersey2-jaxrs + ${swagger-core-version} + + + io.swagger + swagger-codegen + ${project.parent.version} + + + ch.qos.logback + logback-classic + ${logback-version} + + + ch.qos.logback + logback-core + ${logback-version} + - - org.scalatest - scalatest_2.11 - ${scala-test-version} - test - - - org.scala-lang - scala-library - ${scala-version} - test - - - org.scala-lang - scala-compiler - ${scala-version} - test - - - - 2.5 - 1.0.1 - 1.0.0 - 2.5 - 1.3.2 - 9.2.9.v20150224 - 2.4.1 - + + javax.servlet + servlet-api + ${servlet-api-version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey2-version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey2-version} + + + net.lingala.zip4j + zip4j + ${zip-version} + + + org.eclipse.jetty + jetty-server + ${jetty-version} + + + org.eclipse.jetty + jetty-start + ${jetty-version} + + + org.eclipse.jetty + jetty-xml + ${jetty-version} + + + org.eclipse.jetty + jetty-webapp + ${jetty-version} + + + org.eclipse.jetty + jetty-deploy + ${jetty-version} + + + + org.scalatest + scalatest_2.11 + ${scala-test-version} + test + + + junit + junit + ${junit-version} + test + + + org.scala-lang + scala-library + ${scala-version} + test + + + org.scala-lang + scala-compiler + ${scala-version} + test + + + + 2.5 + 1.0.1 + 1.0.0 + 2.5 + 1.3.2 + 9.2.9.v20150224 + 2.4.1 + diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/Bootstrap.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/Bootstrap.java deleted file mode 100644 index 7035b60d1f7..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/Bootstrap.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator; - -import com.wordnik.swagger.models.*; - -import javax.servlet.http.HttpServlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; - -public class Bootstrap extends HttpServlet { - public void init(ServletConfig config) throws ServletException { - ServletContext context = config.getServletContext(); - - DynamicSwaggerConfig bc = new DynamicSwaggerConfig(); - bc.setBasePath("/api"); - bc.setTitle("Swagger Generator"); - bc.setDescription("This is an online swagger codegen server. You can find out more " + - "at https://github.com/swagger-api/swagger-codegen or on irc.freenode.net, #swagger." + - "http://helloreverb.com/terms/"); - bc.setTermsOfServiceUrl("http://helloreverb.com/terms/"); - bc.setContact("apiteam@swagger.io"); - bc.setLicense("Apache 2.0"); - bc.setVersion("1.0.0"); - bc.setHost("generator.swagger.io"); - bc.setLicenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html"); - bc.setResourcePackage("com.wordnik.swagger.generator.resource"); - bc.setScan(true); - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/DynamicSwaggerConfig.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/DynamicSwaggerConfig.java deleted file mode 100644 index 60983c230ac..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/DynamicSwaggerConfig.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.wordnik.swagger.generator; - -import com.wordnik.swagger.models.*; -import com.wordnik.swagger.models.parameters.*; -import com.wordnik.swagger.models.properties.*; -import com.wordnik.swagger.codegen.*; - -import com.wordnik.swagger.util.Json; - -import com.wordnik.swagger.jaxrs.config.BeanConfig; - -import java.util.*; - -public class DynamicSwaggerConfig extends BeanConfig { - static List clients = new ArrayList(); - static List servers = new ArrayList(); - static { - List extensions = Codegen.getExtensions(); - for(CodegenConfig config : extensions) { - if(config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { - clients.add(config.getName()); - } - else if(config.getTag().equals(CodegenType.SERVER)) { - servers.add(config.getName()); - } - } - } - - @Override - public Swagger configure(Swagger swagger) { - Path clientPath = swagger.getPaths().get("/gen/clients/{language}"); - // update the path description based on what clients are available via SPI - if(clientPath != null) { - Operation post = clientPath.getPost(); - 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()); - } - } - - 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 clients: " + b.toString()); - } - } - - return swagger.info(getInfo()) - .host(getHost()) - .basePath("/api"); - } -} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/ApiException.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/ApiException.java deleted file mode 100644 index 1383c791aac..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/ApiException.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.exception; - -public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/BadRequestException.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/BadRequestException.java deleted file mode 100644 index c0883b30eda..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/BadRequestException.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.exception; - -public class BadRequestException extends ApiException { - private int code; - public BadRequestException (int code, String msg) { - super(code, msg); - this.code = code; - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/NotFoundException.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/NotFoundException.java deleted file mode 100644 index e9a302b2f1e..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/exception/NotFoundException.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.exception; - -public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ApiResponse.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ApiResponse.java deleted file mode 100644 index 1dfc431b073..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ApiResponse.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.model; - -import javax.xml.bind.annotation.XmlTransient; - -@javax.xml.bind.annotation.XmlRootElement -public class ApiResponse { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; - - int code; - String type; - String message; - - public ApiResponse(){} - - public ApiResponse(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } - - @XmlTransient - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/Generated.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/Generated.java deleted file mode 100644 index 6436498ac3f..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/Generated.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.model; - -public class Generated { - private String filename; - private String friendlyName; - - public String getFilename() { - return filename; - } - public void setFilename(String filename) { - this.filename = filename; - } - - public String getFriendlyName() { - return friendlyName; - } - public void setFriendlyName(String friendlyName) { - this.friendlyName = friendlyName; - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/GeneratorInput.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/GeneratorInput.java deleted file mode 100644 index 9c5a2aa15ce..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/GeneratorInput.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.wordnik.swagger.generator.model; - -import com.wordnik.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.models.auth.SecuritySchemeDefinition; - -import com.fasterxml.jackson.databind.*; - -import java.util.*; - -public class GeneratorInput { - private JsonNode spec; - private Map options; - private String swaggerUrl; - private SecuritySchemeDefinition auth; - - @ApiModelProperty(dataType="Object") - public JsonNode getSpec() { - return spec; - } - public void setSpec(JsonNode spec) { - this.spec = spec; - } - - public Map getOptions() { - return options; - } - public void setOptions(Map options) { - this.options = options; - } - - public String getSwaggerUrl() { - return swaggerUrl; - } - public void setSwaggerUrl(String url) { - this.swaggerUrl = url; - } - - public SecuritySchemeDefinition getSecurityDefinition() { - return auth; - } - public void setSecurityDefinition(SecuritySchemeDefinition auth) { - this.auth = auth; - } -} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/InputOption.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/InputOption.java deleted file mode 100644 index deee8e23c69..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/InputOption.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.model; - -public class InputOption { - private String name; - private String description; - private Boolean required; - private String defaultValue; - - public InputOption() {} - - public InputOption(String name, String description, String defaultValue, Boolean required) { - this.name = name; - this.description = description; - this.defaultValue = defaultValue; - this.required = required; - } - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public void setRequired(Boolean required) { - this.required = required; - } - - public Boolean getRequired() { - return required; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public String getDefaultValue() { - return defaultValue; - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java deleted file mode 100644 index 77271a6c72f..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wordnik.swagger.generator.model; - -public class ResponseCode { - private String code; - private String link; - public ResponseCode() {} - - public ResponseCode(String code, String link) { - setCode(code); - setLink(link); - } - - public String getCode() { - return code; - } - public void setCode(String code) { - this.code = code; - } - - public String getLink() { - return link; - } - public void setLink(String link) { - this.link = link; - } -} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/online/Generator.java deleted file mode 100644 index 7a161b970bc..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/online/Generator.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.wordnik.swagger.generator.online; - -import io.swagger.parser.SwaggerParser; - -import com.wordnik.swagger.generator.exception.*; -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.models.Swagger; -import com.wordnik.swagger.generator.model.*; -import com.wordnik.swagger.util.Json; -import com.wordnik.swagger.generator.util.ZipUtil; - -import com.fasterxml.jackson.databind.JsonNode; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.util.List; -import java.util.ArrayList; - -public class Generator { - static Logger LOGGER = LoggerFactory.getLogger(Generator.class); - - public static String generateClient(String language, GeneratorInput opts) throws ApiException { - Swagger swagger; - LOGGER.debug("generate client for " + language); - if(opts == null) { - throw new BadRequestException(400, "No options were supplied"); - } - JsonNode node = opts.getSpec(); - if(node == null) { - if(opts.getSwaggerUrl() != null) { - swagger = new SwaggerParser().read(opts.getSwaggerUrl()); - } - else - throw new BadRequestException(400, "No swagger specification was supplied"); - } - else { - swagger = new SwaggerParser().read(node); - } - if(swagger == null) { - throw new BadRequestException(400, "The swagger specification supplied was not valid"); - } - - ClientOptInput clientOptInput = new ClientOptInput(); - ClientOpts clientOpts = new ClientOpts(); - String outputFolder = getTmpFolder().getAbsolutePath() + File.separator + language + "-client"; - String outputFilename = outputFolder + "-bundle.zip"; - - clientOptInput - .opts(clientOpts) - .swagger(swagger); - - CodegenConfig codegenConfig = Codegen.getConfig(language); - if(codegenConfig == null) { - throw new BadRequestException(400, "Unsupported target " + language + " supplied"); - } - - codegenConfig.setOutputDir(outputFolder); - - Json.prettyPrint(clientOpts); - - clientOptInput.setConfig(codegenConfig); - - try{ - List files = new Codegen().opts(clientOptInput).generate(); - if(files.size() > 0) { - List filesToAdd = new ArrayList(); - System.out.println("adding to " + outputFolder); - filesToAdd.add(new File(outputFolder)); - ZipUtil zip = new ZipUtil(); - zip.compressFiles(filesToAdd, outputFilename); - } - else { - throw new BadRequestException(400, "A target generation was attempted, but no files were created!"); - } - } - catch (Exception e) { - throw new BadRequestException(500, "Unable to build target: " + e.getMessage()); - } - return outputFilename; - } - - public static String generateServer(String language, GeneratorInput opts) throws ApiException { - LOGGER.debug("generate server for " + language); - Swagger swagger; - if(opts == null) { - throw new BadRequestException(400, "No options were supplied"); - } - if(opts == null) { - throw new BadRequestException(400, "No options were supplied"); - } - JsonNode node = opts.getSpec(); - if(node == null) { - if(opts.getSwaggerUrl() != null) { - swagger = new SwaggerParser().read(opts.getSwaggerUrl()); - } - else - throw new BadRequestException(400, "No swagger specification was supplied"); - } - else { - swagger = new SwaggerParser().read(node); - } - if(swagger == null) { - throw new BadRequestException(400, "The swagger specification supplied was not valid"); - } - - ClientOptInput clientOptInput = new ClientOptInput(); - ClientOpts clientOpts = new ClientOpts(); - String outputFolder = getTmpFolder().getAbsolutePath() + File.separator + language + "-server"; - String outputFilename = outputFolder + "-bundle.zip"; - - clientOptInput - .opts(clientOpts) - .swagger(swagger); - - CodegenConfig codegenConfig = Codegen.getConfig(language); - if(codegenConfig == null) { - throw new BadRequestException(400, "Unsupported target " + language + " supplied"); - } - - codegenConfig.setOutputDir(outputFolder); - - Json.prettyPrint(clientOpts); - - clientOptInput.setConfig(codegenConfig); - - try{ - List files = new Codegen().opts(clientOptInput).generate(); - if(files.size() > 0) { - List filesToAdd = new ArrayList(); - filesToAdd.add(new File(outputFolder)); - ZipUtil zip = new ZipUtil(); - zip.compressFiles(filesToAdd, outputFilename); - } - else { - throw new BadRequestException(400, "A target generation was attempted, but no files were created!"); - } - } - catch (Exception e) { - throw new BadRequestException(500, "Unable to build target: " + e.getMessage()); - } - return outputFilename; - } - - public static InputOption clientOptions(String language) { - return null; - } - - public static InputOption serverOptions(String language) { - return null; - } - - protected static File getTmpFolder() { - try { - File outputFolder = File.createTempFile("codegen-", "-tmp"); - outputFolder.delete(); - outputFolder.mkdir(); - outputFolder.deleteOnExit(); - return outputFolder; - } - catch (Exception e) { - e.printStackTrace(); - return null; - } - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/ExceptionWriter.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/ExceptionWriter.java deleted file mode 100644 index f052c79f311..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/ExceptionWriter.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.wordnik.swagger.generator.resource; - -import com.wordnik.swagger.generator.util.ValidationException; - -import com.wordnik.swagger.generator.exception.ApiException; -import com.wordnik.swagger.generator.exception.BadRequestException; -import com.wordnik.swagger.generator.exception.NotFoundException; -import com.wordnik.swagger.generator.model.ApiResponse; - -import javax.ws.rs.ext.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -@Provider -public class ExceptionWriter implements ExceptionMapper { - public Response toResponse(Exception exception) { - if (exception instanceof javax.ws.rs.WebApplicationException) { - javax.ws.rs.WebApplicationException e = (javax.ws.rs.WebApplicationException) exception; - return Response - .status(e.getResponse().getStatus()) - .entity(new ApiResponse(e.getResponse().getStatus(), - exception.getMessage())).build(); - } else if (exception instanceof com.fasterxml.jackson.core.JsonParseException) { - return Response.status(400) - .entity(new ApiResponse(400, "bad input")).build(); - } else if (exception instanceof ValidationException) { - ValidationException e = (ValidationException) exception; - return Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build(); - } else if (exception instanceof NotFoundException) { - return Response - .status(Status.NOT_FOUND) - .entity(new ApiResponse(ApiResponse.ERROR, exception - .getMessage())).build(); - } else if (exception instanceof BadRequestException) { - return Response - .status(Status.BAD_REQUEST) - .entity(new ApiResponse(ApiResponse.ERROR, exception - .getMessage())).build(); - } else if (exception instanceof ApiException) { - return Response - .status(Status.BAD_REQUEST) - .entity(new ApiResponse(ApiResponse.ERROR, exception - .getMessage())).build(); - } else { - return Response.status(500) - .entity(new ApiResponse(500, "something bad happened")) - .build(); - } - } -} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java deleted file mode 100644 index 4dba39bfb9a..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.wordnik.swagger.generator.resource; - -import com.wordnik.swagger.codegen.*; -import com.wordnik.swagger.generator.util.*; -import com.wordnik.swagger.annotations.*; -import com.wordnik.swagger.generator.model.*; -import com.wordnik.swagger.generator.exception.BadRequestException; -import com.wordnik.swagger.generator.online.Generator; - -import java.io.File; -import java.util.*; - -import javax.ws.rs.*; -import javax.ws.rs.core.*; - -@Path("/gen") -@Api(value = "/gen", description = "Resource for generating swagger components") -public class SwaggerResource { - private static Map fileMap = new HashMap(); - - static List clients = new ArrayList(); - static List servers = new ArrayList(); - static { - List extensions = Codegen.getExtensions(); - for(CodegenConfig config : extensions) { - if(config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { - clients.add(config.getName()); - } - else if(config.getTag().equals(CodegenType.SERVER)) { - servers.add(config.getName()); - } - } - } - - @GET - @Path("/download/{fileId}") - @Produces({MediaType.APPLICATION_OCTET_STREAM}) - @ApiOperation(value = "Downloads a pre-generated file", - response = String.class, - tags = {"clients", "servers"}) - public Response downloadFile(@PathParam("fileId") String fileId) throws Exception { - Generated g = fileMap.get(fileId); - 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())); - - return Response.ok(bytes, "application/zip") - .header("Content-Disposition","attachment; filename=\"" + g.getFriendlyName() + "-generated.zip\"") - .header("Accept-Range", "bytes") - .header("Content-Length", bytes.length) - .build(); - } - else { - return Response.status(404).build(); - } - } - - @POST - @Path("/clients/{language}") - @ApiOperation( - value = "Generates a client library based on the config", - response = ResponseCode.class, - tags = "clients") - public Response generateClient( - @ApiParam(value = "The target language for the client library", allowableValues = "android,java,php,objc,docs", required = true) @PathParam("language") String language, - @ApiParam(value = "Configuration for building the client library", required = true) GeneratorInput opts) throws Exception { - - String filename = Generator.generateClient(language, opts); - - if(filename != null) { - String code = String.valueOf(System.currentTimeMillis()); - Generated g = new Generated(); - g.setFilename(filename); - g.setFriendlyName(language + "-client"); - fileMap.put(code, g); - System.out.println(code + ", " + filename); - String link = "http://generator.swagger.io/api/gen/download/" + code; - return Response.ok().entity(new ResponseCode(code, link)).build(); - } - else { - return Response.status(500).build(); - } - } - - @GET - @Path("/clients") - @ApiOperation(value = "Gets languages supported by the client generator", - response = String.class, - responseContainer = "List", - tags = "clients") - public Response clientOptions() { - String[] languages = new String[clients.size()]; - languages = clients.toArray(languages); - return Response.ok().entity(languages).build(); - } - - @GET - @Path("/servers") - @ApiOperation(value = "Gets languages supported by the server generator", - response = String.class, - responseContainer = "List", - tags = "servers") - public Response serverOptions() { - String[] languages = new String[servers.size()]; - languages = servers.toArray(languages); - return Response.ok().entity(languages).build(); - } - - @POST - @Path("/servers/{framework}") - @ApiOperation(value = "Generates a server library for the supplied server framework", - response = ResponseCode.class, - tags = "servers") - public Response generateServerForLanguage( - @ApiParam(value = "framework", allowableValues = "jaxrs,nodejs", required = true) @PathParam("framework") String framework, - @ApiParam(value = "parameters", required = true) GeneratorInput opts) - throws Exception { - if(framework == null) - throw new BadRequestException(400, "Framework is required"); - String filename = Generator.generateServer(framework, opts); - System.out.println("generated name: " + filename); - - if(filename != null) { - String code = String.valueOf(System.currentTimeMillis()); - Generated g = new Generated(); - g.setFilename(filename); - g.setFriendlyName(framework + "-server"); - fileMap.put(code, g); - System.out.println(code + ", " + filename); - String link = "http://generator.swagger.io/api/gen/download/" + code; - return Response.ok().entity(new ResponseCode(code, link)).build(); - } - else { - return Response.status(500).build(); - } - } -} diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ApiOriginFilter.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ApiOriginFilter.java deleted file mode 100644 index b9d279d20a8..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ApiOriginFilter.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright 2015 Reverb, Inc. - * - * 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 com.wordnik.swagger.generator.util; - -import java.io.IOException; - -import javax.servlet.*; -import javax.servlet.http.HttpServletResponse; - -public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } - - @Override - public void destroy() { - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ValidationException.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ValidationException.java deleted file mode 100644 index 19747367ca0..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ValidationException.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.wordnik.swagger.generator.util; - -import java.util.List; - -public class ValidationException extends Exception { - private int code; - private String msg; - private List errors; - - public ValidationException(String msg) { - super(msg); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - - public String getMessage() { - return msg; - } - public void setMessage(String msg) { - this.msg = msg; - } -} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ValidationMessage.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ValidationMessage.java deleted file mode 100644 index b64633de2bd..00000000000 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ValidationMessage.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wordnik.swagger.generator.util; - -public class ValidationMessage { - private String path, message, severity; - - public String getPath() { - return path; - } - public void setPath(String path) { - this.path = path; - } - - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } - - public String getSeverity() { - return severity; - } - public void setSeverity(String severity) { - this.severity = severity; - } -} \ No newline at end of file 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 new file mode 100644 index 00000000000..f6d924c00ad --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java @@ -0,0 +1,42 @@ +/** + * 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.generator; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +public class Bootstrap extends HttpServlet { + public void init(ServletConfig config) throws ServletException { + ServletContext context = config.getServletContext(); + + DynamicSwaggerConfig bc = new DynamicSwaggerConfig(); + bc.setBasePath("/api"); + bc.setTitle("Swagger Generator"); + bc.setDescription("This is an online swagger codegen server. You can find out more " + + "at https://github.com/swagger-api/swagger-codegen or on [irc.freenode.net, #swagger](http://swagger.io/irc/)."); + bc.setTermsOfServiceUrl("http://swagger.io/terms/"); + bc.setContact("apiteam@swagger.io"); + bc.setLicense("Apache 2.0"); + bc.setVersion("1.0.0"); + bc.setHost("generator.swagger.io"); + 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/java/io/swagger/generator/DynamicSwaggerConfig.java b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java new file mode 100644 index 00000000000..4ffea72995d --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java @@ -0,0 +1,73 @@ +package io.swagger.generator; + +import io.swagger.codegen.Codegen; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.jaxrs.config.BeanConfig; +import io.swagger.models.Operation; +import io.swagger.models.Path; +import io.swagger.models.Swagger; +import io.swagger.models.parameters.Parameter; +import io.swagger.models.parameters.PathParameter; + +import java.util.ArrayList; +import java.util.List; + +public class DynamicSwaggerConfig extends BeanConfig { + static List clients = new ArrayList(); + static List servers = new ArrayList(); + + @Override + public Swagger configure(Swagger swagger) { + Path clientPath = swagger.getPaths().get("/gen/clients/{language}"); + // update the path description based on what clients are available via SPI + if (clientPath != null) { + Operation post = clientPath.getPost(); + 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()); + } + } + + 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 clients: " + b.toString()); + } + } + + return swagger.info(getInfo()) + .host(getHost()) + .basePath("/api"); + } + + static { + List extensions = Codegen.getExtensions(); + for (CodegenConfig config : extensions) { + if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { + clients.add(config.getName()); + } else if (config.getTag().equals(CodegenType.SERVER)) { + servers.add(config.getName()); + } + } + } +} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java new file mode 100644 index 00000000000..ac28d1cc5f4 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java @@ -0,0 +1,26 @@ +/** + * 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.generator.exception; + +public class ApiException extends Exception { + private int code; + + public ApiException(int code, String msg) { + super(msg); + this.code = code; + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java new file mode 100644 index 00000000000..7a15e82073a --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java @@ -0,0 +1,26 @@ +/** + * 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.generator.exception; + +public class BadRequestException extends ApiException { + private int code; + + public BadRequestException(int code, String msg) { + super(code, msg); + this.code = code; + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java new file mode 100644 index 00000000000..dbd6a1463ee --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java @@ -0,0 +1,26 @@ +/** + * 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.generator.exception; + +public class NotFoundException extends ApiException { + private int code; + + public NotFoundException(int code, String msg) { + super(code, msg); + this.code = code; + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java new file mode 100644 index 00000000000..0f3ce2e8cc9 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java @@ -0,0 +1,85 @@ +/** + * 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.generator.model; + +import javax.xml.bind.annotation.XmlTransient; + +@javax.xml.bind.annotation.XmlRootElement +public class ApiResponse { + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; + + int code; + String type; + String message; + + public ApiResponse() { + } + + public ApiResponse(int code, String message) { + this.code = code; + switch (code) { + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } + + @XmlTransient + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java new file mode 100644 index 00000000000..501cd2ddd82 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java @@ -0,0 +1,38 @@ +/** + * 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.generator.model; + +public class Generated { + private String filename; + private String friendlyName; + + public String getFilename() { + return filename; + } + + public void setFilename(String filename) { + this.filename = filename; + } + + public String getFriendlyName() { + return friendlyName; + } + + public void setFriendlyName(String friendlyName) { + this.friendlyName = friendlyName; + } +} 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 new file mode 100644 index 00000000000..2a653888625 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java @@ -0,0 +1,47 @@ +package io.swagger.generator.model; + +import com.fasterxml.jackson.databind.JsonNode; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.SecuritySchemeDefinition; + +import java.util.Map; + +public class GeneratorInput { + private JsonNode spec; + private Map options; + private String swaggerUrl; + private SecuritySchemeDefinition auth; + + @ApiModelProperty(dataType = "Object") + public JsonNode getSpec() { + return spec; + } + + public void setSpec(JsonNode spec) { + this.spec = spec; + } + + public Map getOptions() { + return options; + } + + public void setOptions(Map options) { + this.options = options; + } + + public String getSwaggerUrl() { + return swaggerUrl; + } + + public void setSwaggerUrl(String url) { + this.swaggerUrl = url; + } + + public SecuritySchemeDefinition getSecurityDefinition() { + return auth; + } + + public void setSecurityDefinition(SecuritySchemeDefinition auth) { + this.auth = auth; + } +} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java new file mode 100644 index 00000000000..dc55ad00582 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java @@ -0,0 +1,66 @@ +/** + * 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.generator.model; + +public class InputOption { + private String name; + private String description; + private Boolean required; + private String defaultValue; + + public InputOption() { + } + + public InputOption(String name, String description, String defaultValue, Boolean required) { + this.name = name; + this.description = description; + this.defaultValue = defaultValue; + this.required = required; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getRequired() { + return required; + } + + public void setRequired(Boolean required) { + this.required = required; + } + + public String getDefaultValue() { + return defaultValue; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } +} 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 new file mode 100644 index 00000000000..ad5b9cdec8f --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java @@ -0,0 +1,30 @@ +package io.swagger.generator.model; + +public class ResponseCode { + private String code; + private String link; + + public ResponseCode() { + } + + public ResponseCode(String code, String link) { + setCode(code); + setLink(link); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..d59060f39ef --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -0,0 +1,162 @@ +package io.swagger.generator.online; + +import com.fasterxml.jackson.databind.JsonNode; +import io.swagger.codegen.ClientOptInput; +import io.swagger.codegen.ClientOpts; +import io.swagger.codegen.Codegen; +import io.swagger.codegen.CodegenConfig; +import io.swagger.generator.exception.ApiException; +import io.swagger.generator.exception.BadRequestException; +import io.swagger.generator.model.GeneratorInput; +import io.swagger.generator.model.InputOption; +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.List; + +public class Generator { + static Logger LOGGER = LoggerFactory.getLogger(Generator.class); + + public static String generateClient(String language, GeneratorInput opts) throws ApiException { + Swagger swagger; + LOGGER.debug("generate client for " + language); + if (opts == null) { + throw new BadRequestException(400, "No options were supplied"); + } + JsonNode node = opts.getSpec(); + if (node == null) { + if (opts.getSwaggerUrl() != null) { + swagger = new SwaggerParser().read(opts.getSwaggerUrl()); + } else { + throw new BadRequestException(400, "No swagger specification was supplied"); + } + } else { + swagger = new SwaggerParser().read(node); + } + if (swagger == null) { + throw new BadRequestException(400, "The swagger specification supplied was not valid"); + } + + ClientOptInput clientOptInput = new ClientOptInput(); + ClientOpts clientOpts = new ClientOpts(); + String outputFolder = getTmpFolder().getAbsolutePath() + File.separator + language + "-client"; + String outputFilename = outputFolder + "-bundle.zip"; + + clientOptInput + .opts(clientOpts) + .swagger(swagger); + + CodegenConfig codegenConfig = Codegen.getConfig(language); + if (codegenConfig == null) { + throw new BadRequestException(400, "Unsupported target " + language + " supplied"); + } + + codegenConfig.setOutputDir(outputFolder); + + Json.prettyPrint(clientOpts); + + clientOptInput.setConfig(codegenConfig); + + try { + List files = new Codegen().opts(clientOptInput).generate(); + if (files.size() > 0) { + List filesToAdd = new ArrayList(); + System.out.println("adding to " + outputFolder); + filesToAdd.add(new File(outputFolder)); + ZipUtil zip = new ZipUtil(); + zip.compressFiles(filesToAdd, outputFilename); + } else { + throw new BadRequestException(400, "A target generation was attempted, but no files were created!"); + } + } catch (Exception e) { + throw new BadRequestException(500, "Unable to build target: " + e.getMessage()); + } + return outputFilename; + } + + public static String generateServer(String language, GeneratorInput opts) throws ApiException { + LOGGER.debug("generate server for " + language); + Swagger swagger; + if (opts == null) { + throw new BadRequestException(400, "No options were supplied"); + } + if (opts == null) { + throw new BadRequestException(400, "No options were supplied"); + } + JsonNode node = opts.getSpec(); + if (node == null) { + if (opts.getSwaggerUrl() != null) { + swagger = new SwaggerParser().read(opts.getSwaggerUrl()); + } else { + throw new BadRequestException(400, "No swagger specification was supplied"); + } + } else { + swagger = new SwaggerParser().read(node); + } + if (swagger == null) { + throw new BadRequestException(400, "The swagger specification supplied was not valid"); + } + + ClientOptInput clientOptInput = new ClientOptInput(); + ClientOpts clientOpts = new ClientOpts(); + String outputFolder = getTmpFolder().getAbsolutePath() + File.separator + language + "-server"; + String outputFilename = outputFolder + "-bundle.zip"; + + clientOptInput + .opts(clientOpts) + .swagger(swagger); + + CodegenConfig codegenConfig = Codegen.getConfig(language); + if (codegenConfig == null) { + throw new BadRequestException(400, "Unsupported target " + language + " supplied"); + } + + codegenConfig.setOutputDir(outputFolder); + + Json.prettyPrint(clientOpts); + + clientOptInput.setConfig(codegenConfig); + + try { + List files = new Codegen().opts(clientOptInput).generate(); + if (files.size() > 0) { + List filesToAdd = new ArrayList(); + filesToAdd.add(new File(outputFolder)); + ZipUtil zip = new ZipUtil(); + zip.compressFiles(filesToAdd, outputFilename); + } else { + throw new BadRequestException(400, "A target generation was attempted, but no files were created!"); + } + } catch (Exception e) { + throw new BadRequestException(500, "Unable to build target: " + e.getMessage()); + } + return outputFilename; + } + + public static InputOption clientOptions(String language) { + return null; + } + + public static InputOption serverOptions(String language) { + return null; + } + + protected static File getTmpFolder() { + try { + File outputFolder = File.createTempFile("codegen-", "-tmp"); + outputFolder.delete(); + outputFolder.mkdir(); + outputFolder.deleteOnExit(); + return outputFolder; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/ExceptionWriter.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/ExceptionWriter.java new file mode 100644 index 00000000000..fea969d7273 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/ExceptionWriter.java @@ -0,0 +1,50 @@ +package io.swagger.generator.resource; + +import io.swagger.generator.exception.ApiException; +import io.swagger.generator.exception.BadRequestException; +import io.swagger.generator.exception.NotFoundException; +import io.swagger.generator.model.ApiResponse; +import io.swagger.generator.util.ValidationException; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +@Provider +public class ExceptionWriter implements ExceptionMapper { + public Response toResponse(Exception exception) { + if (exception instanceof javax.ws.rs.WebApplicationException) { + javax.ws.rs.WebApplicationException e = (javax.ws.rs.WebApplicationException) exception; + return Response + .status(e.getResponse().getStatus()) + .entity(new ApiResponse(e.getResponse().getStatus(), + exception.getMessage())).build(); + } else if (exception instanceof com.fasterxml.jackson.core.JsonParseException) { + return Response.status(400) + .entity(new ApiResponse(400, "bad input")).build(); + } else if (exception instanceof ValidationException) { + ValidationException e = (ValidationException) exception; + return Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build(); + } else if (exception instanceof NotFoundException) { + return Response + .status(Status.NOT_FOUND) + .entity(new ApiResponse(ApiResponse.ERROR, exception + .getMessage())).build(); + } else if (exception instanceof BadRequestException) { + return Response + .status(Status.BAD_REQUEST) + .entity(new ApiResponse(ApiResponse.ERROR, exception + .getMessage())).build(); + } else if (exception instanceof ApiException) { + return Response + .status(Status.BAD_REQUEST) + .entity(new ApiResponse(ApiResponse.ERROR, exception + .getMessage())).build(); + } else { + return Response.status(500) + .entity(new ApiResponse(500, "something bad happened")) + .build(); + } + } +} \ No newline at end of file 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 new file mode 100644 index 00000000000..80850138010 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -0,0 +1,146 @@ +package io.swagger.generator.resource; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.codegen.Codegen; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenType; +import io.swagger.generator.exception.BadRequestException; +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 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 java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Path("/gen") +@Api(value = "/gen", description = "Resource for generating swagger components") +public class SwaggerResource { + static List clients = new ArrayList(); + static List servers = new ArrayList(); + private static Map fileMap = new HashMap(); + + @GET + @Path("/download/{fileId}") + @Produces({MediaType.APPLICATION_OCTET_STREAM}) + @ApiOperation(value = "Downloads a pre-generated file", + response = String.class, + tags = {"clients", "servers"}) + public Response downloadFile(@PathParam("fileId") String fileId) throws Exception { + Generated g = fileMap.get(fileId); + 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())); + + return Response.ok(bytes, "application/zip") + .header("Content-Disposition", "attachment; filename=\"" + g.getFriendlyName() + "-generated.zip\"") + .header("Accept-Range", "bytes") + .header("Content-Length", bytes.length) + .build(); + } else { + return Response.status(404).build(); + } + } + + @POST + @Path("/clients/{language}") + @ApiOperation( + value = "Generates a client library based on the config", + response = ResponseCode.class, + tags = "clients") + public Response generateClient( + @ApiParam(value = "The target language for the client library", allowableValues = "android,java,php,objc,docs", required = true) @PathParam("language") String language, + @ApiParam(value = "Configuration for building the client library", required = true) GeneratorInput opts) throws Exception { + + String filename = Generator.generateClient(language, opts); + + if (filename != null) { + String code = String.valueOf(System.currentTimeMillis()); + Generated g = new Generated(); + g.setFilename(filename); + g.setFriendlyName(language + "-client"); + fileMap.put(code, g); + System.out.println(code + ", " + filename); + String link = "http://generator.swagger.io/api/gen/download/" + code; + return Response.ok().entity(new ResponseCode(code, link)).build(); + } else { + return Response.status(500).build(); + } + } + + @GET + @Path("/clients") + @ApiOperation(value = "Gets languages supported by the client generator", + response = String.class, + responseContainer = "List", + tags = "clients") + public Response clientOptions() { + String[] languages = new String[clients.size()]; + languages = clients.toArray(languages); + return Response.ok().entity(languages).build(); + } + + @GET + @Path("/servers") + @ApiOperation(value = "Gets languages supported by the server generator", + response = String.class, + responseContainer = "List", + tags = "servers") + public Response serverOptions() { + String[] languages = new String[servers.size()]; + languages = servers.toArray(languages); + return Response.ok().entity(languages).build(); + } + + @POST + @Path("/servers/{framework}") + @ApiOperation(value = "Generates a server library for the supplied server framework", + response = ResponseCode.class, + tags = "servers") + public Response generateServerForLanguage( + @ApiParam(value = "framework", allowableValues = "jaxrs,nodejs", required = true) @PathParam("framework") String framework, + @ApiParam(value = "parameters", required = true) GeneratorInput opts) + throws Exception { + if (framework == null) { + throw new BadRequestException(400, "Framework is required"); + } + String filename = Generator.generateServer(framework, opts); + System.out.println("generated name: " + filename); + + if (filename != null) { + String code = String.valueOf(System.currentTimeMillis()); + Generated g = new Generated(); + g.setFilename(filename); + g.setFriendlyName(framework + "-server"); + fileMap.put(code, g); + System.out.println(code + ", " + filename); + String link = "http://generator.swagger.io/api/gen/download/" + code; + return Response.ok().entity(new ResponseCode(code, link)).build(); + } else { + return Response.status(500).build(); + } + } + + static { + List extensions = Codegen.getExtensions(); + for (CodegenConfig config : extensions) { + if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { + clients.add(config.getName()); + } else if (config.getTag().equals(CodegenType.SERVER)) { + servers.add(config.getName()); + } + } + } +} diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java new file mode 100644 index 00000000000..6daf764a45d --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java @@ -0,0 +1,45 @@ +/** + * 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.generator.util; + +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class ApiOriginFilter implements javax.servlet.Filter { + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java new file mode 100644 index 00000000000..ed58675e12b --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java @@ -0,0 +1,29 @@ +package io.swagger.generator.util; + +import java.util.List; + +public class ValidationException extends Exception { + private int code; + private String msg; + private List errors; + + public ValidationException(String msg) { + super(msg); + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return msg; + } + + public void setMessage(String msg) { + this.msg = msg; + } +} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationMessage.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationMessage.java new file mode 100644 index 00000000000..9e0218e3809 --- /dev/null +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationMessage.java @@ -0,0 +1,29 @@ +package io.swagger.generator.util; + +public class ValidationMessage { + private String path, message, severity; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getSeverity() { + return severity; + } + + public void setSeverity(String severity) { + this.severity = severity; + } +} \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ZipUtil.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java similarity index 57% rename from modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ZipUtil.java rename to modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java index 1d090bf96d3..11e63d5cbcb 100644 --- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/util/ZipUtil.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java @@ -1,20 +1,20 @@ /** - * Copyright 2015 Reverb, Inc. - * - * 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. + * 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 com.wordnik.swagger.generator.util; +package io.swagger.generator.util; import java.io.BufferedInputStream; import java.io.File; @@ -25,19 +25,19 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; - + /** -* This utility compresses a list of files to standard ZIP format file. -* It is able to compresses all sub files and sub directories, recursively. -* @author Ha Minh Nam -* -*/ + * This utility compresses a list of files to standard ZIP format file. + * It is able to compresses all sub files and sub directories, recursively. + * @author Ha Minh Nam + * + */ public class ZipUtil { /** * A constants for buffer size used to read/write data */ private static final int BUFFER_SIZE = 4096; - + /** * Compresses a collection of files to a destination zip file * @param listFiles A collection of files and directories @@ -45,57 +45,57 @@ public class ZipUtil { * @throws FileNotFoundException * @throws IOException */ - public void compressFiles(List listFiles, String destZipFile) throws FileNotFoundException, IOException { - - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(destZipFile)); - - for (File file : listFiles) { - if (file.isDirectory()) { - addFolderToZip(file, file.getName(), zos); - } else { - addFileToZip(file, zos); - } - } - - zos.flush(); - zos.close(); - } - - /** - * Adds a directory to the current zip output stream - * @param folder the directory to be added - * @param parentFolder the path of parent directory - * @param zos the current zip output stream - * @throws FileNotFoundException - * @throws IOException - */ + public void compressFiles(List listFiles, String destZipFile) throws FileNotFoundException, IOException { + + ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(destZipFile)); + + for (File file : listFiles) { + if (file.isDirectory()) { + addFolderToZip(file, file.getName(), zos); + } else { + addFileToZip(file, zos); + } + } + + zos.flush(); + zos.close(); + } + + /** + * Adds a directory to the current zip output stream + * @param folder the directory to be added + * @param parentFolder the path of parent directory + * @param zos the current zip output stream + * @throws FileNotFoundException + * @throws IOException + */ private void addFolderToZip(File folder, String parentFolder, - ZipOutputStream zos) throws FileNotFoundException, IOException { + ZipOutputStream zos) throws FileNotFoundException, IOException { for (File file : folder.listFiles()) { if (file.isDirectory()) { addFolderToZip(file, parentFolder + "/" + file.getName(), zos); continue; } - + zos.putNextEntry(new ZipEntry(parentFolder + "/" + file.getName())); - + BufferedInputStream bis = new BufferedInputStream( new FileInputStream(file)); - + long bytesRead = 0; byte[] bytesIn = new byte[BUFFER_SIZE]; int read = 0; - + while ((read = bis.read(bytesIn)) != -1) { zos.write(bytesIn, 0, read); bytesRead += read; } - + zos.closeEntry(); - + } } - + /** * Adds a file to the current zip output stream * @param file the file to be added @@ -106,19 +106,19 @@ private void addFolderToZip(File folder, String parentFolder, private void addFileToZip(File file, ZipOutputStream zos) throws FileNotFoundException, IOException { zos.putNextEntry(new ZipEntry(file.getName())); - + BufferedInputStream bis = new BufferedInputStream(new FileInputStream( file)); - + long bytesRead = 0; byte[] bytesIn = new byte[BUFFER_SIZE]; int read = 0; - + while ((read = bis.read(bytesIn)) != -1) { zos.write(bytesIn, 0, read); bytesRead += read; } - + zos.closeEntry(); } } \ No newline at end of file diff --git a/modules/swagger-generator/src/main/resources/logback.xml b/modules/swagger-generator/src/main/resources/logback.xml index f263bf8bde0..0e48ce8f7ee 100644 --- a/modules/swagger-generator/src/main/resources/logback.xml +++ b/modules/swagger-generator/src/main/resources/logback.xml @@ -1,12 +1,12 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + 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 7b363b797ed..b7e33258a5f 100644 --- a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml +++ b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml @@ -1,50 +1,50 @@ - + - - jersey - org.glassfish.jersey.servlet.ServletContainer - - jersey.config.server.provider.packages - - com.wordnik.swagger.jaxrs.json, - com.wordnik.swagger.generator.resource - - - - jersey.config.server.provider.classnames - - com.wordnik.swagger.online.ExceptionWriter, - com.wordnik.swagger.jersey.listing.ApiListingResourceJSON, - com.wordnik.swagger.jersey.listing.JerseyApiDeclarationProvider, - com.wordnik.swagger.jersey.listing.JerseyResourceListingProvider - - - - jersey.config.server.wadl.disableWadl - true - - 1 - + + jersey + org.glassfish.jersey.servlet.ServletContainer + + jersey.config.server.provider.packages + + io.swagger.jaxrs.json, + io.swagger.generator.resource + + + + jersey.config.server.provider.classnames + + io.swagger.online.ExceptionWriter, + io.swagger.jersey.listing.ApiListingResourceJSON, + io.swagger.jersey.listing.JerseyApiDeclarationProvider, + io.swagger.jersey.listing.JerseyResourceListingProvider + + + + jersey.config.server.wadl.disableWadl + true + + 1 + - - jersey - /api/* - + + jersey + /api/* + - - ApiOriginFilter - com.wordnik.swagger.generator.util.ApiOriginFilter - - - Bootstrap - com.wordnik.swagger.generator.Bootstrap - 2 - - - ApiOriginFilter - /* - + + ApiOriginFilter + io.swagger.generator.util.ApiOriginFilter + + + Bootstrap + io.swagger.generator.Bootstrap + 2 + + + ApiOriginFilter + /* + \ No newline at end of file diff --git a/modules/swagger-generator/src/main/webapp/index.html b/modules/swagger-generator/src/main/webapp/index.html new file mode 100644 index 00000000000..021310d9dec --- /dev/null +++ b/modules/swagger-generator/src/main/webapp/index.html @@ -0,0 +1,102 @@ + + + + Swagger UI + + + + + + + + + + + + + + + + + + + + + + + +

      + +
       
      +
      + + diff --git a/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala b/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala index 43e0f234800..e71849db42b 100644 --- a/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala +++ b/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala @@ -1,13 +1,7 @@ -import com.wordnik.swagger.generator.online._ -import com.wordnik.swagger.generator.model._ -import com.wordnik.swagger.util.Json - +import io.swagger.generator.model._ import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers - -import scala.collection.JavaConverters._ @RunWith(classOf[JUnitRunner]) class GeneratorInputTest extends FlatSpec with Matchers { diff --git a/pom.xml b/pom.xml index c8d223cfb2c..d206403e82b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,479 +1,480 @@ - - - org.sonatype.oss - oss-parent - 5 - - 4.0.0 - com.wordnik - swagger-codegen-project - pom - swagger-codegen-project - 2.1.1-M2-SNAPSHOT - https://github.com/swagger-api/swagger-codegen - - scm:git:git@github.com:swagger-api/swagger-codegen.git - scm:git:git@github.com:swagger-api/swagger-codegen.git + + + org.sonatype.oss + oss-parent + 5 + + 4.0.0 + io.swagger + swagger-codegen-project + pom + swagger-codegen-project + 2.1.1 https://github.com/swagger-api/swagger-codegen - - - 2.2.0 - - - - fehguy - Tony Tam - fehguy@gmail.com - - - - github - https://github.com/swagger-api/swagger-core/issues - - - - swagger-swaggersocket - https://groups.google.com/forum/#!forum/swagger-swaggersocket - - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - - src/main/java - target/classes - - - org.jvnet.wagon-svn - wagon-svn - 1.8 - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-6 - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-1 - - - install - target - ${project.artifactId}-${project.version} - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - true - 1.6 - UTF-8 - 1g - - http://java.sun.com/javase/6/docs/api/ - - ${javadoc.package.exclude} - - - - attach-javadocs - verify - - jar - - - - - - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - development - ${project.url} - ${project.version} - com.wordnik - - - - - - org.apache.maven.plugins - maven-site-plugin - 2.1 - - - org.apache.maven.plugins - maven-release-plugin - 2.1 - - - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - org.apache.maven.plugins - maven-gpg-plugin - - release - sign - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - true - 1.6 - UTF-8 - 1g - - http://java.sun.com/javase/6/docs/api/ - - ${javadoc.package.exclude} - - - - attach-javadocs - verify - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar-no-fork - - - - - - - - - - release-profile - - true - - + + scm:git:git@github.com:swagger-api/swagger-codegen.git + scm:git:git@github.com:swagger-api/swagger-codegen.git + https://github.com/swagger-api/swagger-codegen + + + 2.2.0 + + + + fehguy + Tony Tam + fehguy@gmail.com + + + + github + https://github.com/swagger-api/swagger-core/issues + + + + swagger-swaggersocket + https://groups.google.com/forum/#!forum/swagger-swaggersocket + + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + src/main/java + target/classes + + + org.jvnet.wagon-svn + wagon-svn + 1.8 + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-alpha-6 + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-1 + + + install + target + ${project.artifactId}-${project.version} - - net.alchim31.maven - scala-maven-plugin - - - - compile - testCompile - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - prepare-package - - add-source - + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 - - src/main/scala - + true + 1.6 + UTF-8 + 1g + + http://java.sun.com/javase/6/docs/api/ + + ${javadoc.package.exclude} - - - + + + attach-javadocs + verify + + jar + + + + + + maven-compiler-plugin + 3.0 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + development + ${project.url} + ${project.version} + io.swagger + + + + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + - - - - release-sign-artifacts - - - performRelease - true - - - + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin-version} + + + org.apache.maven.plugins + maven-gpg-plugin + + release + sign + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + true + 1.6 + UTF-8 + 1g + + http://java.sun.com/javase/6/docs/api/ + + ${javadoc.package.exclude} + + + + attach-javadocs + verify + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar-no-fork + + + + + + + + + + release-profile + + true + + + + + net.alchim31.maven + scala-maven-plugin + + + + compile + testCompile + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + prepare-package + + add-source + + + + src/main/scala + + + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + android-client + + + env + java + + + + samples/client/petstore/android-java + + + + java-client + + + env + java + + + + samples/client/petstore/java + + + + scala-client + + + env + scala + + + + samples/client/petstore/scala + + + + objc-client + + + env + objc + + + + samples/client/petstore/objc + + + + jaxrs-server + + + env + java + + + + samples/server/petstore/jaxrs + + + + ruby-client + + + env + java + + + + samples/client/petstore/ruby + + + + retrofit-client + + + env + java + + + + samples/client/petstore/retrofit + + + + spring-mvc + + + env + java + + + + samples/server/petstore/spring-mvc + + + + samples + + + env + samples + + + + samples/client/petstore/android-java + samples/client/petstore/java + samples/client/petstore/scala + samples/server/petstore/jaxrs + samples/server/petstore/spring-mvc + samples/client/petstore/objc + samples/client/petstore/ruby + + + + + modules/swagger-codegen + modules/swagger-codegen-cli + modules/swagger-generator + + + target/site - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + true + true + + http://java.sun.com/javaee/5/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + + + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin-version} + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + true + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + + + project-team + + + + - - - - - android-client - - - env - java - - - - samples/client/petstore/android-java - - - - java-client - - - env - java - - - - samples/client/petstore/java - - - - scala-client - - - env - scala - - - - samples/client/petstore/scala - - - - objc-client - - - env - objc - - - - samples/client/petstore/objc - - - - jaxrs-server - - - env - java - - - - samples/server/petstore/jaxrs - - - - ruby-client - - - env - java - - - - samples/client/petstore/ruby - - - - retrofit-client - - - env - java - - - - samples/client/petstore/retrofit - - - - spring-mvc - - - env - java - - - - samples/server/petstore/spring-mvc - - - - samples - - - env - samples - - - - samples/client/petstore/android-java - samples/client/petstore/java - samples/client/petstore/scala - samples/server/petstore/jaxrs - samples/server/petstore/spring-mvc - samples/client/petstore/objc - samples/client/petstore/ruby - - - - - modules/swagger-codegen - modules/swagger-codegen-cli - modules/swagger-generator - - - target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - true - true - - http://java.sun.com/javaee/5/docs/api - http://java.sun.com/j2se/1.5.0/docs/api - - - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - true - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - - - project-team - - - - - - - - - - junit - junit - ${junit-version} - test - - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - - - 1.0.7 - 2.10.4 - 2.3.4 - 1.5.2-M2 - 2.1.4 - 2.3 - 1.2 - 4.8.1 - 1.0.0 - 2.4 - 1.6.3 - 3.1.5 - 1.9 - + + + + + junit + junit + ${junit-version} + test + + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + + + 1.0.8 + 2.11.1 + 2.3.4 + 1.5.0 + 2.1.4 + 2.3 + 1.2 + 4.8.1 + 1.0.0 + 2.4 + 1.6.3 + 3.1.5 + 1.9 + diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index f865a97c38b..a047ad86cc0 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.wordnik + io.swagger swagger-client jar swagger-client @@ -162,7 +162,7 @@ ${scala-version} - com.wordnik + io.swagger swagger-core ${swagger-core-version} @@ -217,7 +217,7 @@ 2.3.9 1.2 2.2 - 1.5.0-M1 + 1.5.0 1.0.0 4.8.1 diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle index 26a00d90da8..a6c25c358a3 100644 --- a/samples/client/petstore/android-java/build.gradle +++ b/samples/client/petstore/android-java/build.gradle @@ -1,87 +1,85 @@ -group = 'io.swagger' -project.version = '1.0.0' + group = 'io.swagger' + project.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() +} +dependencies { +classpath 'com.android.tools.build:gradle:1.2.2' + classpath 'com.github.dcendents:android-maven-plugin:1.2' +} } allprojects { - repositories { - jcenter() - } +repositories { +jcenter() +} } apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' + apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 22 - buildToolsVersion '22.0.0' - defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 - } +compileSdkVersion 22 +buildToolsVersion '22.0.0' +defaultConfig { +minSdkVersion 14 +targetSdkVersion 22 +} - // 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) - } - } - } +// 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) +} +} +} } ext { - swagger_annotations_version = "1.5.3-M1" - gson_version = "2.3.1" - httpclient_version = "4.3.3" - junit_version = "4.8.1" +swagger_annotations_version = "1.5.0" +gson_version = "2.3.1" +httpclient_version = "4.3.3" +junit_version = "4.8.1" } dependencies { - compile "com.wordnik:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.gson:gson:$gson_version" - compile "org.apache.httpcomponents:httpcore:$httpclient_version" - compile "org.apache.httpcomponents:httpclient:$httpclient_version" - compile ("org.apache.httpcomponents:httpcore:$httpcore_version") { - exclude(group: 'org.apache.httpcomponents', module: 'httpclient') - } - compile ("org.apache.httpcomponents:httpmime:$httpmime_version") { - exclude(group: 'org.apache.httpcomponents', module: 'httpclient') - } - testCompile "junit:junit:$junit_version" +compile "io.swagger:swagger-annotations:$swagger_annotations_version" +compile "com.google.code.gson:gson:$gson_version" +compile "org.apache.httpcomponents:httpcore:$httpclient_version" +compile "org.apache.httpcomponents:httpclient:$httpclient_version" +compile ("org.apache.httpcomponents:httpcore:$httpclient_version") { +exclude(group: 'org.apache.httpcomponents', module: 'httpclient') +} +compile ("org.apache.httpcomponents:httpmime:$httpclient_version") { +exclude(group: 'org.apache.httpcomponents', module: 'httpclient') +} +testCompile "junit:junit:$junit_version" } 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); - } +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) { + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' -} + } -artifacts { + artifacts { archives sourcesJar -} + } diff --git a/samples/client/petstore/android-java/pom.xml b/samples/client/petstore/android-java/pom.xml index fd961c04d0a..aa8596a1f24 100644 --- a/samples/client/petstore/android-java/pom.xml +++ b/samples/client/petstore/android-java/pom.xml @@ -1,155 +1,158 @@ - 4.0.0 - io.swagger - swagger-android-client - jar - swagger-android-client - 1.0.0 - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + io.swagger + swagger-android-client + jar + swagger-android-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 + - - - - 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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.google.code.gson - gson - ${gson-version} - - - org.apache.httpcomponents - httpclient - ${httpclient-version} - compile - - - org.apache.httpcomponents - httpmime - ${httpclient-version} - compile - + + 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.google.code.gson + gson + ${gson-version} + + + org.apache.httpcomponents + httpclient + ${httpclient-version} + compile + + + org.apache.httpcomponents + httpmime + ${httpclient-version} + compile + - - - junit - junit - ${junit-version} - test - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - - 1.5.1-M1 - 2.3.1 - 4.8.1 - 1.0.0 - 4.8.1 - 4.3.6 - + + + junit + junit + ${junit-version} + test + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + + 1.5.0 + 2.3.1 + 4.8.1 + 1.0.0 + 4.8.1 + 4.3.6 + \ No newline at end of file diff --git a/samples/client/petstore/android-java/src/main/AndroidManifest.xml b/samples/client/petstore/android-java/src/main/AndroidManifest.xml index 3042699fd86..1850229fc17 100644 --- a/samples/client/petstore/android-java/src/main/AndroidManifest.xml +++ b/samples/client/petstore/android-java/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/samples/client/petstore/android-java/src/main/java/AndroidManifest.xml b/samples/client/petstore/android-java/src/main/java/AndroidManifest.xml index 3042699fd86..1850229fc17 100644 --- a/samples/client/petstore/android-java/src/main/java/AndroidManifest.xml +++ b/samples/client/petstore/android-java/src/main/java/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java index 31bc8a0978a..6f0c84c465a 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java @@ -1,29 +1,29 @@ package io.swagger.client; public class ApiException extends Exception { - int code = 0; - String message = null; +int code = 0; +String message = null; - public ApiException() {} +public ApiException() {} - public ApiException(int code, String message) { - this.code = code; - this.message = message; - } +public ApiException(int code, String message) { +this.code = code; +this.message = message; +} - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } +public int getCode() { +return code; +} + +public void setCode(int code) { +this.code = code; +} + +public String getMessage() { +return message; +} + +public void setMessage(String message) { +this.message = message; +} } \ No newline at end of file diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java index ec6218e602c..bc4e7b52026 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java @@ -52,338 +52,345 @@ import com.google.gson.JsonParseException; public class ApiInvoker { - private static ApiInvoker INSTANCE = new ApiInvoker(); - private Map defaultHeaderMap = new HashMap(); - - private HttpClient client = null; - - private boolean ignoreSSLCertificates = false; - - private ClientConnectionManager ignoreSSLConnectionManager; - - /** Content type "text/plain" with UTF-8 encoding. */ - public static final ContentType TEXT_PLAIN_UTF8 = ContentType.create("text/plain", Consts.UTF_8); - - /** - * ISO 8601 date time format. - * @see https://en.wikipedia.org/wiki/ISO_8601 - */ - public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - - /** - * ISO 8601 date format. - * @see https://en.wikipedia.org/wiki/ISO_8601 - */ - public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); - - static { - // Use UTC as the default time zone. - DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - - // Set default User-Agent. - setUserAgent("Android-Java-Swagger"); - } - - public static void setUserAgent(String userAgent) { - INSTANCE.addDefaultHeader("User-Agent", userAgent); - } - - public static Date parseDateTime(String str) { - try { - return DATE_TIME_FORMAT.parse(str); - } catch (java.text.ParseException e) { - throw new RuntimeException(e); - } - } - - public static Date parseDate(String str) { - try { - return DATE_FORMAT.parse(str); - } catch (java.text.ParseException e) { - throw new RuntimeException(e); - } - } - - public static String formatDateTime(Date datetime) { - return DATE_TIME_FORMAT.format(datetime); - } - - public static String formatDate(Date date) { - return DATE_FORMAT.format(date); - } - - public static String parameterToString(Object param) { - if (param == null) { - return ""; - } else if (param instanceof Date) { - return formatDateTime((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); - } - } - - public ApiInvoker() { - initConnectionManager(); - } - - public static ApiInvoker getInstance() { - return INSTANCE; - } - - public void ignoreSSLCertificates(boolean ignoreSSLCertificates) { - this.ignoreSSLCertificates = ignoreSSLCertificates; - } - - public void addDefaultHeader(String key, String value) { - defaultHeaderMap.put(key, value); - } - - public String escapeString(String str) { - return str; - } - - public static Object deserialize(String json, String containerType, Class cls) throws ApiException { - try{ - if("list".equalsIgnoreCase(containerType) || "array".equalsIgnoreCase(containerType)) { - return JsonUtil.deserializeToList(json, cls); - } - else if(String.class.equals(cls)) { - if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) - return json.substring(1, json.length() - 2); - else - return json; - } - else { - return JsonUtil.deserializeToObject(json, cls); - } - } - catch (JsonParseException e) { - throw new ApiException(500, e.getMessage()); - } - } - - public static String serialize(Object obj) throws ApiException { - try { - if (obj != null) - return JsonUtil.serialize(obj); - else - return null; - } - catch (Exception e) { - throw new ApiException(500, e.getMessage()); - } - } - - public String invokeAPI(String host, String path, String method, Map queryParams, Object body, Map headerParams, Map formParams, String contentType) throws ApiException { - HttpClient client = getClient(host); - - StringBuilder b = new StringBuilder(); - for(String key : queryParams.keySet()) { - String value = queryParams.get(key); - if (value != null){ - if(b.toString().length() == 0) - b.append("?"); - else - b.append("&"); - b.append(escapeString(key)).append("=").append(escapeString(value)); - } - } - String url = host + path + b.toString(); - - HashMap headers = new HashMap(); - - for(String key : headerParams.keySet()) { - headers.put(key, headerParams.get(key)); - } - - for(String key : defaultHeaderMap.keySet()) { - if(!headerParams.containsKey(key)) { - headers.put(key, defaultHeaderMap.get(key)); - } - } - headers.put("Accept", "application/json"); - - // URL encoded string from form parameters - String formParamStr = null; - - // for form data - if ("application/x-www-form-urlencoded".equals(contentType)) { - StringBuilder formParamBuilder = new StringBuilder(); - - // encode the form params - for (String key : formParams.keySet()) { - String value = formParams.get(key); - if (value != null && !"".equals(value.trim())) { - if (formParamBuilder.length() > 0) { - formParamBuilder.append("&"); - } - try { - formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8")); - } - catch (Exception e) { - // move on to next - } - } - } - formParamStr = formParamBuilder.toString(); - } - - HttpResponse response = null; - try { - if ("GET".equals(method)) { - HttpGet get = new HttpGet(url); - get.addHeader("Accept", "application/json"); - for(String key : headers.keySet()) { - get.setHeader(key, headers.get(key)); - } - response = client.execute(get); - } - else if ("POST".equals(method)) { - HttpPost post = new HttpPost(url); - if (formParamStr != null) { - post.setHeader("Content-Type", contentType); - post.setEntity(new StringEntity(formParamStr, "UTF-8")); - } else if (body != null) { - if (body instanceof HttpEntity) { - // this is for file uploading - post.setEntity((HttpEntity) body); - } else { - post.setHeader("Content-Type", contentType); - post.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - } - for(String key : headers.keySet()) { - post.setHeader(key, headers.get(key)); - } - response = client.execute(post); - } - else if ("PUT".equals(method)) { - HttpPut put = new HttpPut(url); - if (formParamStr != null) { - put.setHeader("Content-Type", contentType); - put.setEntity(new StringEntity(formParamStr, "UTF-8")); - } else if (body != null) { - put.setHeader("Content-Type", contentType); - put.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - for(String key : headers.keySet()) { - put.setHeader(key, headers.get(key)); - } - response = client.execute(put); - } - else if ("DELETE".equals(method)) { - HttpDelete delete = new HttpDelete(url); - for(String key : headers.keySet()) { - delete.setHeader(key, headers.get(key)); - } - response = client.execute(delete); - } - else if ("PATCH".equals(method)) { - HttpPatch patch = new HttpPatch(url); - if (formParamStr != null) { - patch.setHeader("Content-Type", contentType); - patch.setEntity(new StringEntity(formParamStr, "UTF-8")); - } else if (body != null) { - patch.setHeader("Content-Type", contentType); - patch.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - for(String key : headers.keySet()) { - patch.setHeader(key, headers.get(key)); - } - response = client.execute(patch); - } - - int code = response.getStatusLine().getStatusCode(); - String responseString = null; - if(code == 204) - responseString = ""; - else if(code >= 200 && code < 300) { - if(response.getEntity() != null) { - HttpEntity resEntity = response.getEntity(); - responseString = EntityUtils.toString(resEntity); - } - return responseString; - } - else { - if(response.getEntity() != null) { - HttpEntity resEntity = response.getEntity(); - responseString = EntityUtils.toString(resEntity); - } - else - responseString = "no data"; - } - throw new ApiException(code, responseString); - } - catch(IOException e) { - throw new ApiException(500, e.getMessage()); - } - } - - private HttpClient getClient(String host) { - if (client == null) { - if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) { - // Trust self signed certificates - client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams()); - } else { - client = new DefaultHttpClient(); - } - } - return client; - } - - private void initConnectionManager() { - try { - final SSLContext sslContext = SSLContext.getInstance("SSL"); - - // set up a TrustManager that trusts everything - TrustManager[] trustManagers = new TrustManager[] { - new X509TrustManager() { - public X509Certificate[] getAcceptedIssuers() { - return null; - } - public void checkClientTrusted(X509Certificate[] certs, String authType) {} - public void checkServerTrusted(X509Certificate[] certs, String authType) {} - }}; - - sslContext.init(null, trustManagers, new SecureRandom()); - - SSLSocketFactory sf = new SSLSocketFactory((KeyStore)null) { - private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory(); - - public Socket createSocket(Socket socket, String host, int port, boolean autoClose) - throws IOException, UnknownHostException { - return sslFactory.createSocket(socket, host, port, autoClose); - } - - public Socket createSocket() throws IOException { - return sslFactory.createSocket(); - } - }; - - sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); - Scheme httpsScheme = new Scheme("https", sf, 443); - SchemeRegistry schemeRegistry = new SchemeRegistry(); - schemeRegistry.register(httpsScheme); - schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); - - ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry); - } catch (NoSuchAlgorithmException e) { - // This will only be thrown if SSL isn't available for some reason. - } catch (KeyManagementException e) { - // This might be thrown when passing a key into init(), but no key is being passed. - } catch (GeneralSecurityException e) { - // This catches anything else that might go wrong. - // If anything goes wrong we default to the standard connection manager. - } - } +private static ApiInvoker INSTANCE = new ApiInvoker(); +private Map + defaultHeaderMap = new HashMap +(); + +private HttpClient client = null; + +private boolean ignoreSSLCertificates = false; + +private ClientConnectionManager ignoreSSLConnectionManager; + +/** Content type "text/plain" with UTF-8 encoding. */ +public static final ContentType TEXT_PLAIN_UTF8 = ContentType.create("text/plain", Consts.UTF_8); + +/** +* ISO 8601 date time format. +* @see https://en.wikipedia.org/wiki/ISO_8601 +*/ +public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + +/** +* ISO 8601 date format. +* @see https://en.wikipedia.org/wiki/ISO_8601 +*/ +public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); + +static { +// Use UTC as the default time zone. +DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); +DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + +// Set default User-Agent. +setUserAgent("Android-Java-Swagger"); +} + +public static void setUserAgent(String userAgent) { +INSTANCE.addDefaultHeader("User-Agent", userAgent); +} + +public static Date parseDateTime(String str) { +try { +return DATE_TIME_FORMAT.parse(str); +} catch (java.text.ParseException e) { +throw new RuntimeException(e); +} +} + +public static Date parseDate(String str) { +try { +return DATE_FORMAT.parse(str); +} catch (java.text.ParseException e) { +throw new RuntimeException(e); +} +} + +public static String formatDateTime(Date datetime) { +return DATE_TIME_FORMAT.format(datetime); +} + +public static String formatDate(Date date) { +return DATE_FORMAT.format(date); +} + +public static String parameterToString(Object param) { +if (param == null) { +return ""; +} else if (param instanceof Date) { +return formatDateTime((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); +} +} + +public ApiInvoker() { +initConnectionManager(); +} + +public static ApiInvoker getInstance() { +return INSTANCE; +} + +public void ignoreSSLCertificates(boolean ignoreSSLCertificates) { +this.ignoreSSLCertificates = ignoreSSLCertificates; +} + +public void addDefaultHeader(String key, String value) { +defaultHeaderMap.put(key, value); +} + +public String escapeString(String str) { +return str; +} + +public static Object deserialize(String json, String containerType, Class cls) throws ApiException { +try{ +if("list".equalsIgnoreCase(containerType) || "array".equalsIgnoreCase(containerType)) { +return JsonUtil.deserializeToList(json, cls); +} +else if(String.class.equals(cls)) { +if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) +return json.substring(1, json.length() - 2); +else +return json; +} +else { +return JsonUtil.deserializeToObject(json, cls); +} +} +catch (JsonParseException e) { +throw new ApiException(500, e.getMessage()); +} +} + +public static String serialize(Object obj) throws ApiException { +try { +if (obj != null) +return JsonUtil.serialize(obj); +else +return null; +} +catch (Exception e) { +throw new ApiException(500, e.getMessage()); +} +} + +public String invokeAPI(String host, String path, String method, Map + queryParams, Object body, Map + headerParams, Map + formParams, String contentType) throws ApiException { +HttpClient client = getClient(host); + +StringBuilder b = new StringBuilder(); +for(String key : queryParams.keySet()) { +String value = queryParams.get(key); +if (value != null){ +if(b.toString().length() == 0) +b.append("?"); +else +b.append("&"); +b.append(escapeString(key)).append("=").append(escapeString(value)); +} +} +String url = host + path + b.toString(); + +HashMap + headers = new HashMap +(); + +for(String key : headerParams.keySet()) { +headers.put(key, headerParams.get(key)); +} + +for(String key : defaultHeaderMap.keySet()) { +if(!headerParams.containsKey(key)) { +headers.put(key, defaultHeaderMap.get(key)); +} +} +headers.put("Accept", "application/json"); + +// URL encoded string from form parameters +String formParamStr = null; + +// for form data +if ("application/x-www-form-urlencoded".equals(contentType)) { +StringBuilder formParamBuilder = new StringBuilder(); + +// encode the form params +for (String key : formParams.keySet()) { +String value = formParams.get(key); +if (value != null && !"".equals(value.trim())) { +if (formParamBuilder.length() > 0) { +formParamBuilder.append("&"); +} +try { +formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8")); +} +catch (Exception e) { +// move on to next +} +} +} +formParamStr = formParamBuilder.toString(); +} + +HttpResponse response = null; +try { +if ("GET".equals(method)) { +HttpGet get = new HttpGet(url); +get.addHeader("Accept", "application/json"); +for(String key : headers.keySet()) { +get.setHeader(key, headers.get(key)); +} +response = client.execute(get); +} +else if ("POST".equals(method)) { +HttpPost post = new HttpPost(url); +if (formParamStr != null) { +post.setHeader("Content-Type", contentType); +post.setEntity(new StringEntity(formParamStr, "UTF-8")); +} else if (body != null) { +if (body instanceof HttpEntity) { +// this is for file uploading +post.setEntity((HttpEntity) body); +} else { +post.setHeader("Content-Type", contentType); +post.setEntity(new StringEntity(serialize(body), "UTF-8")); +} +} +for(String key : headers.keySet()) { +post.setHeader(key, headers.get(key)); +} +response = client.execute(post); +} +else if ("PUT".equals(method)) { +HttpPut put = new HttpPut(url); +if (formParamStr != null) { +put.setHeader("Content-Type", contentType); +put.setEntity(new StringEntity(formParamStr, "UTF-8")); +} else if (body != null) { +put.setHeader("Content-Type", contentType); +put.setEntity(new StringEntity(serialize(body), "UTF-8")); +} +for(String key : headers.keySet()) { +put.setHeader(key, headers.get(key)); +} +response = client.execute(put); +} +else if ("DELETE".equals(method)) { +HttpDelete delete = new HttpDelete(url); +for(String key : headers.keySet()) { +delete.setHeader(key, headers.get(key)); +} +response = client.execute(delete); +} +else if ("PATCH".equals(method)) { +HttpPatch patch = new HttpPatch(url); +if (formParamStr != null) { +patch.setHeader("Content-Type", contentType); +patch.setEntity(new StringEntity(formParamStr, "UTF-8")); +} else if (body != null) { +patch.setHeader("Content-Type", contentType); +patch.setEntity(new StringEntity(serialize(body), "UTF-8")); +} +for(String key : headers.keySet()) { +patch.setHeader(key, headers.get(key)); +} +response = client.execute(patch); +} + +int code = response.getStatusLine().getStatusCode(); +String responseString = null; +if(code == 204) +responseString = ""; +else if(code >= 200 && code < 300) { +if(response.getEntity() != null) { +HttpEntity resEntity = response.getEntity(); +responseString = EntityUtils.toString(resEntity); +} +return responseString; +} +else { +if(response.getEntity() != null) { +HttpEntity resEntity = response.getEntity(); +responseString = EntityUtils.toString(resEntity); +} +else +responseString = "no data"; +} +throw new ApiException(code, responseString); +} +catch(IOException e) { +throw new ApiException(500, e.getMessage()); +} +} + +private HttpClient getClient(String host) { +if (client == null) { +if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) { +// Trust self signed certificates +client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams()); +} else { +client = new DefaultHttpClient(); +} +} +return client; +} + +private void initConnectionManager() { +try { +final SSLContext sslContext = SSLContext.getInstance("SSL"); + +// set up a TrustManager that trusts everything +TrustManager[] trustManagers = new TrustManager[] { +new X509TrustManager() { +public X509Certificate[] getAcceptedIssuers() { +return null; +} +public void checkClientTrusted(X509Certificate[] certs, String authType) {} +public void checkServerTrusted(X509Certificate[] certs, String authType) {} +}}; + +sslContext.init(null, trustManagers, new SecureRandom()); + +SSLSocketFactory sf = new SSLSocketFactory((KeyStore)null) { +private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory(); + +public Socket createSocket(Socket socket, String host, int port, boolean autoClose) +throws IOException, UnknownHostException { +return sslFactory.createSocket(socket, host, port, autoClose); +} + +public Socket createSocket() throws IOException { +return sslFactory.createSocket(); +} +}; + +sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); +Scheme httpsScheme = new Scheme("https", sf, 443); +SchemeRegistry schemeRegistry = new SchemeRegistry(); +schemeRegistry.register(httpsScheme); +schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); + +ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry); +} catch (NoSuchAlgorithmException e) { +// This will only be thrown if SSL isn't available for some reason. +} catch (KeyManagementException e) { +// This might be thrown when passing a key into init(), but no key is being passed. +} catch (GeneralSecurityException e) { +// This catches anything else that might go wrong. +// If anything goes wrong we default to the standard connection manager. +} +} } diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java index cb97056dbc9..627bd7adf50 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java @@ -3,14 +3,14 @@ import org.apache.http.client.methods.*; public class HttpPatch extends HttpPost { - public static final String METHOD_PATCH = "PATCH"; +public static final String METHOD_PATCH = "PATCH"; - public HttpPatch(final String url) { - super(url); - } +public HttpPatch(final String url) { +super(url); +} - @Override - public String getMethod() { - return METHOD_PATCH; - } +@Override +public String getMethod() { +return METHOD_PATCH; +} } \ No newline at end of file diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java index 5aa10d3ea82..6c2eb9dd4f4 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java @@ -8,80 +8,95 @@ import io.swagger.client.model.*; public class JsonUtil { - public static GsonBuilder gsonBuilder; +public static GsonBuilder gsonBuilder; - static { - gsonBuilder = new GsonBuilder(); - gsonBuilder.serializeNulls(); - gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - } +static { +gsonBuilder = new GsonBuilder(); +gsonBuilder.serializeNulls(); +gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); +} - public static Gson getGson() { - return gsonBuilder.create(); - } +public static Gson getGson() { +return gsonBuilder.create(); +} - public static String serialize(Object obj){ - return getGson().toJson(obj); - } +public static String serialize(Object obj){ +return getGson().toJson(obj); +} - public static T deserializeToList(String jsonString, Class cls){ +public static + T deserializeToList(String jsonString, Class cls){ return getGson().fromJson(jsonString, getListTypeForDeserialization(cls)); - } + } - public static T deserializeToObject(String jsonString, Class cls){ - return getGson().fromJson(jsonString, getTypeForDeserialization(cls)); - } + public static + T deserializeToObject(String jsonString, Class cls){ + return getGson().fromJson(jsonString, getTypeForDeserialization(cls)); + } - public static Type getListTypeForDeserialization(Class cls) { - String className = cls.getSimpleName(); - - if ("User".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - - if ("Category".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - - if ("Pet".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - - if ("Tag".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - - if ("Order".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - - return new TypeToken>(){}.getType(); - } + public static Type getListTypeForDeserialization(Class cls) { + String className = cls.getSimpleName(); + + if ("User".equalsIgnoreCase(className)) { + return new TypeToken + >(){}.getType(); + } + + if ("Category".equalsIgnoreCase(className)) { + return new TypeToken + >(){}.getType(); + } + + if ("Pet".equalsIgnoreCase(className)) { + return new TypeToken + >(){}.getType(); + } + + if ("Tag".equalsIgnoreCase(className)) { + return new TypeToken + >(){}.getType(); + } + + if ("Order".equalsIgnoreCase(className)) { + return new TypeToken + >(){}.getType(); + } + + return new TypeToken + >(){}.getType(); + } - public static Type getTypeForDeserialization(Class cls) { - String className = cls.getSimpleName(); - - if ("User".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - - if ("Category".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - - if ("Pet".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - - if ("Tag".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - - if ("Order".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - - return new TypeToken(){}.getType(); - } + public static Type getTypeForDeserialization(Class cls) { + String className = cls.getSimpleName(); + + if ("User".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Category".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Pet".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Tag".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Order".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + return new TypeToken + (){}.getType(); + } -}; + }; diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java index ebf600d787e..c0956b0b85a 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java @@ -17,507 +17,555 @@ import java.util.HashMap; import java.io.File; -public class PetApi { - String basePath = "http://petstore.swagger.io/v2"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); + public class PetApi { + String basePath = "http://petstore.swagger.io/v2"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); - public void addHeader(String key, String value) { + public void addHeader(String key, String value) { getInvoker().addDefaultHeader(key, value); - } + } - public ApiInvoker getInvoker() { + public ApiInvoker getInvoker() { return apiInvoker; - } + } - public void setBasePath(String basePath) { + public void setBasePath(String basePath) { this.basePath = basePath; - } + } - public String getBasePath() { + public String getBasePath() { return basePath; - } - - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - "application/json","application/xml" - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - } - try { - String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + + /** + * 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + "application/json","application/xml" + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - + } + } catch (ApiException ex) { + throw ex; + } + } - - - - String[] contentTypes = { - "application/json","application/xml" - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + "application/json","application/xml" + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - if (status != null) - queryParams.put("status", ApiInvoker.parameterToString(status)); - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + if (status != null) + queryParams.put("status", ApiInvoker.parameterToString(status)); + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (List) ApiInvoker.deserialize(response, "array", Pet.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - if (tags != null) - queryParams.put("tags", ApiInvoker.parameterToString(tags)); - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + if (tags != null) + queryParams.put("tags", ApiInvoker.parameterToString(tags)); + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (List) ApiInvoker.deserialize(response, "array", Pet.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - // 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" + "\\}", apiInvoker.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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" + "\\}", apiInvoker.escapeString(petId.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (Pet) ApiInvoker.deserialize(response, "", Pet.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - // 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" + "\\}", apiInvoker.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - "application/x-www-form-urlencoded" - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - if (name != null) { - builder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8); - } - - if (status != null) { - builder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8); - } - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - formParams.put("name", ApiInvoker.parameterToString(name)); - formParams.put("status", ApiInvoker.parameterToString(status)); - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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" + "\\}", apiInvoker.escapeString(petId.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + "application/x-www-form-urlencoded" + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + if (name != null) { + builder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8); + } + + if (status != null) { + builder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8); + } + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + formParams.put("name", ApiInvoker.parameterToString(name)); + formParams.put("status", ApiInvoker.parameterToString(status)); + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * Deletes a pet - * - * @param apiKey - * @param petId Pet id to delete - * @return void - */ - public void deletePet (String apiKey, 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 deletePet"); - } + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - headerParams.put("api_key", ApiInvoker.parameterToString(apiKey)); - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * Deletes a pet + * + * @param apiKey + * @param petId Pet id to delete + * @return void + */ + public void deletePet (String apiKey, 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 deletePet"); + } + + + // create path and map variables + String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + headerParams.put("api_key", ApiInvoker.parameterToString(apiKey)); + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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" + "\\}", apiInvoker.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - + } + } catch (ApiException ex) { + throw ex; + } + } - - - - String[] contentTypes = { - "multipart/form-data" - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - if (additionalMetadata != null) { - builder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8); - } - - if (file != null) { - builder.addBinaryBody("file", file); - } - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata)); - - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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" + "\\}", apiInvoker.escapeString(petId.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + "multipart/form-data" + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + if (additionalMetadata != null) { + builder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8); + } + + if (file != null) { + builder.addBinaryBody("file", file); + } + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata)); + + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + } - } - -} diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java index ecd8e833049..a246d7c9de8 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java @@ -17,250 +17,274 @@ import java.util.HashMap; import java.io.File; -public class StoreApi { - String basePath = "http://petstore.swagger.io/v2"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); + public class StoreApi { + String basePath = "http://petstore.swagger.io/v2"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); - public void addHeader(String key, String value) { + public void addHeader(String key, String value) { getInvoker().addDefaultHeader(key, value); - } + } - public ApiInvoker getInvoker() { + public ApiInvoker getInvoker() { return apiInvoker; - } + } - public void setBasePath(String basePath) { + public void setBasePath(String basePath) { this.basePath = basePath; - } + } - public String getBasePath() { + public String getBasePath() { return basePath; - } - - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - } - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + + /** + * 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (Map) ApiInvoker.deserialize(response, "map", Map.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - + } + } catch (ApiException ex) { + throw ex; + } + } - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (Order) ApiInvoker.deserialize(response, "", Order.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - // 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" + "\\}", apiInvoker.escapeString(orderId.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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" + "\\}", apiInvoker.escapeString(orderId.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (Order) ApiInvoker.deserialize(response, "", Order.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - // 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" + "\\}", apiInvoker.escapeString(orderId.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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" + "\\}", apiInvoker.escapeString(orderId.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + } - } - -} diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java index e1df3fd4f12..85f89497498 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java @@ -17,477 +17,525 @@ import java.util.HashMap; import java.io.File; -public class UserApi { - String basePath = "http://petstore.swagger.io/v2"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); + public class UserApi { + String basePath = "http://petstore.swagger.io/v2"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); - public void addHeader(String key, String value) { + public void addHeader(String key, String value) { getInvoker().addDefaultHeader(key, value); - } + } - public ApiInvoker getInvoker() { + public ApiInvoker getInvoker() { return apiInvoker; - } + } - public void setBasePath(String basePath) { + public void setBasePath(String basePath) { this.basePath = basePath; - } + } - public String getBasePath() { + public String getBasePath() { return basePath; - } - - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - } - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + + /** + * 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - + } + } catch (ApiException ex) { + throw ex; + } + } - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/user/createWithList".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - if (username != null) - queryParams.put("username", ApiInvoker.parameterToString(username)); - if (password != null) - queryParams.put("password", ApiInvoker.parameterToString(password)); + } + } catch (ApiException ex) { + throw ex; + } + } - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + if (username != null) + queryParams.put("username", ApiInvoker.parameterToString(username)); + if (password != null) + queryParams.put("password", ApiInvoker.parameterToString(password)); + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (String) ApiInvoker.deserialize(response, "", String.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * Logs out current logged in user session - * - * @return void - */ - public void logoutUser () throws ApiException { - Object postBody = null; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/user/logout".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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 + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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" + "\\}", apiInvoker.escapeString(username.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - + } + } catch (ApiException ex) { + throw ex; + } + } - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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" + "\\}", apiInvoker.escapeString(username.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return (User) ApiInvoker.deserialize(response, "", User.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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"); - } + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - - - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType); - if(response != null){ + /** + * 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" + "\\}", apiInvoker.escapeString(username.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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" + "\\}", apiInvoker.escapeString(username.toString())); - - // query params - Map queryParams = new HashMap(); - // header params - Map headerParams = new HashMap(); - // form params - Map formParams = new HashMap(); - + } + } catch (ApiException ex) { + throw ex; + } + } - - - - String[] contentTypes = { - - }; - String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; - - if (contentType.startsWith("multipart/form-data")) { - // file uploading - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - - - HttpEntity httpEntity = builder.build(); - postBody = httpEntity; - } else { - // normal form params - - } - - try { - String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType); - if(response != 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" + "\\}", apiInvoker.escapeString(username.toString())); + + // query params + Map + queryParams = new HashMap + (); + // header params + Map + headerParams = new HashMap + (); + // form params + Map + formParams = new HashMap + (); + + + + + + String[] contentTypes = { + + }; + String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; + + if (contentType.startsWith("multipart/form-data")) { + // file uploading + MultipartEntityBuilder builder = MultipartEntityBuilder.create(); + + + HttpEntity httpEntity = builder.build(); + postBody = httpEntity; + } else { + // normal form params + + } + + try { + String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + } - } - -} diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java index 6a001ed16ea..ac50716bfda 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java @@ -1,44 +1,44 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; + + @ApiModel(description = "") + public class Category { + + @SerializedName("id") + private Long id = null; + @SerializedName("name") + private String name = null; -@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 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; - } + + /** + **/ + @ApiModelProperty(value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Category {\n"); @@ -46,5 +46,6 @@ public String toString() { sb.append(" name: ").append(name).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java index 613864b8e32..4eec77f9270 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java @@ -2,100 +2,100 @@ import java.util.Date; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; + + @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 { + placed, approved, delivered, + }; + @SerializedName("status") + private StatusEnum status = null; + @SerializedName("complete") + private Boolean complete = null; -@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 { - placed, approved, delivered, - }; - @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 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 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 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; - } + + /** + **/ + @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; - } + + /** + * 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; - } + + /** + **/ + @ApiModelProperty(value = "") + public Boolean getComplete() { + return complete; + } + public void setComplete(Boolean complete) { + this.complete = complete; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Order {\n"); @@ -107,5 +107,6 @@ public String toString() { sb.append(" complete: ").append(complete).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java index 93ec8bd9a42..a1e7c632132 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java @@ -4,100 +4,100 @@ import io.swagger.client.model.Tag; import java.util.*; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; + + @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 { + available, pending, sold, + }; + @SerializedName("status") + private StatusEnum status = null; -@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 { - available, pending, sold, - }; - @SerializedName("status") - private StatusEnum status = null; - - - /** - **/ - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } + + /** + **/ + @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(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 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(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; - } + + /** + **/ + @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; - } + + /** + * 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() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Pet {\n"); @@ -109,5 +109,6 @@ public String toString() { sb.append(" status: ").append(status).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java index fb8d9822e96..2356a1c1b4c 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java @@ -1,44 +1,44 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; + + @ApiModel(description = "") + public class Tag { + + @SerializedName("id") + private Long id = null; + @SerializedName("name") + private String name = null; -@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 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; - } + + /** + **/ + @ApiModelProperty(value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Tag {\n"); @@ -46,5 +46,6 @@ public String toString() { sb.append(" name: ").append(name).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java index 9a46e0a904d..40803f3cfb1 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java @@ -1,123 +1,123 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; + + @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; -@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 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 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 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 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 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 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; - } + + /** + **/ + @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; - } + + /** + * User Status + **/ + @ApiModelProperty(value = "User Status") + public Integer getUserStatus() { + return userStatus; + } + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class User {\n"); @@ -131,5 +131,6 @@ public String toString() { sb.append(" userStatus: ").append(userStatus).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java index e7fd31f2996..a4900a92b9b 100644 --- a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java +++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java @@ -1,155 +1,159 @@ package io.swagger.petstore.test; -import io.swagger.client.ApiException; import io.swagger.client.api.*; import io.swagger.client.model.*; -import java.util.*; -import java.io.*; +import io.swagger.client.ApiException; + +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 static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class PetApiTest { - PetApi api = null; - - @Before - public void setup() { - api = new PetApi(); - } - - @Test - public void testCreateAndGetPet() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - 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); - - Pet fetched = api.getPetById(pet.getId()); - 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); - - List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})); - assertNotNull(pets); - - boolean found = false; - for(Pet fetched : pets) { - if(fetched.getId().equals(pet.getId())) { - found = true; - break; - } + PetApi api = null; + + @Before + public void setup() { + api = new PetApi(); + } + + @Test + public void testCreateAndGetPet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + 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); + + Pet fetched = api.getPetById(pet.getId()); + assertNotNull(fetched); + assertEquals(pet.getId(), fetched.getId()); + assertNotNull(fetched.getCategory()); + assertEquals(fetched.getCategory().getName(), pet.getCategory().getName()); } - assertTrue(found); - } + @Test + public void testFindPetsByStatus() throws Exception { + Pet pet = createRandomPet(); + pet.setName("programmer"); + pet.setStatus(Pet.StatusEnum.available); - @Test - public void testFindPetsByTags() throws Exception { - Pet pet = createRandomPet(); - pet.setName("monster"); - pet.setStatus(Pet.StatusEnum.available); + api.updatePet(pet); - List tags = new ArrayList(); - Tag tag1 = new Tag(); - tag1.setName("friendly"); - tags.add(tag1); - pet.setTags(tags); + List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})); + assertNotNull(pets); - api.updatePet(pet); + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } - List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})); - assertNotNull(pets); + assertTrue(found); + } - boolean found = false; - for(Pet fetched : pets) { - if(fetched.getId().equals(pet.getId())) { - found = true; - break; - } + @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); + + List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})); + assertNotNull(pets); + + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } + assertTrue(found); } - assertTrue(found); - } - - @Test - public void testUpdatePetWithForm() throws Exception { - Pet pet = createRandomPet(); - pet.setName("frank"); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - assertEquals("frank", fetched.getName()); - - api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null); - Pet updated = api.getPetById(fetched.getId()); - assertEquals("furt", updated.getName()); - } - - @Test - public void testDeletePet() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - api.deletePet(null, fetched.getId()); - - try { - fetched = api.getPetById(fetched.getId()); - fail("expected an error"); + + @Test + public void testUpdatePetWithForm() throws Exception { + Pet pet = createRandomPet(); + pet.setName("frank"); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + assertEquals("frank", fetched.getName()); + + api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null); + Pet updated = api.getPetById(fetched.getId()); + assertEquals("furt", updated.getName()); } - catch (ApiException e) { - assertEquals(404, e.getCode()); + + @Test + public void testDeletePet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + api.deletePet(null, fetched.getId()); + + try { + fetched = api.getPetById(fetched.getId()); + fail("expected an error"); + } catch (ApiException e) { + assertEquals(404, e.getCode()); + } } - } - @Test - public void testUploadFile() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); + @Test + public void testUploadFile() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); - File file = new File("hello.txt"); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - writer.write("Hello world!"); - writer.close(); + 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", new File(file.getAbsolutePath())); - } + api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath())); + } - private Pet createRandomPet() { - Pet pet = new Pet(); - pet.setId(System.currentTimeMillis()); - pet.setName("gorilla"); + private Pet createRandomPet() { + Pet pet = new Pet(); + pet.setId(System.currentTimeMillis()); + pet.setName("gorilla"); - Category category = new Category(); - category.setName("really-happy"); + 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); + 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; - } + return pet; + } } diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java index 25a52009b9e..71ba4291ca9 100644 --- a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -1,68 +1,67 @@ package io.swagger.petstore.test; -import io.swagger.client.ApiException; import io.swagger.client.api.*; import io.swagger.client.model.*; -import java.util.*; -import java.io.*; +import io.swagger.client.ApiException; + +import java.util.Map; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class StoreApiTest { - StoreApi api = null; + StoreApi api = null; - @Before - public void setup() { - api = new StoreApi(); - } + @Before + public void setup() { + api = new StoreApi(); + } - @Test - public void testGetInventory() throws Exception { - Map inventory = api.getInventory(); - assertTrue(inventory.keySet().size() > 0); - } + @Test + public void testGetInventory() throws Exception { + Map inventory = api.getInventory(); + assertTrue(inventory.keySet().size() > 0); + } - @Test - public void testPlaceOrder() throws Exception { - Order order = createOrder(); - api.placeOrder(order); + @Test + public void testPlaceOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order); - Order fetched = api.getOrderById(String.valueOf(order.getId())); - assertEquals(order.getId(), fetched.getId()); - assertEquals(order.getPetId(), fetched.getPetId()); - assertEquals(order.getQuantity(), fetched.getQuantity()); - } + Order fetched = api.getOrderById(String.valueOf(order.getId())); + assertEquals(order.getId(), fetched.getId()); + assertEquals(order.getPetId(), fetched.getPetId()); + assertEquals(order.getQuantity(), fetched.getQuantity()); + } - @Test - public void testDeleteOrder() throws Exception { - Order order = createOrder(); - api.placeOrder(order); + @Test + public void testDeleteOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order); - Order fetched = api.getOrderById(String.valueOf(order.getId())); - assertEquals(fetched.getId(), order.getId()); + Order fetched = api.getOrderById(String.valueOf(order.getId())); + assertEquals(fetched.getId(), order.getId()); - api.deleteOrder(String.valueOf(order.getId())); + api.deleteOrder(String.valueOf(order.getId())); - try { - api.getOrderById(String.valueOf(order.getId())); - // fail("expected an error"); + try { + api.getOrderById(String.valueOf(order.getId())); + // fail("expected an error"); + } catch (ApiException e) { + // ok + } } - catch (ApiException e) { - // ok - } - } - 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); + 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; - } + return order; + } } \ No newline at end of file diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java index 9d683faab7a..6f5877d24a2 100644 --- a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -1,84 +1,82 @@ package io.swagger.petstore.test; -import io.swagger.client.ApiException; import io.swagger.client.api.*; import io.swagger.client.model.*; -import java.util.*; -import java.io.*; +import java.util.Arrays; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class UserApiTest { - UserApi api = null; - - @Before - public void setup() { - api = new UserApi(); - } - - @Test - public void testCreateUser() throws Exception { - User user = createUser(); - - api.createUser(user); - - User fetched = api.getUserByName(user.getUsername()); - 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})); - - User fetched = api.getUserByName(user1.getUsername()); - 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})); - - User fetched = api.getUserByName(user1.getUsername()); - assertEquals(user1.getId(), fetched.getId()); - } - - @Test - public void testLoginUser() throws Exception { - User user = createUser(); - api.createUser(user); - - String token = api.loginUser(user.getUsername(), user.getPassword()); - assertTrue(token.startsWith("logged in user session:")); - } - - @Test - public void logoutUser() throws Exception { - api.logoutUser(); - } - - 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; - } + UserApi api = null; + + @Before + public void setup() { + api = new UserApi(); + } + + @Test + public void testCreateUser() throws Exception { + User user = createUser(); + + api.createUser(user); + + User fetched = api.getUserByName(user.getUsername()); + 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})); + + User fetched = api.getUserByName(user1.getUsername()); + 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})); + + User fetched = api.getUserByName(user1.getUsername()); + assertEquals(user1.getId(), fetched.getId()); + } + + @Test + public void testLoginUser() throws Exception { + User user = createUser(); + api.createUser(user); + + String token = api.loginUser(user.getUsername(), user.getPassword()); + assertTrue(token.startsWith("logged in user session:")); + } + + @Test + public void logoutUser() throws Exception { + api.logoutUser(); + } + + 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 diff --git a/samples/client/petstore/async-scala/build.sbt b/samples/client/petstore/async-scala/build.sbt index e612d5937ea..1d7306d541d 100644 --- a/samples/client/petstore/async-scala/build.sbt +++ b/samples/client/petstore/async-scala/build.sbt @@ -3,10 +3,10 @@ organization := "" name := "-client" libraryDependencies ++= Seq( - "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5", - "joda-time" % "joda-time" % "2.3", - "org.joda" % "joda-convert" % "1.3.1", - "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided", - "org.scalatest" %% "scalatest" % "2.2.1" % "test", - "junit" % "junit" % "4.11" % "test" +"com.wordnik" %% "swagger-async-httpclient" % "0.3.5", +"joda-time" % "joda-time" % "2.3", +"org.joda" % "joda-convert" % "1.3.1", +"ch.qos.logback" % "logback-classic" % "1.0.13" % "provided", +"org.scalatest" %% "scalatest" % "2.2.1" % "test", +"junit" % "junit" % "4.11" % "test" ) diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala index 94b3d65f3df..92262387823 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala @@ -2,26 +2,26 @@ package io.swagger.client import io.swagger.client.api._ -import com.wordnik.swagger.client._ +import io.swagger.client._ import java.io.Closeable class SwaggerClient(config: SwaggerConfig) extends Closeable { - val locator = config.locator - val name = config.name - - private[this] val client = transportClient - - protected def transportClient: TransportClient = new RestClient(config) - - val user = new UserApi(client, config) - - val pet = new PetApi(client, config) - - val store = new StoreApi(client, config) - - - def close() { - client.close() - } +val locator = config.locator +val name = config.name + +private[this] val client = transportClient + +protected def transportClient: TransportClient = new RestClient(config) + + val user = new UserApi(client, config) + + val pet = new PetApi(client, config) + + val store = new StoreApi(client, config) + + +def close() { +client.close() +} } \ No newline at end of file diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala index 3ac13f724dc..5138049a22a 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala @@ -2,192 +2,192 @@ package io.swagger.client.api import io.swagger.client.model.Pet import java.io.File -import com.wordnik.swagger.client._ +import io.swagger.client._ import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import collection.mutable -class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { - - - def updatePet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/pet")) - - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { + def updatePet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/pet")) - + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + - - def addPet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/pet")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def addPet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/pet")) - + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + - - def findPetsByStatus(status: List[String])(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = { - // create path and map variables - val path = (addFmt("/pet/findByStatus")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def findPetsByStatus(status: List[String] = available)(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = { + // create path and map variables + val path = (addFmt("/pet/findByStatus")) - - if(status != null) queryParams += "status" -> status.toString + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + + if(status != null) queryParams += "status" -> status.toString - - def findPetsByTags(tags: List[String])(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = { - // create path and map variables - val path = (addFmt("/pet/findByTags")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def findPetsByTags(tags: List[String])(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = { + // create path and map variables + val path = (addFmt("/pet/findByTags")) - - if(tags != null) queryParams += "tags" -> tags.toString + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + + if(tags != null) queryParams += "tags" -> tags.toString - - def getPetById(petId: Long)(implicit reader: ClientResponseReader[Pet]): Future[Pet] = { - // create path and map variables - val path = (addFmt("/pet/{petId}") - replaceAll ("\\{" + "petId" + "\\}",petId.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def getPetById(petId: Long)(implicit reader: ClientResponseReader[Pet]): Future[Pet] = { + // create path and map variables + val path = (addFmt("/pet/{petId}") + replaceAll ("\\{" + "petId" + "\\}",petId.toString)) - + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + - - def updatePetWithForm(petId: String, - name: String, - status: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/pet/{petId}") - replaceAll ("\\{" + "petId" + "\\}",petId.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def updatePetWithForm(petId: String, + name: String, + status: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/pet/{petId}") + replaceAll ("\\{" + "petId" + "\\}",petId.toString)) - + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + - - def deletePet(api_key: String, - petId: Long)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/pet/{petId}") - replaceAll ("\\{" + "petId" + "\\}",petId.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def deletePet(apiKey: String, + petId: Long)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/pet/{petId}") + replaceAll ("\\{" + "petId" + "\\}",petId.toString)) - + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - headerParams += "api_key" -> api_key.toString + - val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + - - def uploadFile(petId: Long, - additionalMetadata: String, - file: File)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/pet/{petId}/uploadImage") - replaceAll ("\\{" + "petId" + "\\}",petId.toString)) + headerParams += "api_key" -> apiKey.toString - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def uploadFile(petId: Long, + additionalMetadata: String, + file: File)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/pet/{petId}/uploadImage") + replaceAll ("\\{" + "petId" + "\\}",petId.toString)) - + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + + + - + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } -} + + + } diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala index 60011e73b6d..c98675739de 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala @@ -1,99 +1,99 @@ package io.swagger.client.api import io.swagger.client.model.Order -import com.wordnik.swagger.client._ +import io.swagger.client._ import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import collection.mutable -class StoreApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { + class StoreApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { - - def getInventory()(implicit reader: ClientResponseReader[Map[String, Integer]]): Future[Map[String, Integer]] = { - // create path and map variables - val path = (addFmt("/store/inventory")) + + def getInventory()(implicit reader: ClientResponseReader[Map[String, Integer]]): Future[Map[String, Integer]] = { + // create path and map variables + val path = (addFmt("/store/inventory")) - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - + + + + + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def placeOrder(body: Order)(implicit reader: ClientResponseReader[Order], writer: RequestWriter[Order]): Future[Order] = { + // create path and map variables + val path = (addFmt("/store/order")) - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def placeOrder(body: Order)(implicit reader: ClientResponseReader[Order], writer: RequestWriter[Order]): Future[Order] = { - // create path and map variables - val path = (addFmt("/store/order")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def getOrderById(orderId: String)(implicit reader: ClientResponseReader[Order]): Future[Order] = { + // create path and map variables + val path = (addFmt("/store/order/{orderId}") + replaceAll ("\\{" + "orderId" + "\\}",orderId.toString)) - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def getOrderById(orderId: String)(implicit reader: ClientResponseReader[Order]): Future[Order] = { - // create path and map variables - val path = (addFmt("/store/order/{orderId}") - replaceAll ("\\{" + "orderId" + "\\}",orderId.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def deleteOrder(orderId: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/store/order/{orderId}") + replaceAll ("\\{" + "orderId" + "\\}",orderId.toString)) - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def deleteOrder(orderId: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/store/order/{orderId}") - replaceAll ("\\{" + "orderId" + "\\}",orderId.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } - val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) } - } - - - -} diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala index 778d1cae177..3b8ba3cdc2e 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala @@ -1,188 +1,188 @@ package io.swagger.client.api import io.swagger.client.model.User -import com.wordnik.swagger.client._ +import io.swagger.client._ import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import collection.mutable -class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { + class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) { - - def createUser(body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/user")) + + def createUser(body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/user")) - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - + - + + + + + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def createUsersWithArrayInput(body: List[User])(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/user/createWithArray")) - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def createUsersWithArrayInput(body: List[User])(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/user/createWithArray")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def createUsersWithListInput(body: List[User])(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/user/createWithList")) - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def createUsersWithListInput(body: List[User])(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/user/createWithList")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def loginUser(username: String, + password: String)(implicit reader: ClientResponseReader[String]): Future[String] = { + // create path and map variables + val path = (addFmt("/user/login")) - val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def loginUser(username: String, - password: String)(implicit reader: ClientResponseReader[String]): Future[String] = { - // create path and map variables - val path = (addFmt("/user/login")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + + if(username != null) queryParams += "username" -> username.toString + if(password != null) queryParams += "password" -> password.toString - + - - if(username != null) queryParams += "username" -> username.toString - if(password != null) queryParams += "password" -> password.toString + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def logoutUser()(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/user/logout")) - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def logoutUser()(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/user/logout")) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def getUserByName(username: String)(implicit reader: ClientResponseReader[User]): Future[User] = { + // create path and map variables + val path = (addFmt("/user/{username}") + replaceAll ("\\{" + "username" + "\\}",username.toString)) - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def getUserByName(username: String)(implicit reader: ClientResponseReader[User]): Future[User] = { - // create path and map variables - val path = (addFmt("/user/{username}") - replaceAll ("\\{" + "username" + "\\}",username.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def updateUser(username: String, + body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/user/{username}") + replaceAll ("\\{" + "username" + "\\}",username.toString)) - val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def updateUser(username: String, - body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/user/{username}") - replaceAll ("\\{" + "username" + "\\}",username.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body)) + resFuture flatMap { resp => + process(reader.read(resp)) + } + } + def deleteUser(username: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { + // create path and map variables + val path = (addFmt("/user/{username}") + replaceAll ("\\{" + "username" + "\\}",username.toString)) - val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body)) - resFuture flatMap { resp => - process(reader.read(resp)) - } - } + // query params + val queryParams = new mutable.HashMap[String, String] + val headerParams = new mutable.HashMap[String, String] - - def deleteUser(username: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = { - // create path and map variables - val path = (addFmt("/user/{username}") - replaceAll ("\\{" + "username" + "\\}",username.toString)) + - // query params - val queryParams = new mutable.HashMap[String, String] - val headerParams = new mutable.HashMap[String, String] + - + - + val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "") + resFuture flatMap { resp => + process(reader.read(resp)) + } + } - val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "") - resFuture flatMap { resp => - process(reader.read(resp)) } - } - - - -} diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala index 1b410e7c59e..a19b846e875 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala @@ -3,8 +3,10 @@ package io.swagger.client.model import org.joda.time.DateTime -case class Category ( - id: Long, - name: String - -) + + case class Category ( + id: Long, + name: String + + ) + diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala index f7a10a44965..4e847e74b27 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala @@ -3,12 +3,14 @@ package io.swagger.client.model import org.joda.time.DateTime -case class Order ( - id: Long, - petId: Long, - quantity: Integer, - shipDate: DateTime, - status: String, // Order Status - complete: Boolean - -) + + case class Order ( + id: Long, + petId: Long, + quantity: Integer, + shipDate: DateTime, + status: String, // Order Status + complete: Boolean + + ) + diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala index 7e76c72914b..d7da69df9ee 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala @@ -3,12 +3,14 @@ package io.swagger.client.model import org.joda.time.DateTime -case class Pet ( - id: Long, - category: Category, - name: String, - photoUrls: List[String], - tags: List[Tag], - status: String // pet status in the store - -) + + case class Pet ( + id: Long, + category: Category, + name: String, + photoUrls: List[String], + tags: List[Tag], + status: String // pet status in the store + + ) + diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala index 9dfe60d36f8..aa2a883063f 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala @@ -3,8 +3,10 @@ package io.swagger.client.model import org.joda.time.DateTime -case class Tag ( - id: Long, - name: String - -) + + case class Tag ( + id: Long, + name: String + + ) + diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala index 598adae451a..692ec715347 100644 --- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala +++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala @@ -3,14 +3,16 @@ package io.swagger.client.model import org.joda.time.DateTime -case class User ( - id: Long, - username: String, - firstName: String, - lastName: String, - email: String, - password: String, - phone: String, - userStatus: Integer // User Status - -) + + case class User ( + id: Long, + username: String, + firstName: String, + lastName: String, + email: String, + password: String, + phone: String, + userStatus: Integer // User Status + + ) + diff --git a/samples/client/petstore/async-scala/src/test/scala/Test.scala b/samples/client/petstore/async-scala/src/test/scala/Test.scala index 9d716645baa..d880fcb7f9c 100644 --- a/samples/client/petstore/async-scala/src/test/scala/Test.scala +++ b/samples/client/petstore/async-scala/src/test/scala/Test.scala @@ -1,21 +1,8 @@ -import io.swagger.client.SwaggerClient -import io.swagger.client.api._ -import com.wordnik.swagger.client._ -import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ -import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ - -import org.json4s.Formats +import java.net.URI import scala.concurrent._ import scala.concurrent.duration._ -import scala.util.{Success, Failure} -import scala.concurrent.ExecutionContext.Implicits.global -import java.net.URI - -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner -import org.scalatest.FlatSpec -import org.scalatest.Matchers +import scala.util.{Failure, Success} @RunWith(classOf[JUnitRunner]) class SimpleTest extends FlatSpec with Matchers { diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs index 1f7ddccfb26..4d99ab9e531 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs @@ -1,384 +1,1040 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; using RestSharp; using IO.Swagger.Client; using IO.Swagger.Model; namespace IO.Swagger.Api { - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class PetApi { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// + + public interface IPetApi { + + /// + + /// Update an existing pet + /// + + /// + Pet object that needs to be added to the store + /// + + void UpdatePet (Pet Body); + + /// + + /// Update an existing pet + /// + + /// + Pet object that needs to be added to the store + /// + + Task UpdatePetAsync (Pet Body); + + /// + + /// Add a new pet to the store + /// + + /// + Pet object that needs to be added to the store + /// + + void AddPet (Pet Body); + + /// + + /// Add a new pet to the store + /// + + /// + Pet object that needs to be added to the store + /// + + Task AddPetAsync (Pet Body); + + /// + + /// Finds Pets by status Multiple status values can be provided with comma seperated strings + /// + + /// + Status values that need to be considered for filter + /// + List + List FindPetsByStatus (List Status); + + /// + + /// Finds Pets by status Multiple status values can be provided with comma seperated strings + /// + + /// + Status values that need to be considered for filter + /// + List + Task> FindPetsByStatusAsync (List Status); + + /// + + /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + /// + + /// + Tags to filter by + /// + List + List FindPetsByTags (List Tags); + + /// + + /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + /// + + /// + Tags to filter by + /// + List + Task> FindPetsByTagsAsync (List Tags); + + /// + + /// Find pet by ID Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + /// + + /// + ID of pet that needs to be fetched + /// + Pet + Pet GetPetById (long? PetId); + + /// + + /// Find pet by ID Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + /// + + /// + ID of pet that needs to be fetched + /// + Pet + Task GetPetByIdAsync (long? PetId); + + /// + + /// Updates a pet in the store with form data + /// + + /// + ID of pet that needs to be updated/// + Updated name of the pet/// + Updated status of the pet + /// + + void UpdatePetWithForm (string PetId, string Name, string Status); + + /// + + /// Updates a pet in the store with form data + /// + + /// + ID of pet that needs to be updated/// + Updated name of the pet/// + Updated status of the pet + /// + + Task UpdatePetWithFormAsync (string PetId, string Name, string Status); + + /// + + /// Deletes a pet + /// + + /// + /// + Pet id to delete + /// + + void DeletePet (string ApiKey, long? PetId); + + /// + + /// Deletes a pet + /// + + /// + /// + Pet id to delete + /// + + Task DeletePetAsync (string ApiKey, long? PetId); + + /// + + /// uploads an image + /// + + /// + ID of pet to update/// + Additional data to pass to server/// + file to upload + /// + + void UploadFile (long? PetId, string AdditionalMetadata, string File); + + /// + + /// uploads an image + /// + + /// + ID of pet to update/// + Additional data to pass to server/// + file to upload + /// + + Task UploadFileAsync (long? PetId, string AdditionalMetadata, string File); + + } + + /// + + /// Represents a collection of functions to interact with the API endpoints + /// + + public class PetApi : IPetApi { + + /// + + /// Initializes a new instance of the + + class. + /// + + /// + an instance of ApiClient (optional) + /// + public PetApi(ApiClient apiClient = null) { - if (apiClient == null) { // use the default one in Configuration - this.apiClient = Configuration.apiClient; - } else { - this.apiClient = apiClient; - } + if (apiClient == null) { // use the default one in Configuration + this.apiClient = Configuration.apiClient; + } else { + this.apiClient = apiClient; + } } - /// - /// Initializes a new instance of the class. - /// - /// + /// + + /// Initializes a new instance of the + + class. + /// + + /// + public PetApi(String basePath) { - this.apiClient = new ApiClient(basePath); + this.apiClient = new ApiClient(basePath); } - /// - /// Sets the base path of the API client. - /// - /// The base path + /// + + /// Sets the base path of the API client. + /// + + /// + The base path public void SetBasePath(String basePath) { - this.apiClient.basePath = basePath; + this.apiClient.basePath = basePath; } - /// - /// Gets the base path of the API client. - /// - /// The base path + /// + + /// Gets the base path of the API client. + /// + + /// + The base path public String GetBasePath(String basePath) { - return this.apiClient.basePath; + return this.apiClient.basePath; } - /// - /// Gets or sets the API client. - /// - /// The API client + /// + + /// Gets or sets the API client. + /// + + /// + The API client public ApiClient apiClient {get; set;} - /// - /// Update an existing pet - /// - /// Pet object that needs to be added to the store - /// - public void UpdatePet (Pet Body) { - - - - var path = "/pet"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content); - } - - return; - } + /// + + /// Update an existing pet + /// + + /// + Pet object that needs to be added to the store + /// + + public void UpdatePet (Pet Body) { + + + + var path = "/pet"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Update an existing pet + /// + + /// + Pet object that needs to be added to the store + /// + + public async Task UpdatePetAsync (Pet Body) { + + + + var path = "/pet"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content); + } + + return; + } - /// - /// Add a new pet to the store - /// - /// Pet object that needs to be added to the store - /// - public void AddPet (Pet Body) { - - - - var path = "/pet"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content); - } - - return; - } + /// + + /// Add a new pet to the store + /// + + /// + Pet object that needs to be added to the store + /// + + public void AddPet (Pet Body) { + + + + var path = "/pet"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Add a new pet to the store + /// + + /// + Pet object that needs to be added to the store + /// + + public async Task AddPetAsync (Pet Body) { + + + + var path = "/pet"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content); + } + + return; + } - /// - /// Finds Pets by status Multiple status values can be provided with comma seperated strings - /// - /// Status values that need to be considered for filter - /// List - public List FindPetsByStatus (List Status) { - - - - var path = "/pet/findByStatus"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter - - - - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content); - } - return (List) apiClient.Deserialize(response.Content, typeof(List)); - } + /// + + /// Finds Pets by status Multiple status values can be provided with comma seperated strings + /// + + /// + Status values that need to be considered for filter + /// + List + public List FindPetsByStatus (List Status) { + + + + var path = "/pet/findByStatus"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Finds Pets by status Multiple status values can be provided with comma seperated strings + /// + + /// + Status values that need to be considered for filter + /// + List + public async Task> FindPetsByStatusAsync (List Status) { + + + + var path = "/pet/findByStatus"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content); + } + return (List) ApiInvoker.Deserialize(response.Content, typeof(List)); + } - /// - /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. - /// - /// Tags to filter by - /// List - public List FindPetsByTags (List Tags) { - - - - var path = "/pet/findByTags"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter - - - - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content); - } - return (List) apiClient.Deserialize(response.Content, typeof(List)); - } + /// + + /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + /// + + /// + Tags to filter by + /// + List + public List FindPetsByTags (List Tags) { + + + + var path = "/pet/findByTags"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + /// + + /// + Tags to filter by + /// + List + public async Task> FindPetsByTagsAsync (List Tags) { + + + + var path = "/pet/findByTags"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content); + } + return (List) ApiInvoker.Deserialize(response.Content, typeof(List)); + } - /// - /// Find pet by ID Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions - /// - /// ID of pet that needs to be fetched - /// Pet - public Pet GetPetById (long? PetId) { - - - // verify the required parameter 'PetId' is set - if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { "api_key", "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content); - } - return (Pet) apiClient.Deserialize(response.Content, typeof(Pet)); - } + /// + + /// Find pet by ID Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + /// + + /// + ID of pet that needs to be fetched + /// + Pet + public Pet GetPetById (long? PetId) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById"); + + + var path = "/pet/{petId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "api_key", "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Find pet by ID Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + /// + + /// + ID of pet that needs to be fetched + /// + Pet + public async Task GetPetByIdAsync (long? PetId) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById"); + + + var path = "/pet/{petId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "api_key", "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content); + } + return (Pet) ApiInvoker.Deserialize(response.Content, typeof(Pet)); + } - /// - /// Updates a pet in the store with form data - /// - /// ID of pet that needs to be updated - /// Updated name of the pet - /// Updated status of the pet - /// - public void UpdatePetWithForm (string PetId, string Name, string Status) { - - - // verify the required parameter 'PetId' is set - if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter - if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter - - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content); - } - - return; - } + /// + + /// Updates a pet in the store with form data + /// + + /// + ID of pet that needs to be updated/// + Updated name of the pet/// + Updated status of the pet + /// + + public void UpdatePetWithForm (string PetId, string Name, string Status) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm"); + + + var path = "/pet/{petId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter + if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Updates a pet in the store with form data + /// + + /// + ID of pet that needs to be updated/// + Updated name of the pet/// + Updated status of the pet + /// + + public async Task UpdatePetWithFormAsync (string PetId, string Name, string Status) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm"); + + + var path = "/pet/{petId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter + if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content); + } + + return; + } - /// - /// Deletes a pet - /// - /// - /// Pet id to delete - /// - public void DeletePet (string ApiKey, long? PetId) { - - - // verify the required parameter 'PetId' is set - if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter - - - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content); - } - - return; - } + /// + + /// Deletes a pet + /// + + /// + /// + Pet id to delete + /// + + public void DeletePet (string ApiKey, long? PetId) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet"); + + + var path = "/pet/{petId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter + + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Deletes a pet + /// + + /// + /// + Pet id to delete + /// + + public async Task DeletePetAsync (string ApiKey, long? PetId) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet"); + + + var path = "/pet/{petId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter + + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content); + } + + return; + } - /// - /// uploads an image - /// - /// ID of pet to update - /// Additional data to pass to server - /// file to upload - /// - public void UploadFile (long? PetId, string AdditionalMetadata, string File) { - - - // verify the required parameter 'PetId' is set - if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile"); - - - var path = "/pet/{petId}/uploadImage"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter - if (File != null) fileParams.Add("file", File); - - - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content); - } - - return; - } + /// + + /// uploads an image + /// + + /// + ID of pet to update/// + Additional data to pass to server/// + file to upload + /// + + public void UploadFile (long? PetId, string AdditionalMetadata, string File) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile"); + + + var path = "/pet/{petId}/uploadImage"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter + if (File != null) fileParams.Add("file", File); + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content); + } + + return; + } + + /// + + /// uploads an image + /// + + /// + ID of pet to update/// + Additional data to pass to server/// + file to upload + /// + + public async Task UploadFileAsync (long? PetId, string AdditionalMetadata, string File) { + + + // verify the required parameter 'PetId' is set + if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile"); + + + var path = "/pet/{petId}/uploadImage"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter + if (File != null) fileParams.Add("file", File); + + + + // authentication setting, if any + String[] authSettings = new String[] { "petstore_auth" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content); + } + + return; + } - } - + } } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs index a789b3502a0..f77decdf5f9 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs @@ -1,214 +1,540 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; using RestSharp; using IO.Swagger.Client; using IO.Swagger.Model; namespace IO.Swagger.Api { - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class StoreApi { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// + + public interface IStoreApi { + + /// + + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + + + /// + Dictionary + Dictionary GetInventory (); + + /// + + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + + + /// + Dictionary + Task> GetInventoryAsync (); + + /// + + /// Place an order for a pet + /// + + /// + order placed for purchasing the pet + /// + Order + Order PlaceOrder (Order Body); + + /// + + /// Place an order for a pet + /// + + /// + order placed for purchasing the pet + /// + Order + Task PlaceOrderAsync (Order Body); + + /// + + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + /// + + /// + ID of pet that needs to be fetched + /// + Order + Order GetOrderById (string OrderId); + + /// + + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + /// + + /// + ID of pet that needs to be fetched + /// + Order + Task GetOrderByIdAsync (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 + /// + + /// + ID of the order that needs to be deleted + /// + + void DeleteOrder (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 + /// + + /// + ID of the order that needs to be deleted + /// + + Task DeleteOrderAsync (string OrderId); + + } + + /// + + /// Represents a collection of functions to interact with the API endpoints + /// + + public class StoreApi : IStoreApi { + + /// + + /// Initializes a new instance of the + + class. + /// + + /// + an instance of ApiClient (optional) + /// + public StoreApi(ApiClient apiClient = null) { - if (apiClient == null) { // use the default one in Configuration - this.apiClient = Configuration.apiClient; - } else { - this.apiClient = apiClient; - } + if (apiClient == null) { // use the default one in Configuration + this.apiClient = Configuration.apiClient; + } else { + this.apiClient = apiClient; + } } - /// - /// Initializes a new instance of the class. - /// - /// + /// + + /// Initializes a new instance of the + + class. + /// + + /// + public StoreApi(String basePath) { - this.apiClient = new ApiClient(basePath); + this.apiClient = new ApiClient(basePath); } - /// - /// Sets the base path of the API client. - /// - /// The base path + /// + + /// Sets the base path of the API client. + /// + + /// + The base path public void SetBasePath(String basePath) { - this.apiClient.basePath = basePath; + this.apiClient.basePath = basePath; } - /// - /// Gets the base path of the API client. - /// - /// The base path + /// + + /// Gets the base path of the API client. + /// + + /// + The base path public String GetBasePath(String basePath) { - return this.apiClient.basePath; + return this.apiClient.basePath; } - /// - /// Gets or sets the API client. - /// - /// The API client + /// + + /// Gets or sets the API client. + /// + + /// + The API client public ApiClient apiClient {get; set;} - /// - /// Returns pet inventories by status Returns a map of status codes to quantities - /// - /// Dictionary - public Dictionary GetInventory () { - - - - var path = "/store/inventory"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { "api_key" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content); - } - return (Dictionary) apiClient.Deserialize(response.Content, typeof(Dictionary)); - } + /// + + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + + + /// + Dictionary + public Dictionary GetInventory () { + + + + var path = "/store/inventory"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "api_key" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + + + /// + Dictionary + public async Task> GetInventoryAsync () { + + + + var path = "/store/inventory"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { "api_key" }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content); + } + return (Dictionary) ApiInvoker.Deserialize(response.Content, typeof(Dictionary)); + } - /// - /// Place an order for a pet - /// - /// order placed for purchasing the pet - /// Order - public Order PlaceOrder (Order Body) { - - - - var path = "/store/order"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content); - } - return (Order) apiClient.Deserialize(response.Content, typeof(Order)); - } + /// + + /// Place an order for a pet + /// + + /// + order placed for purchasing the pet + /// + Order + public Order PlaceOrder (Order Body) { + + + + var path = "/store/order"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Place an order for a pet + /// + + /// + order placed for purchasing the pet + /// + Order + public async Task PlaceOrderAsync (Order Body) { + + + + var path = "/store/order"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content); + } + return (Order) ApiInvoker.Deserialize(response.Content, typeof(Order)); + } - /// - /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - /// - /// ID of pet that needs to be fetched - /// Order - public Order GetOrderById (string OrderId) { - - - // verify the required parameter 'OrderId' is set - if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById"); - - - var path = "/store/order/{orderId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content); - } - return (Order) apiClient.Deserialize(response.Content, typeof(Order)); - } + /// + + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + /// + + /// + ID of pet that needs to be fetched + /// + Order + public Order GetOrderById (string OrderId) { + + + // verify the required parameter 'OrderId' is set + if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById"); + + + var path = "/store/order/{orderId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + /// + + /// + ID of pet that needs to be fetched + /// + Order + public async Task GetOrderByIdAsync (string OrderId) { + + + // verify the required parameter 'OrderId' is set + if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById"); + + + var path = "/store/order/{orderId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content); + } + return (Order) ApiInvoker.Deserialize(response.Content, typeof(Order)); + } - /// - /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - /// - /// ID of the order that needs to be deleted - /// - public void DeleteOrder (string OrderId) { - - - // verify the required parameter 'OrderId' is set - if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder"); - - - var path = "/store/order/{orderId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content); - } - - return; - } + /// + + /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + + /// + ID of the order that needs to be deleted + /// + + public void DeleteOrder (string OrderId) { + + + // verify the required parameter 'OrderId' is set + if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder"); + + + var path = "/store/order/{orderId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + + /// + ID of the order that needs to be deleted + /// + + public async Task DeleteOrderAsync (string OrderId) { + + + // verify the required parameter 'OrderId' is set + if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder"); + + + var path = "/store/order/{orderId}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content); + } + + return; + } - } - + } } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs index 35de41c2257..608ac49ab02 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs @@ -1,374 +1,1012 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; using RestSharp; using IO.Swagger.Client; using IO.Swagger.Model; namespace IO.Swagger.Api { - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class UserApi { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// + + public interface IUserApi { + + /// + + /// Create user This can only be done by the logged in user. + /// + + /// + Created user object + /// + + void CreateUser (User Body); + + /// + + /// Create user This can only be done by the logged in user. + /// + + /// + Created user object + /// + + Task CreateUserAsync (User Body); + + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + void CreateUsersWithArrayInput (List Body); + + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + Task CreateUsersWithArrayInputAsync (List Body); + + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + void CreateUsersWithListInput (List Body); + + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + Task CreateUsersWithListInputAsync (List Body); + + /// + + /// Logs user into the system + /// + + /// + The user name for login/// + The password for login in clear text + /// + string + string LoginUser (string Username, string Password); + + /// + + /// Logs user into the system + /// + + /// + The user name for login/// + The password for login in clear text + /// + string + Task LoginUserAsync (string Username, string Password); + + /// + + /// Logs out current logged in user session + /// + + + /// + + void LogoutUser (); + + /// + + /// Logs out current logged in user session + /// + + + /// + + Task LogoutUserAsync (); + + /// + + /// Get user by user name + /// + + /// + The name that needs to be fetched. Use user1 for testing. + /// + User + User GetUserByName (string Username); + + /// + + /// Get user by user name + /// + + /// + The name that needs to be fetched. Use user1 for testing. + /// + User + Task GetUserByNameAsync (string Username); + + /// + + /// Updated user This can only be done by the logged in user. + /// + + /// + name that need to be deleted/// + Updated user object + /// + + void UpdateUser (string Username, User Body); + + /// + + /// Updated user This can only be done by the logged in user. + /// + + /// + name that need to be deleted/// + Updated user object + /// + + Task UpdateUserAsync (string Username, User Body); + + /// + + /// Delete user This can only be done by the logged in user. + /// + + /// + The name that needs to be deleted + /// + + void DeleteUser (string Username); + + /// + + /// Delete user This can only be done by the logged in user. + /// + + /// + The name that needs to be deleted + /// + + Task DeleteUserAsync (string Username); + + } + + /// + + /// Represents a collection of functions to interact with the API endpoints + /// + + public class UserApi : IUserApi { + + /// + + /// Initializes a new instance of the + + class. + /// + + /// + an instance of ApiClient (optional) + /// + public UserApi(ApiClient apiClient = null) { - if (apiClient == null) { // use the default one in Configuration - this.apiClient = Configuration.apiClient; - } else { - this.apiClient = apiClient; - } + if (apiClient == null) { // use the default one in Configuration + this.apiClient = Configuration.apiClient; + } else { + this.apiClient = apiClient; + } } - /// - /// Initializes a new instance of the class. - /// - /// + /// + + /// Initializes a new instance of the + + class. + /// + + /// + public UserApi(String basePath) { - this.apiClient = new ApiClient(basePath); + this.apiClient = new ApiClient(basePath); } - /// - /// Sets the base path of the API client. - /// - /// The base path + /// + + /// Sets the base path of the API client. + /// + + /// + The base path public void SetBasePath(String basePath) { - this.apiClient.basePath = basePath; + this.apiClient.basePath = basePath; } - /// - /// Gets the base path of the API client. - /// - /// The base path + /// + + /// Gets the base path of the API client. + /// + + /// + The base path public String GetBasePath(String basePath) { - return this.apiClient.basePath; + return this.apiClient.basePath; } - /// - /// Gets or sets the API client. - /// - /// The API client + /// + + /// Gets or sets the API client. + /// + + /// + The API client public ApiClient apiClient {get; set;} - /// - /// Create user This can only be done by the logged in user. - /// - /// Created user object - /// - public void CreateUser (User Body) { - - - - var path = "/user"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content); - } - - return; - } + /// + + /// Create user This can only be done by the logged in user. + /// + + /// + Created user object + /// + + public void CreateUser (User Body) { + + + + var path = "/user"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Create user This can only be done by the logged in user. + /// + + /// + Created user object + /// + + public async Task CreateUserAsync (User Body) { + + + + var path = "/user"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content); + } + + return; + } - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - public void CreateUsersWithArrayInput (List Body) { - - - - var path = "/user/createWithArray"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content); - } - - return; - } + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + public void CreateUsersWithArrayInput (List Body) { + + + + var path = "/user/createWithArray"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + public async Task CreateUsersWithArrayInputAsync (List Body) { + + + + var path = "/user/createWithArray"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content); + } + + return; + } - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - public void CreateUsersWithListInput (List Body) { - - - - var path = "/user/createWithList"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content); - } - - return; - } + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + public void CreateUsersWithListInput (List Body) { + + + + var path = "/user/createWithList"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Creates list of users with given input array + /// + + /// + List of user object + /// + + public async Task CreateUsersWithListInputAsync (List Body) { + + + + var path = "/user/createWithList"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content); + } + + return; + } - /// - /// Logs user into the system - /// - /// The user name for login - /// The password for login in clear text - /// string - public string LoginUser (string Username, string Password) { - - - - var path = "/user/login"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter - if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter - - - - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content); - } - return (string) apiClient.Deserialize(response.Content, typeof(string)); - } + /// + + /// Logs user into the system + /// + + /// + The user name for login/// + The password for login in clear text + /// + string + public string LoginUser (string Username, string Password) { + + + + var path = "/user/login"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter + if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Logs user into the system + /// + + /// + The user name for login/// + The password for login in clear text + /// + string + public async Task LoginUserAsync (string Username, string Password) { + + + + var path = "/user/login"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter + if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content); + } + return (string) ApiInvoker.Deserialize(response.Content, typeof(string)); + } - /// - /// Logs out current logged in user session - /// - /// - public void LogoutUser () { - - - - var path = "/user/logout"; - path = path.Replace("{format}", "json"); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content); - } - - return; - } + /// + + /// Logs out current logged in user session + /// + + + /// + + public void LogoutUser () { + + + + var path = "/user/logout"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Logs out current logged in user session + /// + + + /// + + public async Task LogoutUserAsync () { + + + + var path = "/user/logout"; + path = path.Replace("{format}", "json"); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content); + } + + return; + } - /// - /// Get user by user name - /// - /// The name that needs to be fetched. Use user1 for testing. - /// User - public User GetUserByName (string Username) { - - - // verify the required parameter 'Username' is set - if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content); - } - return (User) apiClient.Deserialize(response.Content, typeof(User)); - } + /// + + /// Get user by user name + /// + + /// + The name that needs to be fetched. Use user1 for testing. + /// + User + public User GetUserByName (string Username) { + + + // verify the required parameter 'Username' is set + if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName"); + + + var path = "/user/{username}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, 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)); + } + + /// + + /// Get user by user name + /// + + /// + The name that needs to be fetched. Use user1 for testing. + /// + User + public async Task GetUserByNameAsync (string Username) { + + + // verify the required parameter 'Username' is set + if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName"); + + + var path = "/user/{username}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content); + } + return (User) ApiInvoker.Deserialize(response.Content, typeof(User)); + } - /// - /// Updated user This can only be done by the logged in user. - /// - /// name that need to be deleted - /// Updated user object - /// - public void UpdateUser (string Username, User Body) { - - - // verify the required parameter 'Username' is set - if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - postBody = apiClient.Serialize(Body); // http body (model) parameter - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content); - } - - return; - } + /// + + /// Updated user This can only be done by the logged in user. + /// + + /// + name that need to be deleted/// + Updated user object + /// + + public void UpdateUser (string Username, User Body) { + + + // verify the required parameter 'Username' is set + if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser"); + + + var path = "/user/{username}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Updated user This can only be done by the logged in user. + /// + + /// + name that need to be deleted/// + Updated user object + /// + + public async Task UpdateUserAsync (string Username, User Body) { + + + // verify the required parameter 'Username' is set + if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser"); + + + var path = "/user/{username}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + postBody = apiClient.Serialize(Body); // http body (model) parameter + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content); + } + + return; + } - /// - /// Delete user This can only be done by the logged in user. - /// - /// The name that needs to be deleted - /// - public void DeleteUser (string Username) { - - - // verify the required parameter 'Username' is set - if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); - - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - - - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) { - throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content); - } - - return; - } + /// + + /// Delete user This can only be done by the logged in user. + /// + + /// + The name that needs to be deleted + /// + + public void DeleteUser (string Username) { + + + // verify the required parameter 'Username' is set + if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser"); + + + var path = "/user/{username}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content); + } + + return; + } + + /// + + /// Delete user This can only be done by the logged in user. + /// + + /// + The name that needs to be deleted + /// + + public async Task DeleteUserAsync (string Username) { + + + // verify the required parameter 'Username' is set + if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser"); + + + var path = "/user/{username}"; + path = path.Replace("{format}", "json"); + path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username)); + + + var queryParams = new Dictionary + (); + var headerParams = new Dictionary + (); + var formParams = new Dictionary + (); + var fileParams = new Dictionary + (); + String postBody = null; + + + + + + + // authentication setting, if any + String[] authSettings = new String[] { }; + + // make the HTTP request + IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); + if (((int)response.StatusCode) >= 400) { + throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content); + } + + return; + } - } - + } } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs index 74121762af9..df423c7ac41 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs @@ -5,50 +5,58 @@ using System.Runtime.Serialization; using Newtonsoft.Json; -namespace IO.Swagger.Model { - - /// - /// - /// - [DataContract] - public class Category { - - [DataMember(Name="id", EmitDefaultValue=false)] - public long? Id { get; set; } + namespace IO.Swagger.Model { - - - [DataMember(Name="name", EmitDefaultValue=false)] - public string Name { get; set; } + /// + + /// + /// + + [DataContract] + public class Category { + + + [DataMember(Name="id", EmitDefaultValue=false)] + public long? Id { get; set; } - + + + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var 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(); - } + - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } + /// + + /// Get the string presentation of the object + /// + + /// + String presentation of the object + public override string ToString() { + var 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(); + } -} - - + /// + + /// Get the JSON string presentation of the object + /// + + /// + JSON string presentation of the object + public string ToJson() { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + } + } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs index 7451619050c..71c11fe7d63 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs @@ -5,78 +5,86 @@ using System.Runtime.Serialization; using Newtonsoft.Json; -namespace IO.Swagger.Model { - - /// - /// - /// - [DataContract] - public class Order { - - [DataMember(Name="id", EmitDefaultValue=false)] - public long? Id { get; set; } + namespace IO.Swagger.Model { - - - [DataMember(Name="petId", EmitDefaultValue=false)] - public long? PetId { get; set; } + /// + + /// + /// + + [DataContract] + public class Order { + + + [DataMember(Name="id", EmitDefaultValue=false)] + public long? Id { get; set; } - - - [DataMember(Name="quantity", EmitDefaultValue=false)] - public int? Quantity { get; set; } + + + [DataMember(Name="petId", EmitDefaultValue=false)] + public long? PetId { get; set; } - - - [DataMember(Name="shipDate", EmitDefaultValue=false)] - public DateTime? ShipDate { get; set; } + + + [DataMember(Name="quantity", EmitDefaultValue=false)] + public int? Quantity { get; set; } - - /* Order Status */ - [DataMember(Name="status", EmitDefaultValue=false)] - public string Status { get; set; } + + + [DataMember(Name="shipDate", EmitDefaultValue=false)] + public DateTime? ShipDate { get; set; } - - - [DataMember(Name="complete", EmitDefaultValue=false)] - public bool? Complete { get; set; } + + /* Order Status */ + [DataMember(Name="status", EmitDefaultValue=false)] + public string Status { get; set; } - + + + [DataMember(Name="complete", EmitDefaultValue=false)] + public bool? Complete { get; set; } - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var 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(); - } + - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } + /// + + /// Get the string presentation of the object + /// + + /// + String presentation of the object + public override string ToString() { + var 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(); + } -} - - + /// + + /// Get the JSON string presentation of the object + /// + + /// + JSON string presentation of the object + public string ToJson() { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + } + } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs index 0bfba35b1e3..28285ece28f 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs @@ -5,78 +5,86 @@ using System.Runtime.Serialization; using Newtonsoft.Json; -namespace IO.Swagger.Model { - - /// - /// - /// - [DataContract] - public class Pet { - - [DataMember(Name="id", EmitDefaultValue=false)] - public long? Id { get; set; } + namespace IO.Swagger.Model { - - - [DataMember(Name="category", EmitDefaultValue=false)] - public Category Category { get; set; } + /// + + /// + /// + + [DataContract] + public class Pet { + + + [DataMember(Name="id", EmitDefaultValue=false)] + public long? Id { get; set; } - - - [DataMember(Name="name", EmitDefaultValue=false)] - public string Name { get; set; } + + + [DataMember(Name="category", EmitDefaultValue=false)] + public Category Category { get; set; } - - - [DataMember(Name="photoUrls", EmitDefaultValue=false)] - public List PhotoUrls { get; set; } + + + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } - - - [DataMember(Name="tags", EmitDefaultValue=false)] - public List Tags { get; set; } + + + [DataMember(Name="photoUrls", EmitDefaultValue=false)] + public List PhotoUrls { get; set; } - - /* pet status in the store */ - [DataMember(Name="status", EmitDefaultValue=false)] - public string Status { get; set; } + + + [DataMember(Name="tags", EmitDefaultValue=false)] + public List Tags { get; set; } - + + /* pet status in the store */ + [DataMember(Name="status", EmitDefaultValue=false)] + public string Status { get; set; } - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var 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(); - } + - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } + /// + + /// Get the string presentation of the object + /// + + /// + String presentation of the object + public override string ToString() { + var 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(); + } -} - - + /// + + /// Get the JSON string presentation of the object + /// + + /// + JSON string presentation of the object + public string ToJson() { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + } + } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs index 53901491a47..c802c95946c 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs @@ -5,50 +5,58 @@ using System.Runtime.Serialization; using Newtonsoft.Json; -namespace IO.Swagger.Model { - - /// - /// - /// - [DataContract] - public class Tag { - - [DataMember(Name="id", EmitDefaultValue=false)] - public long? Id { get; set; } + namespace IO.Swagger.Model { - - - [DataMember(Name="name", EmitDefaultValue=false)] - public string Name { get; set; } + /// + + /// + /// + + [DataContract] + public class Tag { + + + [DataMember(Name="id", EmitDefaultValue=false)] + public long? Id { get; set; } - + + + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var 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(); - } + - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } + /// + + /// Get the string presentation of the object + /// + + /// + String presentation of the object + public override string ToString() { + var 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(); + } -} - - + /// + + /// Get the JSON string presentation of the object + /// + + /// + JSON string presentation of the object + public string ToJson() { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + } + } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs index e58d0296a06..b8aa21481b9 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs @@ -5,92 +5,100 @@ using System.Runtime.Serialization; using Newtonsoft.Json; -namespace IO.Swagger.Model { - - /// - /// - /// - [DataContract] - public class User { - - [DataMember(Name="id", EmitDefaultValue=false)] - public long? Id { get; set; } + namespace IO.Swagger.Model { - - - [DataMember(Name="username", EmitDefaultValue=false)] - public string Username { get; set; } + /// + + /// + /// + + [DataContract] + public class User { + + + [DataMember(Name="id", EmitDefaultValue=false)] + public long? Id { get; set; } - - - [DataMember(Name="firstName", EmitDefaultValue=false)] - public string FirstName { get; set; } + + + [DataMember(Name="username", EmitDefaultValue=false)] + public string Username { get; set; } - - - [DataMember(Name="lastName", EmitDefaultValue=false)] - public string LastName { get; set; } + + + [DataMember(Name="firstName", EmitDefaultValue=false)] + public string FirstName { get; set; } - - - [DataMember(Name="email", EmitDefaultValue=false)] - public string Email { get; set; } + + + [DataMember(Name="lastName", EmitDefaultValue=false)] + public string LastName { get; set; } - - - [DataMember(Name="password", EmitDefaultValue=false)] - public string Password { get; set; } + + + [DataMember(Name="email", EmitDefaultValue=false)] + public string Email { get; set; } - - - [DataMember(Name="phone", EmitDefaultValue=false)] - public string Phone { get; set; } + + + [DataMember(Name="password", EmitDefaultValue=false)] + public string Password { get; set; } - - /* User Status */ - [DataMember(Name="userStatus", EmitDefaultValue=false)] - public int? UserStatus { get; set; } + + + [DataMember(Name="phone", EmitDefaultValue=false)] + public string Phone { get; set; } - + + /* User Status */ + [DataMember(Name="userStatus", EmitDefaultValue=false)] + public int? UserStatus { get; set; } - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var 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(); - } + - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } + /// + + /// Get the string presentation of the object + /// + + /// + String presentation of the object + public override string ToString() { + var 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(); + } -} - - + /// + + /// Get the JSON string presentation of the object + /// + + /// + JSON string presentation of the object + public string ToJson() { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + } + } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs index 39d59f063f2..9c0a4190675 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs @@ -4,209 +4,315 @@ using System.Linq; using System.Net; using System.Text; +using System.Threading.Tasks; using Newtonsoft.Json; using RestSharp; namespace IO.Swagger.Client { - /// - /// API client is mainly responible for making the HTTP call to the API backend - /// - public class ApiClient { - - /// - /// Initializes a new instance of the class. - /// - /// The base path. - public ApiClient(String basePath="http://petstore.swagger.io/v2") { - this.basePath = basePath; - this.restClient = new RestClient(this.basePath); - } +/// + + /// API client is mainly responible for making the HTTP call to the API backend + /// + +public class ApiClient { + +/// + + /// Initializes a new instance of the + + class. + /// + +/// +The base path. +public ApiClient(String basePath="http://petstore.swagger.io/v2") { +this.basePath = basePath; +this.restClient = new RestClient(this.basePath); +} - /// +/// + /// Gets or sets the base path. - /// - /// The base path. - public string basePath { get; set; } + /// + +/// +The base path. +public string basePath { get; set; } - /// +/// + /// Gets or sets the RestClient - /// - /// The RestClient. - public RestClient restClient { get; set; } + /// + +/// +The RestClient. +public RestClient restClient { get; set; } - private Dictionary defaultHeaderMap = new Dictionary(); +private Dictionary + defaultHeaderMap = new Dictionary +(); - public Object CallApi(String Path, RestSharp.Method Method, Dictionary QueryParams, String PostBody, - Dictionary HeaderParams, Dictionary FormParams, Dictionary FileParams, String[] AuthSettings) { +public Object CallApi(String Path, RestSharp.Method Method, Dictionary + QueryParams, String PostBody, +Dictionary + HeaderParams, Dictionary + FormParams, Dictionary + FileParams, String[] AuthSettings) { +var response = Task.Run(async () => { +var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings); +return resp; +}); +return response.Result; +} - var request = new RestRequest(Path, Method); +public async Task + CallApiAsync(String Path, RestSharp.Method Method, Dictionary + QueryParams, String PostBody, + Dictionary + HeaderParams, Dictionary + FormParams, Dictionary + FileParams, String[] AuthSettings) { - UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings); + var request = new RestRequest(Path, Method); - // add default header, if any - foreach(KeyValuePair defaultHeader in this.defaultHeaderMap) - request.AddHeader(defaultHeader.Key, defaultHeader.Value); + UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings); - // add header parameter, if any - foreach(KeyValuePair param in HeaderParams) - request.AddHeader(param.Key, param.Value); - - // add query parameter, if any - foreach(KeyValuePair param in QueryParams) - request.AddQueryParameter(param.Key, param.Value); + // add default header, if any + foreach(KeyValuePair + defaultHeader in this.defaultHeaderMap) + request.AddHeader(defaultHeader.Key, defaultHeader.Value); - // add form parameter, if any - foreach(KeyValuePair param in FormParams) - request.AddParameter(param.Key, param.Value); + // add header parameter, if any + foreach(KeyValuePair + param in HeaderParams) + request.AddHeader(param.Key, param.Value); - // add file parameter, if any - foreach(KeyValuePair param in FileParams) - request.AddFile(param.Key, param.Value); + // add query parameter, if any + foreach(KeyValuePair + param in QueryParams) + request.AddQueryParameter(param.Key, param.Value); - if (PostBody != null) { - request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter - } + // add form parameter, if any + foreach(KeyValuePair + param in FormParams) + request.AddParameter(param.Key, param.Value); - return (Object)restClient.Execute(request); + // add file parameter, if any + foreach(KeyValuePair + param in FileParams) + request.AddFile(param.Key, param.Value); + if (PostBody != null) { + request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter } - /// - /// Add default header - /// - /// Header field name - /// Header field value - /// + return (Object) await restClient.ExecuteTaskAsync(request); + + } + + /// + + /// Add default header + /// + + /// + + Header field name + /// + + Header field value + /// + public void AddDefaultHeader(string key, string value) { - defaultHeaderMap.Add(key, value); + defaultHeaderMap.Add(key, value); } - /// - /// Get default header - /// - /// Dictionary of default header - public Dictionary GetDefaultHeader() { - return defaultHeaderMap; + /// + + /// Get default header + /// + + /// + Dictionary of default header + public Dictionary + GetDefaultHeader() { + return defaultHeaderMap; } - /// - /// escape string (url-encoded) - /// - /// String to be escaped - /// Escaped string + /// + + /// escape string (url-encoded) + /// + + /// + + String to be escaped + /// + Escaped string public string EscapeString(string str) { - return str; + return str; } - /// - /// if parameter is DateTime, output in ISO8601 format - /// if parameter is a list of string, join the list with "," - /// otherwise just return the string - /// - /// The parameter (header, path, query, form) - /// Formatted string + /// + + /// if parameter is DateTime, output in ISO8601 format + /// if parameter is a list of string, join the list with "," + /// otherwise just return the string + /// + + /// + + The parameter (header, path, query, form) + /// + Formatted string public string ParameterToString(object obj) { - if (obj is DateTime) { - return ((DateTime)obj).ToString ("u"); - } else if (obj is List) { - return String.Join(",", obj as List); - } else { - return Convert.ToString (obj); - } - } + if (obj is DateTime) { + return ((DateTime)obj).ToString ("u"); + } else if (obj is List + ) { + return String.Join(",", obj as List + ); + } else { + return Convert.ToString (obj); + } + } - /// - /// Deserialize the JSON string into a proper object - /// - /// JSON string - /// Object type - /// Object representation of the JSON string - public object Deserialize(string content, Type type) { - if (type.GetType() == typeof(Object)) - return (Object)content; - - try - { - return JsonConvert.DeserializeObject(content, type); - } - catch (IOException e) { - throw new ApiException(500, e.Message); - } - } + /// + + /// Deserialize the JSON string into a proper object + /// + + /// + + JSON string + /// + + Object type + /// + Object representation of the JSON string + public object Deserialize(string content, Type type) { + if (type.GetType() == typeof(Object)) + return (Object)content; - /// - /// Serialize an object into JSON string - /// - /// Object - /// JSON string - public string Serialize(object obj) { - try - { - return obj != null ? JsonConvert.SerializeObject(obj) : null; - } - catch (Exception e) { - throw new ApiException(500, e.Message); - } - } + try + { + return JsonConvert.DeserializeObject(content, type); + } + catch (IOException e) { + throw new ApiException(500, e.Message); + } + } - /// - /// Get the API key with prefix - /// - /// Object - /// API key with prefix - public string GetApiKeyWithPrefix (string apiKey) - { - var apiKeyValue = ""; - Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue); - var apiKeyPrefix = ""; - if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) { - return apiKeyPrefix + " " + apiKeyValue; - } else { - return apiKeyValue; - } - } + /// + + /// Serialize an object into JSON string + /// + + /// + + Object + /// + JSON string + public string Serialize(object obj) { + try + { + return obj != null ? JsonConvert.SerializeObject(obj) : null; + } + catch (Exception e) { + throw new ApiException(500, e.Message); + } + } + + /// + + /// Get the API key with prefix + /// + + /// + + Object + /// + API key with prefix + public string GetApiKeyWithPrefix (string apiKey) + { + var apiKeyValue = ""; + Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue); + var apiKeyPrefix = ""; + if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) { + return apiKeyPrefix + " " + apiKeyValue; + } else { + return apiKeyValue; + } + } + + /// + + /// Update parameters based on authentication + /// + + /// + + Query parameters + /// + + Header parameters + /// + + Authentication settings + public void UpdateParamsForAuth(Dictionary + QueryParams, Dictionary + HeaderParams, string[] AuthSettings) { + if (AuthSettings == null || AuthSettings.Length == 0) + return; - /// - /// Update parameters based on authentication - /// - /// Query parameters - /// Header parameters - /// Authentication settings - public void UpdateParamsForAuth(Dictionary QueryParams, Dictionary HeaderParams, string[] AuthSettings) { - if (AuthSettings == null || AuthSettings.Length == 0) - return; - - foreach (string auth in AuthSettings) { - // determine which one to use - switch(auth) { - - case "api_key": - HeaderParams["api_key"] = GetApiKeyWithPrefix("api_key"); + foreach (string auth in AuthSettings) { + // determine which one to use + switch(auth) { - break; - - case "petstore_auth": + case "api_key": + HeaderParams["api_key"] = GetApiKeyWithPrefix("api_key + "); + + break; - //TODO support oauth - break; - - default: + case "petstore_auth": + + //TODO support oauth + break; + + default: //TODO show warning about security definition not found - break; - } - } + break; + } + } - } + } - /// - /// Encode string in base64 format - /// - /// String to be encoded - public static string Base64Encode(string text) { - var textByte = System.Text.Encoding.UTF8.GetBytes(text); - return System.Convert.ToBase64String(textByte); - } + /// + + /// Encode string in base64 format + /// + + /// + + String to be encoded + public static string Base64Encode(string text) { + var textByte = System.Text.Encoding.UTF8.GetBytes(text); + return System.Convert.ToBase64String(textByte); + } - } -} + } + } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs index 691c2cd3fa2..d668e0b3a69 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs @@ -1,31 +1,61 @@ using System; namespace IO.Swagger.Client { - /// - /// API Exception - /// - public class ApiException : Exception { - /// +/// + + /// API Exception + /// + +public class ApiException : Exception { +/// + /// Gets or sets the error code (HTTP status code) - /// - /// The error code (HTTP status code). - public int ErrorCode { get; set; } + /// + +/// +The error code (HTTP status code). +public int ErrorCode { get; set; } - /// - /// Initializes a new instance of the class. - /// - /// The base path. - public ApiException() {} +/// + + /// Gets or sets the error content (body json object) + /// + +/// +The error content (Http response body). +public dynamic ErrorContent { get; private set; } - /// - /// Initializes a new instance of the class. - /// - /// HTTP status code. - /// Error message. - public ApiException(int errorCode, string message) : base(message) { - this.ErrorCode = errorCode; - } +/// + + /// Initializes a new instance of the + + class. + /// + +/// +The base path. +public ApiException() {} - } +/// + + /// Initializes a new instance of the + + class. + /// + +/// +HTTP status code. +/// +Error message. +public ApiException(int errorCode, string message) : base(message) { +this.ErrorCode = errorCode; +} + +public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) { +this.ErrorCode = errorCode; +this.ErrorContent = errorContent; +} + +} } diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs index 4e7975e3ad0..7e412727408 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs @@ -7,41 +7,62 @@ using IO.Swagger.Client; namespace IO.Swagger.Client { - /// - /// Represents a set of configuration settings - /// - public class Configuration{ +/// + + /// Represents a set of configuration settings + /// + +public class Configuration{ - /// +/// + /// Gets or sets the API client. This is the default API client for making HTTP calls. - /// - /// The API client. - public static ApiClient apiClient = new ApiClient(); + /// + +/// +The API client. +public static ApiClient apiClient = new ApiClient(); - /// +/// + /// Gets or sets the username (HTTP basic authentication) - /// - /// The username. - public static String username { get; set; } + /// + +/// +The username. +public static String username { get; set; } - /// +/// + /// Gets or sets the password (HTTP basic authentication) - /// - /// The password. - public static String password { get; set; } + /// + +/// +The password. +public static String password { get; set; } - /// - /// Gets or sets the API key based on the authentication name - /// - /// The API key. - public static Dictionary apiKey = new Dictionary(); +/// + + /// Gets or sets the API key based on the authentication name + /// + +/// +The API key. +public static Dictionary + apiKey = new Dictionary +(); - /// - /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name - /// - /// The prefix of the API key. - public static Dictionary apiKeyPrefix = new Dictionary(); +/// + + /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name + /// + +/// +The prefix of the API key. +public static Dictionary + apiKeyPrefix = new Dictionary +(); - } +} } diff --git a/samples/client/petstore/flash/FlashPetstoreCodegen.scala b/samples/client/petstore/flash/FlashPetstoreCodegen.scala index 0198674a2eb..e318765c57e 100644 --- a/samples/client/petstore/flash/FlashPetstoreCodegen.scala +++ b/samples/client/petstore/flash/FlashPetstoreCodegen.scala @@ -1,31 +1,29 @@ /** - * Copyright 2014 Wordnik, Inc. + * Copyright 2014 Wordnik, Inc. * - * 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 + * 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 + * 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. + * 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. */ -import com.wordnik.swagger.codegen.BasicFlashCodegen - object FlashPetstoreCodegen extends BasicFlashCodegen { def main(args: Array[String]) = generateClient(args) - override def packageName = "com.wordnik.client" - - override def destinationRoot = "samples/client/petstore/flash" + override def packageName = "io.swagger.client" // where to write generated code override def destinationDir = destinationRoot + "/src/main/flex" + override def destinationRoot = "samples/client/petstore/flash" + // package for models override def modelPackage = Some("com.wordnik.client.model") diff --git a/samples/client/petstore/flash/bin/AirExecutorApp-app.xml b/samples/client/petstore/flash/bin/AirExecutorApp-app.xml index 1dbaf98e644..1eb5e43c7d7 100644 --- a/samples/client/petstore/flash/bin/AirExecutorApp-app.xml +++ b/samples/client/petstore/flash/bin/AirExecutorApp-app.xml @@ -1,87 +1,87 @@ - + xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/2.0 + The last segment of the namespace specifies the version + of the AIR runtime required for this application to run. - - AirExecutorApp + minimumPatchLevel - The minimum patch level of the AIR runtime required to run + the application. Optional. + --> - - AirExecutorApp + + AirExecutorApp - - AirExecutorApp + + AirExecutorApp - - v1 + + AirExecutorApp - - + + v1 - - + + - - + + - - - - - AirExecutorApp.swf - - - + + - - + + + + + AirExecutorApp.swf - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + + + + + + + @@ -90,57 +90,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as index 6891d8456bc..88f9b42eaa0 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as @@ -8,47 +8,50 @@ import com.wordnik.swagger.event.Response; import com.wordnik.swagger.common.SwaggerApi; import com.wordnik.client.model.Pet; import com.wordnik.client.model.File; + import mx.rpc.AsyncToken; import mx.utils.UIDUtil; + import flash.utils.Dictionary; import flash.events.EventDispatcher; public class PetApi extends SwaggerApi { + public static const event_getPetById:String = "getPetById"; + public static const event_deletePet:String = "deletePet"; + public static const event_partialUpdate:String = "partialUpdate"; + public static const event_updatePetWithForm:String = "updatePetWithForm"; + public static const event_uploadFile:String = "uploadFile"; + public static const event_addPet:String = "addPet"; + public static const event_updatePet:String = "updatePet"; + public static const event_findPetsByStatus:String = "findPetsByStatus"; + public static const event_findPetsByTags:String = "findPetsByTags"; + /** - * Constructor for the PetApi api client - * @param apiCredentials Wrapper object for tokens and hostName required towards authentication - * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response - */ - public function PetApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) { + * Constructor for the PetApi api client + * @param apiCredentials Wrapper object for tokens and hostName required towards authentication + * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response + */ + public function PetApi(apiCredentials:ApiUserCredentials, eventDispatcher:EventDispatcher = null) { super(apiCredentials, eventDispatcher); } - -public static const event_getPetById: String = "getPetById"; -public static const event_deletePet: String = "deletePet"; -public static const event_partialUpdate: String = "partialUpdate"; -public static const event_updatePetWithForm: String = "updatePetWithForm"; -public static const event_uploadFile: String = "uploadFile"; -public static const event_addPet: String = "addPet"; -public static const event_updatePet: String = "updatePet"; -public static const event_findPetsByStatus: String = "findPetsByStatus"; -public static const event_findPetsByTags: String = "findPetsByTags"; -/* + /* * Returns Pet */ - public function getPetById (petId: Number): String { + + public function getPetById(petId:Number):String { // create path and map variables - var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); + var path:String = "/pet/{petId}".replace(/{format}/g, "xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(petId == null ) { + if (petId == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "getPetById"; @@ -57,48 +60,50 @@ public static const event_findPetsByTags: String = "findPetsByTags"; return requestId; } + /* * Returns void */ - public function deletePet (petId: String): String { + public function deletePet(petId:String):String { // create path and map variables - var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); + var path:String = "/pet/{petId}".replace(/{format}/g, "xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(petId == null ) { + if (petId == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "deletePet"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns Array[Pet] */ - public function partialUpdate (petId: String, body: Pet): String { + public function partialUpdate(petId:String, body:Pet):String { // create path and map variables - var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); + var path:String = "/pet/{petId}".replace(/{format}/g, "xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(petId == null || body == null ) { + if (petId == null || body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "PATCH", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "partialUpdate"; @@ -107,121 +112,126 @@ public static const event_findPetsByTags: String = "findPetsByTags"; return requestId; } + /* * Returns void */ - public function updatePetWithForm (petId: String, name: String, status: String): String { + public function updatePetWithForm(petId:String, name:String, status:String):String { // create path and map variables - var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); + var path:String = "/pet/{petId}".replace(/{format}/g, "xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(petId == null ) { + if (petId == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "updatePetWithForm"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function uploadFile (additionalMetadata: String, body: File): String { + public function uploadFile(additionalMetadata:String, body:File):String { // create path and map variables - var path: String = "/pet/uploadImage".replace(/{format}/g,"xml"); + var path:String = "/pet/uploadImage".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "uploadFile"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function addPet (body: Pet): String { + public function addPet(body:Pet):String { // create path and map variables - var path: String = "/pet".replace(/{format}/g,"xml"); + var path:String = "/pet".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(body == null ) { + if (body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "addPet"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function updatePet (body: Pet): String { + public function updatePet(body:Pet):String { // create path and map variables - var path: String = "/pet".replace(/{format}/g,"xml"); + var path:String = "/pet".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(body == null ) { + if (body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "updatePet"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns Array[Pet] */ - public function findPetsByStatus (status: String= "available"): String { + public function findPetsByStatus(status:String = "available"):String { // create path and map variables - var path: String = "/pet/findByStatus".replace(/{format}/g,"xml"); + var path:String = "/pet/findByStatus".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(status == null ) { + if (status == null) { throw new ApiError(400, "missing required params"); } - if("null" != String(status)) + if ("null" != String(status)) queryParams["status"] = toPathValue(status); var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "findPetsByStatus"; @@ -230,25 +240,26 @@ public static const event_findPetsByTags: String = "findPetsByTags"; return requestId; } + /* * Returns Array[Pet] */ - public function findPetsByTags (tags: String): String { + public function findPetsByTags(tags:String):String { // create path and map variables - var path: String = "/pet/findByTags".replace(/{format}/g,"xml"); + var path:String = "/pet/findByTags".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(tags == null ) { + if (tags == null) { throw new ApiError(400, "missing required params"); } - if("null" != String(tags)) + if ("null" != String(tags)) queryParams["tags"] = toPathValue(tags); var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "findPetsByTags"; @@ -257,5 +268,5 @@ public static const event_findPetsByTags: String = "findPetsByTags"; return requestId; } - } - } +} +} diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as index 4712d9ae997..cc4bc2c4a13 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as @@ -7,41 +7,44 @@ import com.wordnik.swagger.common.ApiUserCredentials; import com.wordnik.swagger.event.Response; import com.wordnik.swagger.common.SwaggerApi; import com.wordnik.client.model.Order; + import mx.rpc.AsyncToken; import mx.utils.UIDUtil; + import flash.utils.Dictionary; import flash.events.EventDispatcher; public class StoreApi extends SwaggerApi { + public static const event_getOrderById:String = "getOrderById"; + public static const event_deleteOrder:String = "deleteOrder"; + public static const event_placeOrder:String = "placeOrder"; + /** - * Constructor for the StoreApi api client - * @param apiCredentials Wrapper object for tokens and hostName required towards authentication - * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response - */ - public function StoreApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) { + * Constructor for the StoreApi api client + * @param apiCredentials Wrapper object for tokens and hostName required towards authentication + * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response + */ + public function StoreApi(apiCredentials:ApiUserCredentials, eventDispatcher:EventDispatcher = null) { super(apiCredentials, eventDispatcher); } - -public static const event_getOrderById: String = "getOrderById"; -public static const event_deleteOrder: String = "deleteOrder"; -public static const event_placeOrder: String = "placeOrder"; -/* + /* * Returns Order */ - public function getOrderById (orderId: String): String { + + public function getOrderById(orderId:String):String { // create path and map variables - var path: String = "/store/order/{orderId}".replace(/{format}/g,"xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId)); + var path:String = "/store/order/{orderId}".replace(/{format}/g, "xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(orderId == null ) { + if (orderId == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "getOrderById"; @@ -50,55 +53,57 @@ public static const event_placeOrder: String = "placeOrder"; return requestId; } + /* * Returns void */ - public function deleteOrder (orderId: String): String { + public function deleteOrder(orderId:String):String { // create path and map variables - var path: String = "/store/order/{orderId}".replace(/{format}/g,"xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId)); + var path:String = "/store/order/{orderId}".replace(/{format}/g, "xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(orderId == null ) { + if (orderId == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "deleteOrder"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function placeOrder (body: Order): String { + public function placeOrder(body:Order):String { // create path and map variables - var path: String = "/store/order".replace(/{format}/g,"xml"); + var path:String = "/store/order".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(body == null ) { + if (body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "placeOrder"; - token.returnType = null ; + token.returnType = null; return requestId; } - } - } +} +} diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as index b824d75a810..1714b4a0381 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as @@ -7,96 +7,101 @@ import com.wordnik.swagger.common.ApiUserCredentials; import com.wordnik.swagger.event.Response; import com.wordnik.swagger.common.SwaggerApi; import com.wordnik.client.model.User; + import mx.rpc.AsyncToken; import mx.utils.UIDUtil; + import flash.utils.Dictionary; import flash.events.EventDispatcher; public class UserApi extends SwaggerApi { + public static const event_updateUser:String = "updateUser"; + public static const event_deleteUser:String = "deleteUser"; + public static const event_getUserByName:String = "getUserByName"; + public static const event_loginUser:String = "loginUser"; + public static const event_logoutUser:String = "logoutUser"; + public static const event_createUser:String = "createUser"; + public static const event_createUsersWithArrayInput:String = "createUsersWithArrayInput"; + public static const event_createUsersWithListInput:String = "createUsersWithListInput"; + /** - * Constructor for the UserApi api client - * @param apiCredentials Wrapper object for tokens and hostName required towards authentication - * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response - */ - public function UserApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) { + * Constructor for the UserApi api client + * @param apiCredentials Wrapper object for tokens and hostName required towards authentication + * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response + */ + public function UserApi(apiCredentials:ApiUserCredentials, eventDispatcher:EventDispatcher = null) { super(apiCredentials, eventDispatcher); } - -public static const event_updateUser: String = "updateUser"; -public static const event_deleteUser: String = "deleteUser"; -public static const event_getUserByName: String = "getUserByName"; -public static const event_loginUser: String = "loginUser"; -public static const event_logoutUser: String = "logoutUser"; -public static const event_createUser: String = "createUser"; -public static const event_createUsersWithArrayInput: String = "createUsersWithArrayInput"; -public static const event_createUsersWithListInput: String = "createUsersWithListInput"; -/* + /* * Returns void */ - public function updateUser (username: String, body: User): String { + + public function updateUser(username:String, body:User):String { // create path and map variables - var path: String = "/user/{username}".replace(/{format}/g,"xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username)); + var path:String = "/user/{username}".replace(/{format}/g, "xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(username == null || body == null ) { + if (username == null || body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "updateUser"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function deleteUser (username: String): String { + public function deleteUser(username:String):String { // create path and map variables - var path: String = "/user/{username}".replace(/{format}/g,"xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username)); + var path:String = "/user/{username}".replace(/{format}/g, "xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(username == null ) { + if (username == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "deleteUser"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns User */ - public function getUserByName (username: String): String { + public function getUserByName(username:String):String { // create path and map variables - var path: String = "/user/{username}".replace(/{format}/g,"xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username)); + var path:String = "/user/{username}".replace(/{format}/g, "xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username)); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(username == null ) { + if (username == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "getUserByName"; @@ -105,27 +110,28 @@ public static const event_createUsersWithListInput: String = "createUsersWithLis return requestId; } + /* * Returns string */ - public function loginUser (username: String, password: String): String { + public function loginUser(username:String, password:String):String { // create path and map variables - var path: String = "/user/login".replace(/{format}/g,"xml"); + var path:String = "/user/login".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(username == null || password == null ) { + if (username == null || password == null) { throw new ApiError(400, "missing required params"); } - if("null" != String(username)) + if ("null" != String(username)) queryParams["username"] = toPathValue(username); - if("null" != String(password)) + if ("null" != String(password)) queryParams["password"] = toPathValue(password); var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "loginUser"; @@ -134,101 +140,105 @@ public static const event_createUsersWithListInput: String = "createUsersWithLis return requestId; } + /* * Returns void */ - public function logoutUser (): String { + public function logoutUser():String { // create path and map variables - var path: String = "/user/logout".replace(/{format}/g,"xml"); + var path:String = "/user/logout".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "logoutUser"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function createUser (body: User): String { + public function createUser(body:User):String { // create path and map variables - var path: String = "/user".replace(/{format}/g,"xml"); + var path:String = "/user".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(body == null ) { + if (body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "createUser"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function createUsersWithArrayInput (body: Array): String { + public function createUsersWithArrayInput(body:Array):String { // create path and map variables - var path: String = "/user/createWithArray".replace(/{format}/g,"xml"); + var path:String = "/user/createWithArray".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(body == null ) { + if (body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "createUsersWithArrayInput"; - token.returnType = null ; + token.returnType = null; return requestId; } + /* * Returns void */ - public function createUsersWithListInput (body: Array): String { + public function createUsersWithListInput(body:Array):String { // create path and map variables - var path: String = "/user/createWithList".replace(/{format}/g,"xml"); + var path:String = "/user/createWithList".replace(/{format}/g, "xml"); // query params - var queryParams: Dictionary = new Dictionary(); - var headerParams: Dictionary = new Dictionary(); + var queryParams:Dictionary = new Dictionary(); + var headerParams:Dictionary = new Dictionary(); // verify required params are set - if(body == null ) { + if (body == null) { throw new ApiError(400, "missing required params"); } var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams); - var requestId: String = getUniqueId(); + var requestId:String = getUniqueId(); token.requestId = requestId; token.completionEventType = "createUsersWithListInput"; - token.returnType = null ; + token.returnType = null; return requestId; } - } - } +} +} diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as index 1b17bd5b332..e20d3701cf7 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as @@ -1,19 +1,19 @@ package com.wordnik.client.model { [XmlRootNode(name="Category")] - public class Category { +public class Category { [XmlElement(name="id")] - public var id: Number = 0.0; + public var id:Number = 0.0; [XmlElement(name="name")] - public var name: String = null; + public var name:String = null; - public function toString(): String { - var str: String = "Category: "; - str += " (id: " + id + ")"; - str += " (name: " + name + ")"; - return str; - } + public function toString():String { + var str:String = "Category: "; + str += " (id: " + id + ")"; + str += " (name: " + name + ")"; + return str; + } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/CategoryList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/CategoryList.as index c28658e6d3e..48b18dbe1f4 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/CategoryList.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/CategoryList.as @@ -1,15 +1,16 @@ package com.wordnik.client.model { import com.wordnik.swagger.common.ListWrapper; + public class CategoryList implements ListWrapper { - // This declaration below of _Category_obj_class is to force flash compiler to include this class - private var _category_obj_class: com.wordnik.client.model.Category = null; - [XmlElements(name="category", type="com.wordnik.client.model.Category")] - public var category: Array = new Array(); + // This declaration below of _Category_obj_class is to force flash compiler to include this class + [XmlElements(name="category", type="com.wordnik.client.model.Category")] + public var category:Array = new Array(); + private var _category_obj_class:com.wordnik.client.model.Category = null; - public function getList(): Array{ - return category; - } + public function getList():Array { + return category; + } } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as index d4a423ba11c..5147a428ba5 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as @@ -1,32 +1,32 @@ package com.wordnik.client.model { [XmlRootNode(name="Order")] - public class Order { +public class Order { [XmlElement(name="id")] - public var id: Number = 0.0; + public var id:Number = 0.0; [XmlElement(name="petId")] - public var petId: Number = 0.0; + public var petId:Number = 0.0; [XmlElement(name="quantity")] - public var quantity: Number = 0.0; + public var quantity:Number = 0.0; /* Order Status */ [XmlElement(name="status")] - public var status: String = null; + public var status:String = null; [XmlElement(name="shipDate")] - public var shipDate: Date = null; - - public function toString(): String { - var str: String = "Order: "; - str += " (id: " + id + ")"; - str += " (petId: " + petId + ")"; - str += " (quantity: " + quantity + ")"; - str += " (status: " + status + ")"; - str += " (shipDate: " + shipDate + ")"; - return str; - } + public var shipDate:Date = null; + + public function toString():String { + var str:String = "Order: "; + str += " (id: " + id + ")"; + str += " (petId: " + petId + ")"; + str += " (quantity: " + quantity + ")"; + str += " (status: " + status + ")"; + str += " (shipDate: " + shipDate + ")"; + return str; + } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as index 298964f4b12..56825295dd8 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as @@ -1,15 +1,16 @@ package com.wordnik.client.model { import com.wordnik.swagger.common.ListWrapper; + public class OrderList implements ListWrapper { - // This declaration below of _Order_obj_class is to force flash compiler to include this class - private var _order_obj_class: com.wordnik.client.model.Order = null; - [XmlElements(name="order", type="com.wordnik.client.model.Order")] - public var order: Array = new Array(); + // This declaration below of _Order_obj_class is to force flash compiler to include this class + [XmlElements(name="order", type="com.wordnik.client.model.Order")] + public var order:Array = new Array(); + private var _order_obj_class:com.wordnik.client.model.Order = null; - public function getList(): Array{ - return order; - } + public function getList():Array { + return order; + } } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as index 63f79d33ea2..4a19692e9f1 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as @@ -2,44 +2,45 @@ package com.wordnik.client.model { import com.wordnik.client.model.Category; import com.wordnik.client.model.Tag; + [XmlRootNode(name="Pet")] - public class Pet { +public class Pet { /* unique identifier for the pet */ [XmlElement(name="id")] - public var id: Number = 0.0; + public var id:Number = 0.0; [XmlElement(name="category")] - public var category: Category = null; + public var category:Category = null; [XmlElement(name="name")] - public var name: String = null; + public var name:String = null; // This declaration below of _photoUrls_obj_class is to force flash compiler to include this class - private var _photoUrls_obj_class: com.wordnik.client.model.String = null; - [XmlElementWrapper(name="photoUrls")] - [XmlElements(name="photoUrl", type="com.wordnik.client.model.String")] - public var photoUrls: Array = new Array(); + [XmlElementWrapper(name="photoUrls")] + [XmlElements(name="photoUrl", type="com.wordnik.client.model.String")] + public var photoUrls:Array = new Array(); + [XmlElementWrapper(name="tags")] + [XmlElements(name="tag", type="com.wordnik.client.model.Tag")] + public var tags:Array = new Array(); // This declaration below of _tags_obj_class is to force flash compiler to include this class - private var _tags_obj_class: com.wordnik.client.model.Tag = null; - [XmlElementWrapper(name="tags")] - [XmlElements(name="tag", type="com.wordnik.client.model.Tag")] - public var tags: Array = new Array(); + [XmlElement(name="status")] + public var status:String = null; + private var _photoUrls_obj_class:com.wordnik.client.model.String = null; /* pet status in the store */ - [XmlElement(name="status")] - public var status: String = null; - - public function toString(): String { - var str: String = "Pet: "; - str += " (id: " + id + ")"; - str += " (category: " + category + ")"; - str += " (name: " + name + ")"; - str += " (photoUrls: " + photoUrls + ")"; - str += " (tags: " + tags + ")"; - str += " (status: " + status + ")"; - return str; - } + private var _tags_obj_class:com.wordnik.client.model.Tag = null; + + public function toString():String { + var str:String = "Pet: "; + str += " (id: " + id + ")"; + str += " (category: " + category + ")"; + str += " (name: " + name + ")"; + str += " (photoUrls: " + photoUrls + ")"; + str += " (tags: " + tags + ")"; + str += " (status: " + status + ")"; + return str; + } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/PetList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/PetList.as index e21a7c3cc5d..61b4070a543 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/PetList.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/PetList.as @@ -3,15 +3,16 @@ package com.wordnik.client.model { import com.wordnik.swagger.common.ListWrapper; import com.wordnik.client.model.Category; import com.wordnik.client.model.Tag; + public class PetList implements ListWrapper { - // This declaration below of _Pet_obj_class is to force flash compiler to include this class - private var _pet_obj_class: com.wordnik.client.model.Pet = null; - [XmlElements(name="pet", type="com.wordnik.client.model.Pet")] - public var pet: Array = new Array(); + // This declaration below of _Pet_obj_class is to force flash compiler to include this class + [XmlElements(name="pet", type="com.wordnik.client.model.Pet")] + public var pet:Array = new Array(); + private var _pet_obj_class:com.wordnik.client.model.Pet = null; - public function getList(): Array{ - return pet; - } + public function getList():Array { + return pet; + } } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as index e229eb0ba64..07f1f8dd9f3 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as @@ -1,19 +1,19 @@ package com.wordnik.client.model { [XmlRootNode(name="Tag")] - public class Tag { +public class Tag { [XmlElement(name="id")] - public var id: Number = 0.0; + public var id:Number = 0.0; [XmlElement(name="name")] - public var name: String = null; + public var name:String = null; - public function toString(): String { - var str: String = "Tag: "; - str += " (id: " + id + ")"; - str += " (name: " + name + ")"; - return str; - } + public function toString():String { + var str:String = "Tag: "; + str += " (id: " + id + ")"; + str += " (name: " + name + ")"; + return str; + } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/TagList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/TagList.as index f6e782f4b98..92a9f7d71b1 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/TagList.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/TagList.as @@ -1,15 +1,16 @@ package com.wordnik.client.model { import com.wordnik.swagger.common.ListWrapper; + public class TagList implements ListWrapper { - // This declaration below of _Tag_obj_class is to force flash compiler to include this class - private var _tag_obj_class: com.wordnik.client.model.Tag = null; - [XmlElements(name="tag", type="com.wordnik.client.model.Tag")] - public var tag: Array = new Array(); + // This declaration below of _Tag_obj_class is to force flash compiler to include this class + [XmlElements(name="tag", type="com.wordnik.client.model.Tag")] + public var tag:Array = new Array(); + private var _tag_obj_class:com.wordnik.client.model.Tag = null; - public function getList(): Array{ - return tag; - } + public function getList():Array { + return tag; + } } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as index 717b5a6c2ef..d5227f9d28e 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as @@ -1,44 +1,44 @@ package com.wordnik.client.model { [XmlRootNode(name="User")] - public class User { +public class User { [XmlElement(name="id")] - public var id: Number = 0.0; + public var id:Number = 0.0; [XmlElement(name="firstName")] - public var firstName: String = null; + public var firstName:String = null; [XmlElement(name="username")] - public var username: String = null; + public var username:String = null; [XmlElement(name="lastName")] - public var lastName: String = null; + public var lastName:String = null; [XmlElement(name="email")] - public var email: String = null; + public var email:String = null; [XmlElement(name="password")] - public var password: String = null; + public var password:String = null; [XmlElement(name="phone")] - public var phone: String = null; + public var phone:String = null; /* User Status */ [XmlElement(name="userStatus")] - public var userStatus: Number = 0.0; - - public function toString(): String { - var str: String = "User: "; - str += " (id: " + id + ")"; - str += " (firstName: " + firstName + ")"; - str += " (username: " + username + ")"; - str += " (lastName: " + lastName + ")"; - str += " (email: " + email + ")"; - str += " (password: " + password + ")"; - str += " (phone: " + phone + ")"; - str += " (userStatus: " + userStatus + ")"; - return str; - } + public var userStatus:Number = 0.0; + + public function toString():String { + var str:String = "User: "; + str += " (id: " + id + ")"; + str += " (firstName: " + firstName + ")"; + str += " (username: " + username + ")"; + str += " (lastName: " + lastName + ")"; + str += " (email: " + email + ")"; + str += " (password: " + password + ")"; + str += " (phone: " + phone + ")"; + str += " (userStatus: " + userStatus + ")"; + return str; + } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as index 960ca11afef..fdaab68ac23 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as @@ -1,15 +1,16 @@ package com.wordnik.client.model { import com.wordnik.swagger.common.ListWrapper; + public class UserList implements ListWrapper { - // This declaration below of _User_obj_class is to force flash compiler to include this class - private var _user_obj_class: com.wordnik.client.model.User = null; - [XmlElements(name="user", type="com.wordnik.client.model.User")] - public var user: Array = new Array(); + // This declaration below of _User_obj_class is to force flash compiler to include this class + [XmlElements(name="user", type="com.wordnik.client.model.User")] + public var user:Array = new Array(); + private var _user_obj_class:com.wordnik.client.model.User = null; - public function getList(): Array{ - return user; - } + public function getList():Array { + return user; + } } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as index 40ad41af65f..89fd394d2e9 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as @@ -1,5 +1,4 @@ -package com.wordnik.swagger.common -{ +package com.wordnik.swagger.common { import asaxb.xml.bind.ASAXBContext; import asaxb.xml.bind.Unmarshaller; @@ -24,27 +23,16 @@ import mx.rpc.xml.SimpleXMLEncoder; import mx.utils.ObjectUtil; -public class ApiInvoker extends EventDispatcher -{ - - private var _apiUsageCredentials:ApiUserCredentials; - internal var _apiProxyServerUrl:String = ""; - private var _baseUrl: String = ""; - internal var _useProxyServer: Boolean = true; - private var _proxyHostName:String = ""; - private var _apiPath: String = ""; - private var _proxyPath: String = ""; - - public var _apiEventNotifier:EventDispatcher; +public class ApiInvoker extends EventDispatcher { private static const DELETE_DATA_DUMMY:String = "dummyDataRequiredForDeleteOverride"; private static const X_HTTP_OVERRIDE_KEY:String = "X-HTTP-Method-Override"; private static const CONTENT_TYPE_HEADER_KEY:String = "Content-Type"; - public function ApiInvoker(apiUsageCredentials: ApiUserCredentials, eventNotifier: EventDispatcher, useProxy: Boolean = true) { + public function ApiInvoker(apiUsageCredentials:ApiUserCredentials, eventNotifier:EventDispatcher, useProxy:Boolean = true) { _apiUsageCredentials = apiUsageCredentials; _useProxyServer = useProxy; - if(_apiUsageCredentials.hostName != null){ + if (_apiUsageCredentials.hostName != null) { _proxyHostName = _apiUsageCredentials.hostName; } _apiPath = _apiUsageCredentials.apiPath; @@ -52,25 +40,33 @@ public class ApiInvoker extends EventDispatcher _apiProxyServerUrl = _apiUsageCredentials.apiProxyServerUrl; _apiEventNotifier = eventNotifier; } + public var _apiEventNotifier:EventDispatcher; + internal var _apiProxyServerUrl:String = ""; + internal var _useProxyServer:Boolean = true; + private var _apiUsageCredentials:ApiUserCredentials; + private var _baseUrl:String = ""; + private var _proxyHostName:String = ""; + private var _apiPath:String = ""; + private var _proxyPath:String = ""; - public function invokeAPI(resourceURL: String, method: String, queryParams: Dictionary, postObject: Object, headerParams: Dictionary): AsyncToken { + public function invokeAPI(resourceURL:String, method:String, queryParams:Dictionary, postObject:Object, headerParams:Dictionary):AsyncToken { //make the communication - if(_useProxyServer) { + if (_useProxyServer) { resourceURL = _apiProxyServerUrl + resourceURL; } - else{ - resourceURL = "http://"+ _proxyHostName + _apiPath + resourceURL; + else { + resourceURL = "http://" + _proxyHostName + _apiPath + resourceURL; } - var counter: int = 0; - var symbol: String = "&"; - var paramValue: Object; + var counter:int = 0; + var symbol:String = "&"; + var paramValue:Object; for (var paramName:String in queryParams) { paramValue = queryParams[paramName]; //var key:String = paramName; // do stuff symbol = "&"; - if(counter == 0){ + if (counter == 0) { symbol = "?"; } resourceURL = resourceURL + symbol + paramName + "=" + paramValue.toString(); @@ -80,8 +76,8 @@ public class ApiInvoker extends EventDispatcher // trace(resourceURL); //create a httpservice and invoke the rest url waiting for response var requestHeader:Object = new Object(); - if(headerParams != null) { - for(var key: String in headerParams) { + if (headerParams != null) { + for (var key:String in headerParams) { requestHeader[key] = headerParams[key]; } } @@ -95,38 +91,98 @@ public class ApiInvoker extends EventDispatcher } - private function doRestCall( url : String, resultFunction : Function, faultFunction : Function = null, - restMethod : String = "GET", - bodyData : Object = null, headers: Object = null, contentType:String = "application/xml" ) : AsyncToken - { - var httpService : HTTPService = new HTTPService( ); + public function marshal(source:Object):Object { +// trace("marshal got - " + source) + if (source is String) { + return source; + } else if (source is Array && source.length > 0) { + var writer:XMLWriter = new XMLWriter(); + var sourceArray:Array = source as Array; + var arrayEnclosure:String = getArrayEnclosure(sourceArray); + writer.xml.setName(arrayEnclosure); + + for (var i:int = 0; i < sourceArray.length; i++) { + var o:Object = sourceArray[i]; + writer.xml.appendChild(marshal(o)); + } + return writer.xml; + } else + return marshalObject(source); + } + + public function marshalObject(source:Object):XML { + var writer:XMLWriter = new XMLWriter(); + var objDescriptor:XML = describeType(source); + var property:XML; + var propertyType:String; + var propertyValue:Object; + + var qualifiedClassName:String = objDescriptor.@name; + qualifiedClassName = qualifiedClassName.replace("::", "."); + var className:String = qualifiedClassName.substring(qualifiedClassName.lastIndexOf(".") + 1); + className = className().toLowerCase() + className.substring(1); + writer.xml.setName(className); + + for each(property in objDescriptor.elements("variable")) { + propertyValue = source[property.@name]; + if (propertyValue != null) { + if (ObjectUtil.isSimple(propertyValue)) { + writer.addProperty(property.@name, propertyValue.toString()); + } + else { + writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); + } + } + } + for each(property in objDescriptor.elements("accessor")) { + if (property.@access == "readonly") { + continue; + } + propertyValue = source[property.@name]; + if (source[property.@name] != null) { + if (ObjectUtil.isSimple(propertyValue)) { + writer.addProperty(property.@name, propertyValue.toString()); + } + else { + writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); + } + } + } + return writer.xml; + } - if(headers == null){ + public function escapeString(str:String):String { + return str; + } + + private function doRestCall(url:String, resultFunction:Function, faultFunction:Function = null, + restMethod:String = "GET", + bodyData:Object = null, headers:Object = null, contentType:String = "application/xml"):AsyncToken { + var httpService:HTTPService = new HTTPService(); + + if (headers == null) { headers = new Object(); } httpService.method = restMethod; - if ( restMethod.toUpperCase() != HTTPRequestMessage.GET_METHOD ) - { + if (restMethod.toUpperCase() != HTTPRequestMessage.GET_METHOD) { //httpService.method = HTTPRequestMessage.POST_METHOD; - not required as we're using the proxy - if( bodyData == null ) - { + if (bodyData == null) { bodyData = new Object(); } - if(restMethod == HTTPRequestMessage.DELETE_METHOD){ - headers[X_HTTP_OVERRIDE_KEY]= HTTPRequestMessage.DELETE_METHOD; + if (restMethod == HTTPRequestMessage.DELETE_METHOD) { + headers[X_HTTP_OVERRIDE_KEY] = HTTPRequestMessage.DELETE_METHOD; bodyData = DELETE_DATA_DUMMY; } - else if(restMethod == HTTPRequestMessage.PUT_METHOD){ - headers[X_HTTP_OVERRIDE_KEY]= HTTPRequestMessage.PUT_METHOD; + else if (restMethod == HTTPRequestMessage.PUT_METHOD) { + headers[X_HTTP_OVERRIDE_KEY] = HTTPRequestMessage.PUT_METHOD; } - else{ - headers[CONTENT_TYPE_HEADER_KEY]= contentType; + else { + headers[CONTENT_TYPE_HEADER_KEY] = contentType; } } - else - { + else { //if the request type is GET and content type is xml then the Flex HTTPService converts it to a POST ... yeah contentType = null; } @@ -135,148 +191,79 @@ public class ApiInvoker extends EventDispatcher httpService.contentType = contentType; httpService.resultFormat = "e4x"; httpService.headers = headers; - httpService.addEventListener( ResultEvent.RESULT, resultFunction ); - if( faultFunction != null ) - { - httpService.addEventListener( FaultEvent.FAULT, faultFunction ); + httpService.addEventListener(ResultEvent.RESULT, resultFunction); + if (faultFunction != null) { + httpService.addEventListener(FaultEvent.FAULT, faultFunction); } - if(_useProxyServer){ + if (_useProxyServer) { httpService.useProxy = true; - var channelSet: ChannelSet = new ChannelSet(); - var httpChannel: HTTPChannel = new HTTPChannel(); + var channelSet:ChannelSet = new ChannelSet(); + var httpChannel:HTTPChannel = new HTTPChannel(); httpChannel.uri = ApiUrlHelper.getProxyUrl(_proxyHostName, _proxyPath); channelSet.addChannel(httpChannel); httpService.channelSet = channelSet; } - return httpService.send( bodyData ); + return httpService.send(bodyData); } - private function onApiRequestResult(event:ResultEvent):void - { - var completionListener: Function = event.token.completionListener; - var result: Object = event.result; - var resultType: Class = event.token.returnType; + private function onApiRequestResult(event:ResultEvent):void { + var completionListener:Function = event.token.completionListener; + var result:Object = event.result; + var resultType:Class = event.token.returnType; var resultObject:Object; - if(resultType != null) { + if (resultType != null) { var context:ASAXBContext = ASAXBContext.newInstance(resultType); var unmarshaller:Unmarshaller = context.createUnmarshaller(); - var resultXML: XML = new XML(event.result); - try{ + var resultXML:XML = new XML(event.result); + try { resultObject = unmarshaller.unmarshal(resultXML); } - catch(error: TypeError){ - var errorResponse: Response = new Response(false, null, "Could not unmarshall response"); + catch (error:TypeError) { + var errorResponse:Response = new Response(false, null, "Could not unmarshall response"); if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher - var failureEvent: ApiClientEvent = new ApiClientEvent(event.token.completionEventType); + var failureEvent:ApiClientEvent = new ApiClientEvent(event.token.completionEventType); failureEvent.response = errorResponse; _apiEventNotifier.dispatchEvent(failureEvent); } } - if(resultObject is ListWrapper){ + if (resultObject is ListWrapper) { resultObject = ListWrapper(resultObject).getList(); } } - var response : Response = new Response(true, resultObject); + var response:Response = new Response(true, resultObject); response.requestId = event.token.requestId; - var successEventType: String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.SUCCESS_EVENT; + var successEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.SUCCESS_EVENT; if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher - var successEvent: ApiClientEvent = new ApiClientEvent(successEventType); + var successEvent:ApiClientEvent = new ApiClientEvent(successEventType); successEvent.response = response; _apiEventNotifier.dispatchEvent(successEvent); } } - private function onApiRequestFault(event:FaultEvent):void - { - var completionListener: Function = event.token.completionListener; - if(completionListener != null){ - completionListener.call( null, new Response( false, null, event.fault.faultString) ); + private function onApiRequestFault(event:FaultEvent):void { + var completionListener:Function = event.token.completionListener; + if (completionListener != null) { + completionListener.call(null, new Response(false, null, event.fault.faultString)); } - var failureEventType: String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.FAILURE_EVENT; + var failureEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.FAILURE_EVENT; if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher - var failureEvent: ApiClientEvent = new ApiClientEvent(failureEventType); - failureEvent.response = new Response( false, null, event.fault.faultString); + var failureEvent:ApiClientEvent = new ApiClientEvent(failureEventType); + failureEvent.response = new Response(false, null, event.fault.faultString); _apiEventNotifier.dispatchEvent(failureEvent); } } - - public function marshal(source:Object):Object { -// trace("marshal got - " + source) - if(source is String) { - return source; - } else if(source is Array && source.length > 0) { - var writer:XMLWriter=new XMLWriter(); - var sourceArray: Array = source as Array; - var arrayEnclosure: String = getArrayEnclosure(sourceArray); - writer.xml.setName(arrayEnclosure); - - for (var i:int = 0; i < sourceArray.length; i++) { - var o: Object = sourceArray[i]; - writer.xml.appendChild(marshal(o)); - } - return writer.xml; - } else - return marshalObject(source); - } - - public function marshalObject(source:Object):XML - { - var writer:XMLWriter=new XMLWriter(); - var objDescriptor:XML=describeType(source); - var property:XML; - var propertyType:String; - var propertyValue:Object; - - var qualifiedClassName:String=objDescriptor.@name; - qualifiedClassName=qualifiedClassName.replace("::","."); - var className: String = qualifiedClassName.substring(qualifiedClassName.lastIndexOf(".") + 1); - className = className().toLowerCase() + className.substring(1); - writer.xml.setName(className); - - for each(property in objDescriptor.elements("variable")){ - propertyValue=source[property.@name]; - if (propertyValue!=null){ - if (ObjectUtil.isSimple(propertyValue)){ - writer.addProperty(property.@name, propertyValue.toString()); - } - else { - writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); - } - } - } - for each(property in objDescriptor.elements("accessor")){ - if (property.@access=="readonly"){ - continue; - } - propertyValue=source[property.@name]; - if (source[property.@name]!=null){ - if (ObjectUtil.isSimple(propertyValue)){ - writer.addProperty(property.@name, propertyValue.toString()); - } - else { - writer.addProperty(property.@name, marshal(propertyValue).toXMLString()); - } - } - } - return writer.xml; - } - - public function escapeString(str: String): String { - return str; - } - - private function getArrayEnclosure(arr: Array) : String { - if(arr != null && arr.length > 0) { - var className: String = flash.utils.getQualifiedClassName(arr[0]) - if(className.indexOf("::") > 0) + private function getArrayEnclosure(arr:Array):String { + if (arr != null && arr.length > 0) { + var className:String = flash.utils.getQualifiedClassName(arr[0]) + if (className.indexOf("::") > 0) className = className.substr(className.indexOf("::") + 2, className.length) return className.substring(0, 1).toLowerCase() + className.substring(1, className.length) + "s"; diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as index affa1eb0ff9..0fc7e1821b1 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as @@ -12,17 +12,17 @@ internal class ApiUrlHelper { private static const HTTP_URL_PREFIX:String = "http://"; - internal static function appendTokenInfo(restUrl:String, requestHeader: Object, credentials: ApiUserCredentials): String { + internal static function appendTokenInfo(restUrl:String, requestHeader:Object, credentials:ApiUserCredentials):String { //checks for the presence api credentials on client initialization and not repeated here - if(restUrl.indexOf("?") == -1){ + if (restUrl.indexOf("?") == -1) { restUrl += ( "?" + API_URL_KEY + "=" + credentials.apiToken ); } - else{ + else { restUrl += ( "&" + API_URL_KEY + "=" + credentials.apiToken ); } requestHeader.api_key = credentials.apiToken; - if(credentials.authToken != null && credentials.authToken != ""){ + if (credentials.authToken != null && credentials.authToken != "") { restUrl += ( "&" + AUTH_TOKEN_URL_KEY + "=" + credentials.authToken ); requestHeader.auth_token = credentials.authToken; } @@ -30,7 +30,7 @@ internal class ApiUrlHelper { return restUrl; } - internal static function getProxyUrl(hostName: String, proxyPath: String): String{ + internal static function getProxyUrl(hostName:String, proxyPath:String):String { if (hostName(hostName.length - 1) == "/") //remove trailing slash { hostName = hostName.substring(0, hostName.length - 1); diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as index a7536c213e2..3b0e38e6ccc 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as @@ -5,6 +5,24 @@ package com.wordnik.swagger.common { * */ public class ApiUserCredentials { + /** + * Constructor of ApiUserCredentials + * @param apiToken An apitoken that is passed along with the requests + * @param authToken A valid auth_token which could necessary for certain operations + * @param hostName The host name for the Rest API eg. api.companyName.com + * @param userId The userId which is required for certain operations - currently, get user lists + */ + public function ApiUserCredentials(hostName:String, apiPath:String, apiToken:String, + authToken:String = null, userId:Number = -1, apiProxyServerUrl:String = "", + proxyPath:String = null) { + this.hostName = hostName; + this.apiToken = apiToken; + this.authToken = authToken; + this.userId = userId; + this.apiPath = apiPath; + this.apiProxyServerUrl = apiProxyServerUrl; + this.proxyPath = proxyPath; + } /** * An apitoken that is passed along with the requests */ @@ -21,43 +39,21 @@ public class ApiUserCredentials { * The host name for the Rest API eg. api.companyName.com */ public var hostName:String; - - /** - * The base path to the api resources - used along with the hostname - * eg. /v4 - */ - public var apiPath: String; - - /** - * The base path to the blazeds proxy - * eg. /v4/messagebroker/restproxy - */ - public var proxyPath: String; - - /** - * If a proxy server has been set up for the services specify the URL here. This value is used when the Api is invoked with - * the value useProxy as true - */ - public var apiProxyServerUrl: String; - /** - * Constructor of ApiUserCredentials - * @param apiToken An apitoken that is passed along with the requests - * @param authToken A valid auth_token which could necessary for certain operations - * @param hostName The host name for the Rest API eg. api.companyName.com - * @param userId The userId which is required for certain operations - currently, get user lists + * The base path to the api resources - used along with the hostname + * eg. /v4 */ - public function ApiUserCredentials(hostName: String, apiPath: String, apiToken: String, - authToken: String = null, userId: Number = -1, apiProxyServerUrl: String="", - proxyPath: String = null) { - this.hostName = hostName; - this.apiToken = apiToken; - this.authToken = authToken; - this.userId = userId; - this.apiPath = apiPath; - this.apiProxyServerUrl = apiProxyServerUrl; - this.proxyPath = proxyPath; - } + public var apiPath:String; + /** + * The base path to the blazeds proxy + * eg. /v4/messagebroker/restproxy + */ + public var proxyPath:String; + /** + * If a proxy server has been set up for the services specify the URL here. This value is used when the Api is invoked with + * the value useProxy as true + */ + public var apiProxyServerUrl:String; } } \ No newline at end of file diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as index 1ea2ebead00..1dc8ef029fa 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as @@ -1,9 +1,7 @@ -package com.wordnik.swagger.common -{ - public interface ListWrapper - { - - function getList(): Array; - - } +package com.wordnik.swagger.common { +public interface ListWrapper { + + function getList():Array; + +} } \ No newline at end of file diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as index a78f3105cb1..af58870d179 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as @@ -1,75 +1,70 @@ -package com.wordnik.swagger.common -{ - import com.wordnik.swagger.common.ApiUserCredentials; - - import flash.events.EventDispatcher; - import flash.events.IEventDispatcher; - - import mx.utils.UIDUtil; - - public class SwaggerApi extends EventDispatcher - { - - protected var _apiUsageCredentials:ApiUserCredentials; - protected var _apiEventNotifier:EventDispatcher; - protected var _apiInvoker: ApiInvoker; - - protected var _useProxyServer: Boolean = false; +package com.wordnik.swagger.common { +import com.wordnik.swagger.common.ApiUserCredentials; - - /** - * Constructor for the api client - * @param apiCredentials Wrapper object for tokens and hostName required towards authentication - * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response - */ - public function SwaggerApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) { - super(); - _apiUsageCredentials = apiCredentials; - _apiEventNotifier = eventDispatcher; - } - - public function useProxyServer(value:Boolean, proxyServerUrl: String = null):void { - _useProxyServer = value; - } - - protected function getApiInvoker():ApiInvoker { - if(_apiInvoker == null){ - if(_apiEventNotifier == null){ - _apiEventNotifier = this; - } - _apiInvoker = new ApiInvoker(_apiUsageCredentials, _apiEventNotifier, _useProxyServer); - } - return _apiInvoker; - } - - protected function getUniqueId():String { - return UIDUtil.createUID(); - } - - /** - * Method for returning the path value - * For a string value an empty value is returned if the value is null - * @param value - * @return - */ - protected static function toPathValue(value: Object): String { - if(value is Array){ - return arrayToPathValue(value as Array); - } - return value == null ? "" : value.toString(); - } - - /** - * Method for returning a path value - * For a list of objects a comma separated string is returned - * @param objects - * @return - */ - protected static function arrayToPathValue(objects: Array): String { - var out: String = ""; - - return objects.join(","); - } - - } +import flash.events.EventDispatcher; +import flash.events.IEventDispatcher; + +import mx.utils.UIDUtil; + +public class SwaggerApi extends EventDispatcher { + + /** + * Method for returning the path value + * For a string value an empty value is returned if the value is null + * @param value + * @return + */ + protected static function toPathValue(value:Object):String { + if (value is Array) { + return arrayToPathValue(value as Array); + } + return value == null ? "" : value.toString(); + } + + /** + * Method for returning a path value + * For a list of objects a comma separated string is returned + * @param objects + * @return + */ + protected static function arrayToPathValue(objects:Array):String { + var out:String = ""; + + return objects.join(","); + } + + /** + * Constructor for the api client + * @param apiCredentials Wrapper object for tokens and hostName required towards authentication + * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response + */ + public function SwaggerApi(apiCredentials:ApiUserCredentials, eventDispatcher:EventDispatcher = null) { + super(); + _apiUsageCredentials = apiCredentials; + _apiEventNotifier = eventDispatcher; + } + protected var _apiUsageCredentials:ApiUserCredentials; + protected var _apiEventNotifier:EventDispatcher; + protected var _apiInvoker:ApiInvoker; + protected var _useProxyServer:Boolean = false; + + public function useProxyServer(value:Boolean, proxyServerUrl:String = null):void { + _useProxyServer = value; + } + + protected function getApiInvoker():ApiInvoker { + if (_apiInvoker == null) { + if (_apiEventNotifier == null) { + _apiEventNotifier = this; + } + _apiInvoker = new ApiInvoker(_apiUsageCredentials, _apiEventNotifier, _useProxyServer); + } + return _apiInvoker; + } + + protected function getUniqueId():String { + return UIDUtil.createUID(); + } + +} } \ No newline at end of file diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as index 067f49e6301..9b575262a31 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as @@ -1,28 +1,24 @@ -package com.wordnik.swagger.common -{ - public class XMLWriter - { - public var xml:XML; - - public function XMLWriter() - { - xml=; - } - - public function reset():void { - xml=new XML(); - } - - public function addProperty(propertyName:String, propertyValue:String):XML { - var xmlProperty:XML= - xmlProperty.setName(propertyName); - xmlProperty.appendChild(propertyValue); - xml.appendChild(xmlProperty); - return xmlProperty; - } - - public function addAttribute(propertyName:String, attribute:String, attributeValue:String):void { - xml.elements(propertyName)[0].@[attribute]=attributeValue; - } - } +package com.wordnik.swagger.common { +public class XMLWriter { + public function XMLWriter() { + xml = ; + } + public var xml:XML; + + public function reset():void { + xml = new XML(); + } + + public function addProperty(propertyName:String, propertyValue:String):XML { + var xmlProperty:XML = + xmlProperty.setName(propertyName); + xmlProperty.appendChild(propertyValue); + xml.appendChild(xmlProperty); + return xmlProperty; + } + + public function addAttribute(propertyName:String, attribute:String, attributeValue:String):void { + xml.elements(propertyName)[0].@[attribute] = attributeValue; + } +} } \ No newline at end of file diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as index 313da09ea78..923cf3454fa 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as @@ -8,7 +8,7 @@ import flash.events.Event; * If a custom dispatcher has been assigned by the consumer on the generated client then the dispatcher dispatches * the ApiClientEvent to indicate success or failure of the invocation using the Response */ -public class ApiClientEvent extends Event{ +public class ApiClientEvent extends Event { /** * Event type to indicate a unsuccessful invocation @@ -19,18 +19,17 @@ public class ApiClientEvent extends Event{ * Event type to indicate a successful invocation */ public static const SUCCESS_EVENT:String = "successfulInvocation"; - + + public function ApiClientEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false) { + super(type, bubbles, cancelable); + } /** * The Response object which contains response info */ - public var response: Response; + public var response:Response; /** * Any additional info */ public var message:String; - - public function ApiClientEvent(type:String,bubbles:Boolean = false,cancelable:Boolean = false) { - super(type, bubbles, cancelable); - } } } \ No newline at end of file diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/Response.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/Response.as index 56cceb61959..2379096932a 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/Response.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/Response.as @@ -6,50 +6,47 @@ package com.wordnik.swagger.event { */ public class Response { + private static const API_ERROR_MSG:String = "Api error response: "; + + private static function getFriendlyMessage(errorMessage:String):String { + var result:String = errorMessage; + if (errorMessage == null) + return null; + var errorCode:String; + var errorCodeArray:Array = errorMessage.match(/(?<=HTTP\/1.1 )[0-9][0-9][0-9]/); + if (errorCodeArray != null && errorCodeArray.length == 1) { + errorCode = String(errorCodeArray[0]); + } + var msgArray:Array = errorMessage.match(/(?<=HTTP\/1.1 [0-9][0-9][0-9] )[^]*/); + if (msgArray != null && msgArray.length == 1) { + result = API_ERROR_MSG + String(msgArray[0]); + } + return result; + } + + public function Response(isSuccessful:Boolean, payload:Object = null, errorMessage:String = null, requestId:String = null) { + this.isSuccess = isSuccessful; + this.payload = payload; + this.errorMessage = getFriendlyMessage(errorMessage); + } /** * Indicates whether the invoked operation failed or succeeded */ public var isSuccess:Boolean; - /** * The payload of the succesful operation eg. a Word in a WordRequest */ public var payload:Object; - /** * Error message in case of failure */ public var errorMessage:String; - /** * A request Id that was passed in by the user as a param when invoking the operation */ public var requestId:String; - private static const API_ERROR_MSG:String = "Api error response: "; - - public function Response(isSuccessful: Boolean, payload: Object = null, errorMessage: String = null, requestId: String = null) { - this.isSuccess = isSuccessful; - this.payload = payload; - this.errorMessage = getFriendlyMessage(errorMessage); - } - - private static function getFriendlyMessage(errorMessage: String): String{ - var result: String = errorMessage; - if(errorMessage == null) - return null; - var errorCode: String; - var errorCodeArray: Array = errorMessage.match(/(?<=HTTP\/1.1 )[0-9][0-9][0-9]/); - if(errorCodeArray != null && errorCodeArray.length == 1){ - errorCode = String(errorCodeArray[0]); - } - var msgArray: Array = errorMessage.match(/(?<=HTTP\/1.1 [0-9][0-9][0-9] )[^]*/); - if(msgArray != null && msgArray.length == 1){ - result = API_ERROR_MSG + String(msgArray[0]); - } - return result; - } - public function toString(): String { + public function toString():String { return "Response (requestId:" + requestId + "; isSuccess:" + isSuccess + "; errorMessage:" + errorMessage + "; payload:" + payload + ")"; } } diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiError.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiError.as index 13d09415829..8f473a0cbf9 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiError.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiError.as @@ -1,10 +1,7 @@ -package com.wordnik.swagger.exception -{ - public class ApiError extends Error - { - public function ApiError(id:*=0, message:*="") - { - super(message,id); - } - } +package com.wordnik.swagger.exception { +public class ApiError extends Error { + public function ApiError(id:* = 0, message:* = "") { + super(message, id); + } +} } \ No newline at end of file diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as index abe12178361..7abb7642f8e 100644 --- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as +++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as @@ -1,34 +1,32 @@ -package com.wordnik.swagger.exception -{ - public class ApiErrorCodes - { - /** - * System exception. - */ - public static const SYSTEM_EXCEPTION: Number = 0; - - /** - * With Arguments as current key. - */ - public static const API_KEY_NOT_VALID: Number = 1000; - /** - * With arguments as current token value - */ - public static const AUTH_TOKEN_NOT_VALID: Number = 1001; - /** - * With arguments as input JSON and output class anme - */ - public static const ERROR_CONVERTING_JSON_TO_JAVA: Number = 1002; - /** - * With arguments as JAVA class name - */ - public static const ERROR_CONVERTING_JAVA_TO_JSON: Number = 1003; - - public static const ERROR_FROM_WEBSERVICE_CALL: Number = 1004; - /** - * With arguments as current API server name - */ - public static const API_SERVER_NOT_VALID: Number = 1005; - - } +package com.wordnik.swagger.exception { +public class ApiErrorCodes { + /** + * System exception. + */ + public static const SYSTEM_EXCEPTION:Number = 0; + + /** + * With Arguments as current key. + */ + public static const API_KEY_NOT_VALID:Number = 1000; + /** + * With arguments as current token value + */ + public static const AUTH_TOKEN_NOT_VALID:Number = 1001; + /** + * With arguments as input JSON and output class anme + */ + public static const ERROR_CONVERTING_JSON_TO_JAVA:Number = 1002; + /** + * With arguments as JAVA class name + */ + public static const ERROR_CONVERTING_JAVA_TO_JSON:Number = 1003; + + public static const ERROR_FROM_WEBSERVICE_CALL:Number = 1004; + /** + * With arguments as current API server name + */ + public static const API_SERVER_NOT_VALID:Number = 1005; + +} } \ No newline at end of file diff --git a/samples/client/petstore/java/pom.xml b/samples/client/petstore/java/pom.xml index 82e70d8105b..87e92fa652d 100644 --- a/samples/client/petstore/java/pom.xml +++ b/samples/client/petstore/java/pom.xml @@ -1,167 +1,170 @@ - 4.0.0 - io.swagger - swagger-java-client - jar - swagger-java-client - 1.0.0 - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + io.swagger + swagger-java-client + 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 + - - - - 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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.sun.jersey - jersey-client - ${jersey-version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey-version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson-version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson-version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.1.5 - - - joda-time - joda-time - ${jodatime-version} - + + 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.sun.jersey + jersey-client + ${jersey-version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey-version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-version} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.1.5 + + + joda-time + joda-time + ${jodatime-version} + - - - junit - junit - ${junit-version} - test - - - - 1.5.3-M1 - 1.18 - 2.4.2 - 2.3 - 1.0.0 - 4.8.1 - + + + junit + junit + ${junit-version} + test + + + + 1.5.0 + 1.18 + 2.4.2 + 2.3 + 1.0.0 + 4.8.1 + diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java index 0adcbe7031d..3eb82036a14 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java @@ -40,467 +40,481 @@ import io.swagger.client.auth.OAuth; 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 Map + hostMap = new HashMap +(); +private Map + defaultHeaderMap = new HashMap +(); +private boolean debugging = false; +private String basePath = "http://petstore.swagger.io/v2"; + +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); +} - private Map authentications; +public String getBasePath() { +return basePath; +} - private DateFormat dateFormat; +public ApiClient setBasePath(String basePath) { +this.basePath = basePath; +return this; +} - 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"); +/** +* Get authentications (key: authentication name, value: authentication). +*/ +public Map + getAuthentications() { +return authentications; +} - // Use UTC as the default time zone. - this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); +/** +* 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); +} - // Set default User-Agent. - setUserAgent("Java-Swagger"); +/** +* 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!"); +} - // 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); - } - } - - /** - * 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; - } - } - - /** - * Deserialize the given JSON string to Java object. - * - * @param json The JSON string - * @param containerType The container type, one of "list", "array" or "" - * @param cls The type of the Java object - * @return The deserialized Java object - */ - public Object deserialize(String json, String containerType, Class cls) throws ApiException { - if(null != containerType) { - containerType = containerType.toLowerCase(); - } - try{ - if("list".equals(containerType) || "array".equals(containerType)) { - JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); - List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); - return response; - } - else if(String.class.equals(cls)) { - if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) - return json.substring(1, json.length() - 2); - else - return json; - } - else { - return JsonUtil.getJsonMapper().readValue(json, cls); - } - } - catch (IOException e) { - throw new ApiException(500, e.getMessage(), null, json); - } - } - - /** - * Serialize the given Java object into JSON string. - */ - public String serialize(Object obj) throws ApiException { - try { - if (obj != null) - return JsonUtil.getJsonMapper().writeValueAsString(obj); - else - return null; - } - catch (Exception e) { - throw new ApiException(500, e.getMessage()); - } - } - - /** - * 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 - * @return The response body in type of string - */ - public String invokeAPI(String path, String method, Map queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException { - updateParamsForAuth(authNames, queryParams, headerParams); - - Client client = getClient(); - - StringBuilder b = new StringBuilder(); - for(String key : queryParams.keySet()) { - String value = queryParams.get(key); - if (value != null){ - if(b.toString().length() == 0) - b.append("?"); - else - b.append("&"); - b.append(escapeString(key)).append("=").append(escapeString(value)); - } - } - String querystring = b.toString(); - - 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)); - } - } - - ClientResponse response = null; - - if("GET".equals(method)) { - response = (ClientResponse) builder.get(ClientResponse.class); - } - else if ("POST".equals(method)) { - if (contentType.startsWith("application/x-www-form-urlencoded")) { - String encodedFormParams = this - .getXWWWFormUrlencodedParams(formParams); - 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)); - } - else if ("PUT".equals(method)) { - if ("application/x-www-form-urlencoded".equals(contentType)) { - String encodedFormParams = this - .getXWWWFormUrlencodedParams(formParams); - response = builder.type(contentType).put(ClientResponse.class, - encodedFormParams); - } else if(body == null) { - response = builder.put(ClientResponse.class, serialize(body)); - } else { - response = builder.type(contentType).put(ClientResponse.class, serialize(body)); - } - } - else if ("DELETE".equals(method)) { - if ("application/x-www-form-urlencoded".equals(contentType)) { - String encodedFormParams = this - .getXWWWFormUrlencodedParams(formParams); - 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)); - } - } - else { - throw new ApiException(500, "unknown method type " + method); - } - - if(response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) { - return null; - } - else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) { - if(response.hasEntity()) { - return (String) response.getEntity(String.class); - } - else { - return ""; - } - } - 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.getClientResponseStatus().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, Map 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 = parameterToString(param.getKey()); - String valueStr = parameterToString(param.getValue()); - - try { - formParamBuilder.append(URLEncoder.encode(keyStr, "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); - } +/** +* 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); +} +} + +/** +* 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; +} +} + +/** +* Deserialize the given JSON string to Java object. +* +* @param json The JSON string +* @param containerType The container type, one of "list", "array" or "" +* @param cls The type of the Java object +* @return The deserialized Java object +*/ +public Object deserialize(String json, String containerType, Class cls) throws ApiException { +if(null != containerType) { +containerType = containerType.toLowerCase(); +} +try{ +if("list".equals(containerType) || "array".equals(containerType)) { +JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); +List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); +return response; +} +else if(String.class.equals(cls)) { +if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) +return json.substring(1, json.length() - 2); +else +return json; +} +else { +return JsonUtil.getJsonMapper().readValue(json, cls); +} +} +catch (IOException e) { +throw new ApiException(500, e.getMessage(), null, json); +} +} + +/** +* Serialize the given Java object into JSON string. +*/ +public String serialize(Object obj) throws ApiException { +try { +if (obj != null) +return JsonUtil.getJsonMapper().writeValueAsString(obj); +else +return null; +} +catch (Exception e) { +throw new ApiException(500, e.getMessage()); +} +} + +/** +* 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 +* @return The response body in type of string +*/ +public String invokeAPI(String path, String method, Map + queryParams, Object body, Map + headerParams, Map + formParams, String accept, String contentType, String[] authNames) throws ApiException { +updateParamsForAuth(authNames, queryParams, headerParams); + +Client client = getClient(); + +StringBuilder b = new StringBuilder(); +for(String key : queryParams.keySet()) { +String value = queryParams.get(key); +if (value != null){ +if(b.toString().length() == 0) +b.append("?"); +else +b.append("&"); +b.append(escapeString(key)).append("=").append(escapeString(value)); +} +} +String querystring = b.toString(); + +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)); +} +} + +ClientResponse response = null; + +if("GET".equals(method)) { +response = (ClientResponse) builder.get(ClientResponse.class); +} +else if ("POST".equals(method)) { +if (contentType.startsWith("application/x-www-form-urlencoded")) { +String encodedFormParams = this +.getXWWWFormUrlencodedParams(formParams); +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)); +} +else if ("PUT".equals(method)) { +if ("application/x-www-form-urlencoded".equals(contentType)) { +String encodedFormParams = this +.getXWWWFormUrlencodedParams(formParams); +response = builder.type(contentType).put(ClientResponse.class, +encodedFormParams); +} else if(body == null) { +response = builder.put(ClientResponse.class, serialize(body)); +} else { +response = builder.type(contentType).put(ClientResponse.class, serialize(body)); +} +} +else if ("DELETE".equals(method)) { +if ("application/x-www-form-urlencoded".equals(contentType)) { +String encodedFormParams = this +.getXWWWFormUrlencodedParams(formParams); +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)); +} +} +else { +throw new ApiException(500, "unknown method type " + method); +} + +if(response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) { +return null; +} +else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) { +if(response.hasEntity()) { +return (String) response.getEntity(String.class); +} +else { +return ""; +} +} +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.getClientResponseStatus().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, Map + 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 = parameterToString(param.getKey()); +String valueStr = parameterToString(param.getValue()); + +try { +formParamBuilder.append(URLEncoder.encode(keyStr, "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/client/petstore/java/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java index a39785eb47e..77ab741efe9 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java @@ -4,44 +4,52 @@ import java.util.List; public class ApiException extends Exception { - private int code = 0; - private String message = null; - private Map> responseHeaders = null; - private String responseBody = null; +private int code = 0; +private String message = null; +private Map +> responseHeaders = null; + private String responseBody = null; - public ApiException() {} + public ApiException() {} - public ApiException(int code, String message) { + 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; - } -} + } + + 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/client/petstore/java/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java index 04899a110f6..9c429f5df31 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java @@ -1,21 +1,21 @@ package io.swagger.client; public class Configuration { - private static ApiClient defaultApiClient = new ApiClient(); +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; - } +/** +* 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; - } +/** +* 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/client/petstore/java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/java/src/main/java/io/swagger/client/JsonUtil.java index 8e7e686dd0c..a2b18b74574 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/JsonUtil.java @@ -8,16 +8,16 @@ import com.fasterxml.jackson.datatype.joda.*; public class JsonUtil { - public static ObjectMapper mapper; +public static ObjectMapper mapper; - static { - mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); - mapper.registerModule(new JodaModule()); - } +static { +mapper = new ObjectMapper(); +mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); +mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); +mapper.registerModule(new JodaModule()); +} - public static ObjectMapper getJsonMapper() { - return mapper; - } +public static ObjectMapper getJsonMapper() { +return mapper; +} } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java index 5b5af2d5ce0..99b76d84166 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java @@ -1,41 +1,41 @@ package io.swagger.client; 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; - } +/** +* 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 ""; +/** +* 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(); - } +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/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java index bc793fd41ee..72ca45ba907 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java @@ -20,543 +20,591 @@ import java.util.Map; import java.util.HashMap; -public class PetApi { - private ApiClient apiClient; + public class PetApi { + private ApiClient apiClient; - public PetApi() { + public PetApi() { this(Configuration.getDefaultApiClient()); - } + } - public PetApi(ApiClient apiClient) { + public PetApi(ApiClient apiClient) { this.apiClient = apiClient; - } + } - public ApiClient getApiClient() { + public ApiClient getApiClient() { return apiClient; - } + } - public void setApiClient(ApiClient 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 - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - + } + } catch (ApiException ex) { + throw ex; + } + } - - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - if (status != null) - queryParams.put("status", apiClient.parameterToString(status)); - - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + Map + headerParams = new HashMap + (); + Map + formParams = new HashMap + (); + + if (status != null) + queryParams.put("status", apiClient.parameterToString(status)); + + + + + final String[] accepts = { + "application/json", "application/xml" + }; + final String accept = apiClient.selectHeaderAccept(accepts); + + final String[] contentTypes = { + + }; + final String contentType = apiClient.selectHeaderContentType(contentTypes); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (List) apiClient.deserialize(response, "array", Pet.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - if (tags != null) - queryParams.put("tags", apiClient.parameterToString(tags)); + } + } catch (ApiException ex) { + throw ex; + } + } - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + Map + headerParams = new HashMap + (); + Map + formParams = new HashMap + (); + + if (tags != null) + queryParams.put("tags", apiClient.parameterToString(tags)); + + + + + final String[] accepts = { + "application/json", "application/xml" + }; + final String accept = apiClient.selectHeaderAccept(accepts); + + final String[] contentTypes = { + + }; + final String contentType = apiClient.selectHeaderContentType(contentTypes); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (List) apiClient.deserialize(response, "array", Pet.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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"); - } + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "api_key", "petstore_auth" }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "api_key", "petstore_auth" }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (Pet) apiClient.deserialize(response, "", Pet.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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"); - } + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - 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/x-www-form-urlencoded" - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if (name != null) { - hasFields = true; - mp.field("name", apiClient.parameterToString(name), MediaType.MULTIPART_FORM_DATA_TYPE); - } - - if (status != null) { - hasFields = true; - mp.field("status", apiClient.parameterToString(status), MediaType.MULTIPART_FORM_DATA_TYPE); - } - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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/x-www-form-urlencoded" + }; + final String contentType = apiClient.selectHeaderContentType(contentTypes); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if (name != null) { + hasFields = true; + mp.field("name", apiClient.parameterToString(name), MediaType.MULTIPART_FORM_DATA_TYPE); + } + + if (status != null) { + hasFields = true; + mp.field("status", apiClient.parameterToString(status), MediaType.MULTIPART_FORM_DATA_TYPE); + } + + if(hasFields) postBody = mp; - } - else { - if (name != null) + } + else { + if (name != null) formParams.put("name", apiClient.parameterToString(name)); - if (status != null) + if (status != null) formParams.put("status", apiClient.parameterToString(status)); - - } + + } - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * Deletes a pet - * - * @param apiKey - * @param petId Pet id to delete - * @return void - */ - public void deletePet (String apiKey, 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 deletePet"); - } + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/pet/{petId}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * Deletes a pet + * + * @param apiKey + * @param petId Pet id to delete + * @return void + */ + public void deletePet (String apiKey, 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 deletePet"); + } + + + // create path and map variables + String path = "/pet/{petId}".replaceAll("\\{format\\}","json") + .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + + // query params + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - + } + } catch (ApiException ex) { + throw ex; + } + } - - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if (additionalMetadata != null) { - hasFields = true; - mp.field("additionalMetadata", apiClient.parameterToString(additionalMetadata), MediaType.MULTIPART_FORM_DATA_TYPE); - } - - if (file != null) { - hasFields = true; - mp.field("file", file.getName()); - mp.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)); - } - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + Map + headerParams = new HashMap + (); + Map + formParams = new HashMap + (); + + + + + + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if (additionalMetadata != null) { + hasFields = true; + mp.field("additionalMetadata", apiClient.parameterToString(additionalMetadata), MediaType.MULTIPART_FORM_DATA_TYPE); + } + + if (file != null) { + hasFields = true; + mp.field("file", file.getName()); + mp.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)); + } + + if(hasFields) postBody = mp; - } - else { - if (additionalMetadata != null) + } + else { + if (additionalMetadata != null) formParams.put("additionalMetadata", apiClient.parameterToString(additionalMetadata)); - - - } - - try { - String[] authNames = new String[] { "petstore_auth" }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + + + } + + try { + String[] authNames = new String[] { "petstore_auth" }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + } - } - -} diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java index 727e791c603..1aa551e26ee 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java @@ -20,263 +20,287 @@ import java.util.Map; import java.util.HashMap; -public class StoreApi { - private ApiClient apiClient; + public class StoreApi { + private ApiClient apiClient; - public StoreApi() { + public StoreApi() { this(Configuration.getDefaultApiClient()); - } + } - public StoreApi(ApiClient apiClient) { + public StoreApi(ApiClient apiClient) { this.apiClient = apiClient; - } + } - public ApiClient getApiClient() { + public ApiClient getApiClient() { return apiClient; - } + } - public void setApiClient(ApiClient 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 - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { "api_key" }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { "api_key" }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (Map) apiClient.deserialize(response, "map", Map.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - + } + } catch (ApiException ex) { + throw ex; + } + } - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (Order) apiClient.deserialize(response, "", Order.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - // 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 - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (Order) apiClient.deserialize(response, "", Order.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - // 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 - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + } - } - -} diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java index 9e55bbed590..8f03ada8d66 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java @@ -20,503 +20,551 @@ import java.util.Map; import java.util.HashMap; -public class UserApi { - private ApiClient apiClient; + public class UserApi { + private ApiClient apiClient; - public UserApi() { + public UserApi() { this(Configuration.getDefaultApiClient()); - } + } - public UserApi(ApiClient apiClient) { + public UserApi(ApiClient apiClient) { this.apiClient = apiClient; - } + } - public ApiClient getApiClient() { + public ApiClient getApiClient() { return apiClient; - } + } - public void setApiClient(ApiClient 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 - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - + } + } catch (ApiException ex) { + throw ex; + } + } - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/user/createWithList".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - if (username != null) - queryParams.put("username", apiClient.parameterToString(username)); - if (password != null) - queryParams.put("password", apiClient.parameterToString(password)); + } + } catch (ApiException ex) { + throw ex; + } + } - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + Map + headerParams = new HashMap + (); + Map + formParams = new HashMap + (); + + if (username != null) + queryParams.put("username", apiClient.parameterToString(username)); + if (password != null) + queryParams.put("password", apiClient.parameterToString(password)); + + + + + final String[] accepts = { + "application/json", "application/xml" + }; + final String accept = apiClient.selectHeaderAccept(accepts); + + final String[] contentTypes = { + + }; + final String contentType = apiClient.selectHeaderContentType(contentTypes); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (String) apiClient.deserialize(response, "", String.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * Logs out current logged in user session - * - * @return void - */ - public void logoutUser () throws ApiException { - Object postBody = null; + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/user/logout".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - + } + } catch (ApiException ex) { + throw ex; + } + } - - - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return (User) apiClient.deserialize(response, "", User.class); - } - else { + } + else { return null; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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"); - } + } + } catch (ApiException ex) { + throw ex; + } + } - - // create path and map variables - String path = "/user/{username}".replaceAll("\\{format\\}","json") - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - Map queryParams = new HashMap(); - 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); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; - } - } - - /** - * 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 - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - + } + } catch (ApiException ex) { + throw ex; + } + } - - final String[] accepts = { - "application/json", "application/xml" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - if(contentType.startsWith("multipart/form-data")) { - boolean hasFields = false; - FormDataMultiPart mp = new FormDataMultiPart(); - - if(hasFields) + /** + * 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 + Map + queryParams = new HashMap + (); + 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); + + if(contentType.startsWith("multipart/form-data")) { + boolean hasFields = false; + FormDataMultiPart mp = new FormDataMultiPart(); + + if(hasFields) postBody = mp; - } - else { - - } - - try { - String[] authNames = new String[] { }; - String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); - if(response != null){ + } + else { + + } + + try { + String[] authNames = new String[] { }; + String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames); + if(response != null){ return ; - } - else { + } + else { return ; - } - } catch (ApiException ex) { - throw ex; + } + } catch (ApiException ex) { + throw ex; + } + } + } - } - -} diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index ce55babb51d..8d17873b0e9 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -3,53 +3,55 @@ import java.util.Map; 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(Map queryParams, Map headerParams) { - String value; - if (apiKeyPrefix != null) { - value = apiKeyPrefix + " " + apiKey; - } else { - value = apiKey; - } - if (location == "query") { - queryParams.put(paramName, value); - } else if (location == "header") { - headerParams.put(paramName, value); - } - } +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(Map + queryParams, Map + headerParams) { +String value; +if (apiKeyPrefix != null) { +value = apiKeyPrefix + " " + apiKey; +} else { +value = apiKey; +} +if (location == "query") { +queryParams.put(paramName, value); +} else if (location == "header") { +headerParams.put(paramName, value); +} +} } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java index 3f372404c8d..e88af689acc 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java @@ -3,6 +3,8 @@ import java.util.Map; public interface Authentication { - /** Apply authentication settings to header and query params. */ - void applyToParams(Map queryParams, Map headerParams); +/** Apply authentication settings to header and query params. */ +void applyToParams(Map + queryParams, Map + headerParams); } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java index 24bff8c2266..fa1727e1252 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java @@ -6,32 +6,34 @@ import javax.xml.bind.DatatypeConverter; 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(Map 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); - } - } +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(Map + 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/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java index d834f4580c2..fe0fa052bbf 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java @@ -3,8 +3,10 @@ import java.util.Map; public class OAuth implements Authentication { - @Override - public void applyToParams(Map queryParams, Map headerParams) { - // TODO: support oauth - } +@Override +public void applyToParams(Map + queryParams, Map + headerParams) { +// TODO: support oauth +} } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java index ad67267a2f6..7c8e4819f6e 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java @@ -1,44 +1,44 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; + + @ApiModel(description = "") + public class Category { + + private Long id = null; + private String name = null; -@ApiModel(description = "") -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("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; - } + + /** + **/ + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Category {\n"); @@ -46,5 +46,6 @@ public String toString() { sb.append(" name: ").append(name).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java index b9f7d1dc897..301f8fb1c44 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java @@ -2,100 +2,100 @@ import java.util.Date; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; + + @ApiModel(description = "") + 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; -@ApiModel(description = "") -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("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("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("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; - } + + /** + **/ + @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; - } + + /** + * 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; - } + + /** + **/ + @ApiModelProperty(value = "") + @JsonProperty("complete") + public Boolean getComplete() { + return complete; + } + public void setComplete(Boolean complete) { + this.complete = complete; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Order {\n"); @@ -107,5 +107,6 @@ public String toString() { sb.append(" complete: ").append(complete).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java index d685a8c1cbf..fcb4b51113f 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java @@ -4,100 +4,100 @@ import io.swagger.client.model.Tag; import java.util.*; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; + + @ApiModel(description = "") + 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; -@ApiModel(description = "") -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("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(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("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(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; - } + + /** + **/ + @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; - } + + /** + * 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() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Pet {\n"); @@ -109,5 +109,6 @@ public String toString() { sb.append(" status: ").append(status).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java index b9dddc92f1b..739eba7d0af 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java @@ -1,44 +1,44 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; + + @ApiModel(description = "") + public class Tag { + + private Long id = null; + private String name = null; -@ApiModel(description = "") -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("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; - } + + /** + **/ + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } - + - @Override - public String toString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Tag {\n"); @@ -46,5 +46,6 @@ public String toString() { sb.append(" name: ").append(name).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java index 9811a7741f9..5f4e2d6e36f 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java @@ -1,123 +1,123 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; + + @ApiModel(description = "") + 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; -@ApiModel(description = "") -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("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("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("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("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("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("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; - } + + /** + **/ + @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; - } + + /** + * 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() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class User {\n"); @@ -131,5 +131,6 @@ public String toString() { sb.append(" userStatus: ").append(userStatus).append("\n"); sb.append("}\n"); return sb.toString(); - } -} + } + } + diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java index d0ec118083a..8a560d2d7bc 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java @@ -4,108 +4,109 @@ import java.util.Map; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; + public class ApiClientTest { - ApiClient apiClient = null; + ApiClient apiClient = null; - @Before - public void setup() { - apiClient = new ApiClient(); - } + @Before + public void setup() { + apiClient = new ApiClient(); + } + + @Test + public void testSelectHeaderAccept() { + String[] accepts = {"APPLICATION/JSON", "APPLICATION/XML"}; + assertEquals("application/json", apiClient.selectHeaderAccept(accepts)); - @Test - public void testSelectHeaderAccept() { - String[] accepts = { "APPLICATION/JSON", "APPLICATION/XML" }; - assertEquals("application/json", apiClient.selectHeaderAccept(accepts)); + accepts = new String[]{"application/json", "application/xml"}; + assertEquals("application/json", apiClient.selectHeaderAccept(accepts)); - accepts = new String[] { "application/json", "application/xml" }; - assertEquals("application/json", apiClient.selectHeaderAccept(accepts)); + accepts = new String[]{"application/xml", "application/json"}; + assertEquals("application/json", apiClient.selectHeaderAccept(accepts)); - accepts = new String[] { "application/xml", "application/json" }; - assertEquals("application/json", apiClient.selectHeaderAccept(accepts)); + accepts = new String[]{"text/plain", "application/xml"}; + assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts)); - accepts = new String[] { "text/plain", "application/xml" }; - assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts)); + accepts = new String[]{}; + assertNull(apiClient.selectHeaderAccept(accepts)); + } - accepts = new String[] { }; - assertNull(apiClient.selectHeaderAccept(accepts)); - } + @Test + public void testSelectHeaderContentType() { + String[] contentTypes = {"APPLICATION/JSON", "APPLICATION/XML"}; + assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); - @Test - public void testSelectHeaderContentType() { - String[] contentTypes = { "APPLICATION/JSON", "APPLICATION/XML" }; - assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); + contentTypes = new String[]{"application/json", "application/xml"}; + assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); - contentTypes = new String[] { "application/json", "application/xml" }; - assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); + contentTypes = new String[]{"application/xml", "application/json"}; + assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); - contentTypes = new String[] { "application/xml", "application/json" }; - assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); + contentTypes = new String[]{"text/plain", "application/xml"}; + assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes)); - contentTypes = new String[] { "text/plain", "application/xml" }; - assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes)); + contentTypes = new String[]{}; + assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); + } - contentTypes = new String[] { }; - assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes)); - } + @Test + public void testGetAuthentications() { + Map auths = apiClient.getAuthentications(); - @Test - public void testGetAuthentications() { - Map auths = apiClient.getAuthentications(); + Authentication auth = auths.get("api_key"); + assertNotNull(auth); + assertTrue(auth instanceof ApiKeyAuth); + ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth; + assertEquals("header", apiKeyAuth.getLocation()); + assertEquals("api_key", apiKeyAuth.getParamName()); - Authentication auth = auths.get("api_key"); - assertNotNull(auth); - assertTrue(auth instanceof ApiKeyAuth); - ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth; - assertEquals("header", apiKeyAuth.getLocation()); - assertEquals("api_key", apiKeyAuth.getParamName()); + auth = auths.get("petstore_auth"); + assertTrue(auth instanceof OAuth); + assertSame(auth, apiClient.getAuthentication("petstore_auth")); - auth = auths.get("petstore_auth"); - assertTrue(auth instanceof OAuth); - assertSame(auth, apiClient.getAuthentication("petstore_auth")); + assertNull(auths.get("unknown")); - assertNull(auths.get("unknown")); + try { + auths.put("my_auth", new HttpBasicAuth()); + fail("the authentications returned should not be modifiable"); + } catch (UnsupportedOperationException e) { + } + } - try { - auths.put("my_auth", new HttpBasicAuth()); - fail("the authentications returned should not be modifiable"); - } catch (UnsupportedOperationException e) { + @Test + public void testSetUsername() { + try { + apiClient.setUsername("my-username"); + fail("there should be no HTTP basic authentications"); + } catch (RuntimeException e) { + } } - } - - @Test - public void testSetUsername() { - try { - apiClient.setUsername("my-username"); - fail("there should be no HTTP basic authentications"); - } catch (RuntimeException e) { + + @Test + public void testSetPassword() { + try { + apiClient.setPassword("my-password"); + fail("there should be no HTTP basic authentications"); + } catch (RuntimeException e) { + } } - } - - @Test - public void testSetPassword() { - try { - apiClient.setPassword("my-password"); - fail("there should be no HTTP basic authentications"); - } catch (RuntimeException e) { + + @Test + public void testSetApiKeyAndPrefix() { + ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key"); + auth.setApiKey(null); + auth.setApiKeyPrefix(null); + + apiClient.setApiKey("my-api-key"); + apiClient.setApiKeyPrefix("Token"); + assertEquals("my-api-key", auth.getApiKey()); + assertEquals("Token", auth.getApiKeyPrefix()); + + // reset values + auth.setApiKey(null); + auth.setApiKeyPrefix(null); } - } - - @Test - public void testSetApiKeyAndPrefix() { - ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key"); - auth.setApiKey(null); - auth.setApiKeyPrefix(null); - - apiClient.setApiKey("my-api-key"); - apiClient.setApiKeyPrefix("Token"); - assertEquals("my-api-key", auth.getApiKey()); - assertEquals("Token", auth.getApiKeyPrefix()); - - // reset values - auth.setApiKey(null); - auth.setApiKeyPrefix(null); - } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java index 9801be416fb..b95eb74605e 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java @@ -1,14 +1,15 @@ package io.swagger.client; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; + public class ConfigurationTest { - @Test - public void testDefaultApiClient() { - ApiClient apiClient = Configuration.getDefaultApiClient(); - assertNotNull(apiClient); - assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath()); - assertFalse(apiClient.isDebugging()); - } + @Test + public void testDefaultApiClient() { + ApiClient apiClient = Configuration.getDefaultApiClient(); + assertNotNull(apiClient); + assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath()); + assertFalse(apiClient.isDebugging()); + } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/StringUtilTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/StringUtilTest.java index a9abfb03290..4b03c7a9812 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/StringUtilTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/StringUtilTest.java @@ -1,32 +1,33 @@ package io.swagger.client; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; + public class StringUtilTest { - @Test - public void testContainsIgnoreCase() { - assertTrue(StringUtil.containsIgnoreCase(new String[]{ "abc" }, "abc")); - assertTrue(StringUtil.containsIgnoreCase(new String[]{ "abc" }, "ABC")); - assertTrue(StringUtil.containsIgnoreCase(new String[]{ "ABC" }, "abc")); - assertTrue(StringUtil.containsIgnoreCase(new String[]{ null, "abc" }, "ABC")); - assertTrue(StringUtil.containsIgnoreCase(new String[]{ null, "abc" }, null)); + @Test + public void testContainsIgnoreCase() { + assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc")); + assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC")); + assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc")); + assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC")); + assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null)); - assertFalse(StringUtil.containsIgnoreCase(new String[]{ "abc" }, "def")); - assertFalse(StringUtil.containsIgnoreCase(new String[]{ }, "ABC")); - assertFalse(StringUtil.containsIgnoreCase(new String[]{ }, null)); - } + assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def")); + assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC")); + assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null)); + } - @Test - public void testJoin() { - String[] array = { "aa", "bb", "cc" }; - assertEquals("aa,bb,cc", StringUtil.join(array, ",")); - assertEquals("aa, bb, cc", StringUtil.join(array, ", ")); - assertEquals("aabbcc", StringUtil.join(array, "")); - assertEquals("aa bb cc", StringUtil.join(array, " ")); - assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n")); + @Test + public void testJoin() { + String[] array = {"aa", "bb", "cc"}; + assertEquals("aa,bb,cc", StringUtil.join(array, ",")); + assertEquals("aa, bb, cc", StringUtil.join(array, ", ")); + assertEquals("aabbcc", StringUtil.join(array, "")); + assertEquals("aa bb cc", StringUtil.join(array, " ")); + assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n")); - assertEquals("", StringUtil.join(new String[]{ }, ",")); - assertEquals("abc", StringUtil.join(new String[]{ "abc" }, ",")); - } + assertEquals("", StringUtil.join(new String[]{}, ",")); + assertEquals("abc", StringUtil.join(new String[]{"abc"}, ",")); + } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java index f90ee3d7b22..0a0bf57da61 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java @@ -1,40 +1,41 @@ package io.swagger.client.auth; -import java.util.Map; import java.util.HashMap; +import java.util.Map; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; + public class ApiKeyAuthTest { - @Test - public void testApplyToParamsInQuery() { - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - ApiKeyAuth auth = new ApiKeyAuth("query", "api_key"); - auth.setApiKey("my-api-key"); - auth.applyToParams(queryParams, headerParams); - - assertEquals(1, queryParams.size()); - assertEquals("my-api-key", queryParams.get("api_key")); - // no changes to header parameters - assertEquals(0, headerParams.size()); - } - - @Test - public void testApplyToParamsInHeaderWithPrefix() { - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN"); - auth.setApiKey("my-api-token"); - auth.setApiKeyPrefix("Token"); - auth.applyToParams(queryParams, headerParams); - - // no changes to query parameters - assertEquals(0, queryParams.size()); - assertEquals(1, headerParams.size()); - assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN")); - } + @Test + public void testApplyToParamsInQuery() { + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + ApiKeyAuth auth = new ApiKeyAuth("query", "api_key"); + auth.setApiKey("my-api-key"); + auth.applyToParams(queryParams, headerParams); + + assertEquals(1, queryParams.size()); + assertEquals("my-api-key", queryParams.get("api_key")); + // no changes to header parameters + assertEquals(0, headerParams.size()); + } + + @Test + public void testApplyToParamsInHeaderWithPrefix() { + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN"); + auth.setApiKey("my-api-token"); + auth.setApiKeyPrefix("Token"); + auth.applyToParams(queryParams, headerParams); + + // no changes to query parameters + assertEquals(0, queryParams.size()); + assertEquals(1, headerParams.size()); + assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN")); + } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java index 87d6eca8b82..a621cb60e48 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java @@ -1,48 +1,49 @@ package io.swagger.client.auth; -import java.util.Map; import java.util.HashMap; +import java.util.Map; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; + public class HttpBasicAuthTest { - HttpBasicAuth auth = null; - - @Before - public void setup() { - auth = new HttpBasicAuth(); - } - - @Test - public void testApplyToParams() { - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - auth.setUsername("my-username"); - auth.setPassword("my-password"); - auth.applyToParams(queryParams, headerParams); - - // no changes to query parameters - assertEquals(0, queryParams.size()); - assertEquals(1, headerParams.size()); - // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix - String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ="; - assertEquals(expected, headerParams.get("Authorization")); - - // null username should be treated as empty string - auth.setUsername(null); - auth.applyToParams(queryParams, headerParams); - // the string below is base64-encoded result of ":my-password" with the "Basic " prefix - expected = "Basic Om15LXBhc3N3b3Jk"; - assertEquals(expected, headerParams.get("Authorization")); - - // null password should be treated as empty string - auth.setUsername("my-username"); - auth.setPassword(null); - auth.applyToParams(queryParams, headerParams); - // the string below is base64-encoded result of "my-username:" with the "Basic " prefix - expected = "Basic bXktdXNlcm5hbWU6"; - assertEquals(expected, headerParams.get("Authorization")); - } + HttpBasicAuth auth = null; + + @Before + public void setup() { + auth = new HttpBasicAuth(); + } + + @Test + public void testApplyToParams() { + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + auth.setUsername("my-username"); + auth.setPassword("my-password"); + auth.applyToParams(queryParams, headerParams); + + // no changes to query parameters + assertEquals(0, queryParams.size()); + assertEquals(1, headerParams.size()); + // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix + String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ="; + assertEquals(expected, headerParams.get("Authorization")); + + // null username should be treated as empty string + auth.setUsername(null); + auth.applyToParams(queryParams, headerParams); + // the string below is base64-encoded result of ":my-password" with the "Basic " prefix + expected = "Basic Om15LXBhc3N3b3Jk"; + assertEquals(expected, headerParams.get("Authorization")); + + // null password should be treated as empty string + auth.setUsername("my-username"); + auth.setPassword(null); + auth.applyToParams(queryParams, headerParams); + // the string below is base64-encoded result of "my-username:" with the "Basic " prefix + expected = "Basic bXktdXNlcm5hbWU6"; + assertEquals(expected, headerParams.get("Authorization")); + } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java index 854af7121da..7178049d644 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java @@ -1,188 +1,192 @@ package io.swagger.petstore.test; -import io.swagger.client.ApiException; import io.swagger.client.ApiClient; +import io.swagger.client.ApiException; import io.swagger.client.Configuration; + import io.swagger.client.api.*; -import io.swagger.client.model.*; import io.swagger.client.auth.*; +import io.swagger.client.model.*; -import java.util.*; -import java.io.*; +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 static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class PetApiTest { - PetApi api = null; - - @Before - public void setup() { - api = new PetApi(); - // setup authentication - ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); - apiKeyAuth.setApiKey("special-key"); - } - - @Test - public void testApiClient() { - // the default api client is used - assertEquals(Configuration.getDefaultApiClient(), api.getApiClient()); - assertNotNull(api.getApiClient()); - assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath()); - assertFalse(api.getApiClient().isDebugging()); - - ApiClient oldClient = api.getApiClient(); - - ApiClient newClient = new ApiClient(); - newClient.setBasePath("http://example.com"); - newClient.setDebugging(true); - - // set api client via constructor - api = new PetApi(newClient); - assertNotNull(api.getApiClient()); - assertEquals("http://example.com", api.getApiClient().getBasePath()); - assertTrue(api.getApiClient().isDebugging()); - - // set api client via setter method - api.setApiClient(oldClient); - assertNotNull(api.getApiClient()); - assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath()); - assertFalse(api.getApiClient().isDebugging()); - } - - @Test - public void testCreateAndGetPet() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - 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); - - Pet fetched = api.getPetById(pet.getId()); - 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); - - List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})); - assertNotNull(pets); - - boolean found = false; - for(Pet fetched : pets) { - if(fetched.getId().equals(pet.getId())) { - found = true; - break; - } + PetApi api = null; + + @Before + public void setup() { + api = new PetApi(); + // setup authentication + ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); + apiKeyAuth.setApiKey("special-key"); } - assertTrue(found); - } + @Test + public void testApiClient() { + // the default api client is used + assertEquals(Configuration.getDefaultApiClient(), api.getApiClient()); + assertNotNull(api.getApiClient()); + assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath()); + assertFalse(api.getApiClient().isDebugging()); + + ApiClient oldClient = api.getApiClient(); + + ApiClient newClient = new ApiClient(); + newClient.setBasePath("http://example.com"); + newClient.setDebugging(true); + + // set api client via constructor + api = new PetApi(newClient); + assertNotNull(api.getApiClient()); + assertEquals("http://example.com", api.getApiClient().getBasePath()); + assertTrue(api.getApiClient().isDebugging()); + + // set api client via setter method + api.setApiClient(oldClient); + assertNotNull(api.getApiClient()); + assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath()); + assertFalse(api.getApiClient().isDebugging()); + } - @Test - public void testFindPetsByTags() throws Exception { - Pet pet = createRandomPet(); - pet.setName("monster"); - pet.setStatus(Pet.StatusEnum.available); + @Test + public void testCreateAndGetPet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); - List tags = new ArrayList(); - Tag tag1 = new Tag(); - tag1.setName("friendly"); - tags.add(tag1); - pet.setTags(tags); + Pet fetched = api.getPetById(pet.getId()); + assertNotNull(fetched); + assertEquals(pet.getId(), fetched.getId()); + assertNotNull(fetched.getCategory()); + assertEquals(fetched.getCategory().getName(), pet.getCategory().getName()); + } - api.updatePet(pet); + @Test + public void testUpdatePet() throws Exception { + Pet pet = createRandomPet(); + pet.setName("programmer"); - List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})); - assertNotNull(pets); + api.updatePet(pet); - boolean found = false; - for(Pet fetched : pets) { - if(fetched.getId().equals(pet.getId())) { - found = true; - break; - } + Pet fetched = api.getPetById(pet.getId()); + assertNotNull(fetched); + assertEquals(pet.getId(), fetched.getId()); + assertNotNull(fetched.getCategory()); + assertEquals(fetched.getCategory().getName(), pet.getCategory().getName()); } - assertTrue(found); - } - @Test - public void testUpdatePetWithForm() throws Exception { - Pet pet = createRandomPet(); - pet.setName("frank"); - api.addPet(pet); + @Test + public void testFindPetsByStatus() throws Exception { + Pet pet = createRandomPet(); + pet.setName("programmer"); + pet.setStatus(Pet.StatusEnum.available); - Pet fetched = api.getPetById(pet.getId()); + api.updatePet(pet); - api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null); - Pet updated = api.getPetById(fetched.getId()); + List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})); + assertNotNull(pets); - assertEquals(updated.getName(), "furt"); - } + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } - @Test - public void testDeletePet() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); + assertTrue(found); + } - Pet fetched = api.getPetById(pet.getId()); - api.deletePet(null, fetched.getId()); + @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); + + List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})); + 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); + + Pet fetched = api.getPetById(pet.getId()); - try { - fetched = api.getPetById(fetched.getId()); - fail("expected an error"); + api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null); + Pet updated = api.getPetById(fetched.getId()); + + assertEquals(updated.getName(), "furt"); } - catch (ApiException e) { - assertEquals(404, e.getCode()); + + @Test + public void testDeletePet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + api.deletePet(null, fetched.getId()); + + try { + fetched = api.getPetById(fetched.getId()); + fail("expected an error"); + } catch (ApiException e) { + assertEquals(404, e.getCode()); + } } - } - @Test - public void testUploadFile() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); + @Test + public void testUploadFile() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); - File file = new File("hello.txt"); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - writer.write("Hello world!"); - writer.close(); + 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", new File(file.getAbsolutePath())); - } + api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath())); + } - private Pet createRandomPet() { - Pet pet = new Pet(); - pet.setId(System.currentTimeMillis()); - pet.setName("gorilla"); + private Pet createRandomPet() { + Pet pet = new Pet(); + pet.setId(System.currentTimeMillis()); + pet.setName("gorilla"); - Category category = new Category(); - category.setName("really-happy"); + 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); + 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; - } + return pet; + } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java index 1499c4eaf86..508764b8c2d 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -1,73 +1,72 @@ package io.swagger.petstore.test; import io.swagger.client.ApiException; -import io.swagger.client.Configuration; + +import io.swagger.client.*; import io.swagger.client.api.*; -import io.swagger.client.model.*; import io.swagger.client.auth.*; +import io.swagger.client.model.*; -import java.util.*; -import java.io.*; +import java.util.Map; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class StoreApiTest { - StoreApi api = null; + StoreApi api = null; - @Before - public void setup() { - api = new StoreApi(); - // setup authentication - ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); - apiKeyAuth.setApiKey("special-key"); - } + @Before + public void setup() { + api = new StoreApi(); + // setup authentication + ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); + apiKeyAuth.setApiKey("special-key"); + } - @Test - public void testGetInventory() throws Exception { - Map inventory = api.getInventory(); - assertTrue(inventory.keySet().size() > 0); - } + @Test + public void testGetInventory() throws Exception { + Map inventory = api.getInventory(); + assertTrue(inventory.keySet().size() > 0); + } - @Test - public void testPlaceOrder() throws Exception { - Order order = createOrder(); - api.placeOrder(order); + @Test + public void testPlaceOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order); - Order fetched = api.getOrderById(String.valueOf(order.getId())); - assertEquals(order.getId(), fetched.getId()); - assertEquals(order.getPetId(), fetched.getPetId()); - assertEquals(order.getQuantity(), fetched.getQuantity()); - } + Order fetched = api.getOrderById(String.valueOf(order.getId())); + assertEquals(order.getId(), fetched.getId()); + assertEquals(order.getPetId(), fetched.getPetId()); + assertEquals(order.getQuantity(), fetched.getQuantity()); + } - @Test - public void testDeleteOrder() throws Exception { - Order order = createOrder(); - api.placeOrder(order); + @Test + public void testDeleteOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order); - Order fetched = api.getOrderById(String.valueOf(order.getId())); - assertEquals(fetched.getId(), order.getId()); + Order fetched = api.getOrderById(String.valueOf(order.getId())); + assertEquals(fetched.getId(), order.getId()); - api.deleteOrder(String.valueOf(order.getId())); + api.deleteOrder(String.valueOf(order.getId())); - try { - api.getOrderById(String.valueOf(order.getId())); - // fail("expected an error"); + try { + api.getOrderById(String.valueOf(order.getId())); + // fail("expected an error"); + } catch (ApiException e) { + // ok + } } - catch (ApiException e) { - // ok - } - } - 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); + 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; - } + return order; + } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java index e3bccd0dcdb..26e46bfa602 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -1,89 +1,86 @@ package io.swagger.petstore.test; -import io.swagger.client.ApiException; -import io.swagger.client.Configuration; import io.swagger.client.api.*; -import io.swagger.client.model.*; import io.swagger.client.auth.*; +import io.swagger.client.model.*; -import java.util.*; -import java.io.*; +import java.util.Arrays; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class UserApiTest { - UserApi api = null; - - @Before - public void setup() { - api = new UserApi(); - // setup authentication - ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); - apiKeyAuth.setApiKey("special-key"); - } - - @Test - public void testCreateUser() throws Exception { - User user = createUser(); - - api.createUser(user); - - User fetched = api.getUserByName(user.getUsername()); - 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})); - - User fetched = api.getUserByName(user1.getUsername()); - 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})); - - User fetched = api.getUserByName(user1.getUsername()); - assertEquals(user1.getId(), fetched.getId()); - } - - @Test - public void testLoginUser() throws Exception { - User user = createUser(); - api.createUser(user); - - String token = api.loginUser(user.getUsername(), user.getPassword()); - assertTrue(token.startsWith("logged in user session:")); - } - - @Test - public void logoutUser() throws Exception { - api.logoutUser(); - } - - 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; - } + UserApi api = null; + + @Before + public void setup() { + api = new UserApi(); + // setup authentication + ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key"); + apiKeyAuth.setApiKey("special-key"); + } + + @Test + public void testCreateUser() throws Exception { + User user = createUser(); + + api.createUser(user); + + User fetched = api.getUserByName(user.getUsername()); + 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})); + + User fetched = api.getUserByName(user1.getUsername()); + 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})); + + User fetched = api.getUserByName(user1.getUsername()); + assertEquals(user1.getId(), fetched.getId()); + } + + @Test + public void testLoginUser() throws Exception { + User user = createUser(); + api.createUser(user); + + String token = api.loginUser(user.getUsername(), user.getPassword()); + assertTrue(token.startsWith("logged in user session:")); + } + + @Test + public void logoutUser() throws Exception { + api.logoutUser(); + } + + 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; + } } diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h index c6172fd5fcc..622ab1d3916 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h @@ -3,7 +3,7 @@ // PetstoreClient // // Created by Tony Tam on 10/18/13. -// Copyright (c) 2013 Reverb. All rights reserved. +// Copyright (c) 2015 SmartBear Software. All rights reserved. // #import diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m index c0013e2cbed..a63c7d1ad89 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m @@ -3,7 +3,7 @@ // PetstoreClient // // Created by Tony Tam on 10/18/13. -// Copyright (c) 2013 Reverb. All rights reserved. +// Copyright (c) 2015 SmartBear Software. All rights reserved. // #import "AppDelegate.h" diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json index b7f3352ee7c..64224a68564 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,58 +1,58 @@ { - "images" : [ + "images": [ { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "idiom": "iphone", + "size": "29x29", + "scale": "2x" }, { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "idiom": "iphone", + "size": "40x40", + "scale": "2x" }, { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "idiom": "iphone", + "size": "60x60", + "scale": "2x" }, { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "idiom": "iphone", + "size": "60x60", + "scale": "3x" }, { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" + "idiom": "ipad", + "size": "29x29", + "scale": "1x" }, { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" + "idiom": "ipad", + "size": "29x29", + "scale": "2x" }, { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" + "idiom": "ipad", + "size": "40x40", + "scale": "1x" }, { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" + "idiom": "ipad", + "size": "40x40", + "scale": "2x" }, { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" + "idiom": "ipad", + "size": "76x76", + "scale": "1x" }, { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" + "idiom": "ipad", + "size": "76x76", + "scale": "2x" } ], - "info" : { - "version" : 1, - "author" : "xcode" + "info": { + "version": 1, + "author": "xcode" } } \ No newline at end of file diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json index 6f870a4629d..eaa3ad8a5dc 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,51 +1,51 @@ { - "images" : [ + "images": [ { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" + "orientation": "portrait", + "idiom": "iphone", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x" }, { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" + "orientation": "portrait", + "idiom": "iphone", + "subtype": "retina4", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x" }, { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" + "orientation": "portrait", + "idiom": "ipad", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x" }, { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" + "orientation": "landscape", + "idiom": "ipad", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x" }, { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" + "orientation": "portrait", + "idiom": "ipad", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x" }, { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" + "orientation": "landscape", + "idiom": "ipad", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x" } ], - "info" : { - "version" : 1, - "author" : "xcode" + "info": { + "version": 1, + "author": "xcode" } } \ No newline at end of file diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h index 4df89c445de..f6e0cde9cd6 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h @@ -3,7 +3,7 @@ // PetstoreClient // // Created by Tony Tam on 10/18/13. -// Copyright (c) 2013 Reverb. All rights reserved. +// Copyright (c) 2015 SmartBear Software. All rights reserved. // #import diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m index d56bc037206..fd15f391f49 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m @@ -3,7 +3,7 @@ // PetstoreClient // // Created by Tony Tam on 10/18/13. -// Copyright (c) 2013 Reverb. All rights reserved. +// Copyright (c) 2015 SmartBear Software. All rights reserved. // #import "ViewController.h" diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m index 644c21bf165..d351099cbe1 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m +++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m @@ -3,7 +3,7 @@ // PetstoreClient // // Created by Tony Tam on 10/18/13. -// Copyright (c) 2013 Reverb. All rights reserved. +// Copyright (c) 2015 SmartBear Software. All rights reserved. // #import diff --git a/samples/client/petstore/objc/PetstoreClient/pom.xml b/samples/client/petstore/objc/PetstoreClient/pom.xml index 513976e90b0..5cb5024538c 100644 --- a/samples/client/petstore/objc/PetstoreClient/pom.xml +++ b/samples/client/petstore/objc/PetstoreClient/pom.xml @@ -1,24 +1,24 @@ - 4.0.0 - de.felixschulze.my-project - PetstoreClient - xcode - 1.0-SNAPSHOT - Swagger Petstore Client - - - - de.felixschulze.maven.plugins.xcode - xcode-maven-plugin - 1.2 - - PetstoreClient.xcodeproj - PetstoreClient - Debug - iphoneos - - true - - - + 4.0.0 + de.felixschulze.my-project + PetstoreClient + xcode + 1.0-SNAPSHOT + Swagger Petstore Client + + + + de.felixschulze.maven.plugins.xcode + xcode-maven-plugin + 1.2 + + PetstoreClient.xcodeproj + PetstoreClient + Debug + iphoneos + + true + + + diff --git a/samples/client/petstore/objc/Podfile b/samples/client/petstore/objc/Podfile index 9a1ad058940..61b00df61ad 100644 --- a/samples/client/petstore/objc/Podfile +++ b/samples/client/petstore/objc/Podfile @@ -1,5 +1,5 @@ platform :ios, '6.0' -xcodeproj 'PetstoreClient/PetstoreClient.xcodeproj' +xcodeproj 'swaggerClient/swaggerClient.xcodeproj' pod 'AFNetworking', '~> 2.1' pod 'JSONModel', '~> 1.0' pod 'ISO8601' diff --git a/samples/client/petstore/objc/client/SWGCategory.h b/samples/client/petstore/objc/client/SWGCategory.h index a2fed79b4a3..a46376c4f8b 100644 --- a/samples/client/petstore/objc/client/SWGCategory.h +++ b/samples/client/petstore/objc/client/SWGCategory.h @@ -1,15 +1,21 @@ -#import +#import + #import "SWGObject.h" + -@protocol SWGCategory -@end - -@interface SWGCategory : SWGObject + @protocol SWGCategory + @end + @interface SWGCategory : SWGObject -@property(nonatomic) NSNumber* _id; + + + @property(nonatomic) NSNumber* _id; + + + @property(nonatomic) NSString* name; + -@property(nonatomic) NSString* name; - -@end + @end + diff --git a/samples/client/petstore/objc/client/SWGCategory.m b/samples/client/petstore/objc/client/SWGCategory.m index c41f76a5247..7ea47e56bb8 100644 --- a/samples/client/petstore/objc/client/SWGCategory.m +++ b/samples/client/petstore/objc/client/SWGCategory.m @@ -1,22 +1,24 @@ -#import "SWGCategory.h" + + #import "SWGCategory.h" -@implementation SWGCategory - -+ (JSONKeyMapper *)keyMapper -{ - return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }]; -} + @implementation SWGCategory -+ (BOOL)propertyIsOptional:(NSString *)propertyName -{ - NSArray *optionalProperties = @[@"_id", @"name"]; + + (JSONKeyMapper *)keyMapper + { + return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }]; + } - if ([optionalProperties containsObject:propertyName]) { - return YES; - } - else { - return NO; - } -} + + (BOOL)propertyIsOptional:(NSString *)propertyName + { + NSArray *optionalProperties = @[@"_id", @"name"]; -@end + if ([optionalProperties containsObject:propertyName]) { + return YES; + } + else { + return NO; + } + } + + + @end diff --git a/samples/client/petstore/objc/client/SWGConfiguration.h b/samples/client/petstore/objc/client/SWGConfiguration.h index 33023ca3c6f..529e07aa81c 100644 --- a/samples/client/petstore/objc/client/SWGConfiguration.h +++ b/samples/client/petstore/objc/client/SWGConfiguration.h @@ -1,56 +1,57 @@ -#import +#import + @interface SWGConfiguration : NSObject /** - * Api key values for Api Key type Authentication - * - * To add or remove api key, use `setValue:forApiKeyField:`. - */ +* Api key values for Api Key type Authentication +* +* To add or remove api key, use `setValue:forApiKeyField:`. +*/ @property (readonly, nonatomic, strong) NSDictionary *apiKey; /** - * Api key prefix values to be prepend to the respective api key - * - * To add or remove prefix, use `setValue:forApiKeyPrefixField:`. - */ +* Api key prefix values to be prepend to the respective api key +* +* To add or remove prefix, use `setValue:forApiKeyPrefixField:`. +*/ @property (readonly, nonatomic, strong) NSDictionary *apiKeyPrefix; /** - * Usename and Password for Basic type Authentication - */ +* Usename and Password for Basic type Authentication +*/ @property (nonatomic) NSString *username; @property (nonatomic) NSString *password; /** - * Get configuration singleton instance - */ +* Get configuration singleton instance +*/ + (instancetype) sharedConfig; /** - * Sets field in `apiKey` - */ +* Sets field in `apiKey` +*/ - (void) setValue:(NSString *)value forApiKeyField:(NSString*)field; /** - * Sets field in `apiKeyPrefix` - */ +* Sets field in `apiKeyPrefix` +*/ - (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field; /** - * Get API key (with prefix if set) - */ +* Get API key (with prefix if set) +*/ - (NSString *) getApiKeyWithPrefix:(NSString *) key; /** - * Get Basic Auth token - */ +* Get Basic Auth token +*/ - (NSString *) getBasicAuthToken; /** - * Get Authentication Setings - */ +* Get Authentication Setings +*/ - (NSDictionary *) authSettings; @end diff --git a/samples/client/petstore/objc/client/SWGConfiguration.m b/samples/client/petstore/objc/client/SWGConfiguration.m index 89d5a597946..dc0bdb44d42 100644 --- a/samples/client/petstore/objc/client/SWGConfiguration.m +++ b/samples/client/petstore/objc/client/SWGConfiguration.m @@ -12,81 +12,81 @@ @implementation SWGConfiguration #pragma mark - Singletion Methods + (instancetype) sharedConfig { - static SWGConfiguration *shardConfig = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - shardConfig = [[self alloc] init]; - }); - return shardConfig; +static SWGConfiguration *shardConfig = nil; +static dispatch_once_t onceToken; +dispatch_once(&onceToken, ^{ +shardConfig = [[self alloc] init]; +}); +return shardConfig; } #pragma mark - Initialize Methods - (instancetype) init { - self = [super init]; - if (self) { - self.username = @""; - self.password = @""; - self.mutableApiKey = [NSMutableDictionary dictionary]; - self.mutableApiKeyPrefix = [NSMutableDictionary dictionary]; - } - return self; +self = [super init]; +if (self) { +self.username = @""; +self.password = @""; +self.mutableApiKey = [NSMutableDictionary dictionary]; +self.mutableApiKeyPrefix = [NSMutableDictionary dictionary]; +} +return self; } #pragma mark - Instance Methods - (NSString *) getApiKeyWithPrefix:(NSString *)key { - if ([self.apiKeyPrefix objectForKey:key] && [self.apiKey objectForKey:key]) { - return [NSString stringWithFormat:@"%@ %@", [self.apiKeyPrefix objectForKey:key], [self.apiKey objectForKey:key]]; - } - else if ([self.apiKey objectForKey:key]) { - return [NSString stringWithFormat:@"%@", [self.apiKey objectForKey:key]]; - } - else { - return @""; - } +if ([self.apiKeyPrefix objectForKey:key] && [self.apiKey objectForKey:key]) { +return [NSString stringWithFormat:@"%@ %@", [self.apiKeyPrefix objectForKey:key], [self.apiKey objectForKey:key]]; +} +else if ([self.apiKey objectForKey:key]) { +return [NSString stringWithFormat:@"%@", [self.apiKey objectForKey:key]]; +} +else { +return @""; +} } - (NSString *) getBasicAuthToken { - NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password]; - NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding]; - basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]]; - - return basicAuthCredentials; +NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password]; +NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding]; +basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]]; + +return basicAuthCredentials; } #pragma mark - Setter Methods - (void) setValue:(NSString *)value forApiKeyField:(NSString *)field { - [self.mutableApiKey setValue:value forKey:field]; +[self.mutableApiKey setValue:value forKey:field]; } - (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field { - [self.mutableApiKeyPrefix setValue:value forKey:field]; +[self.mutableApiKeyPrefix setValue:value forKey:field]; } #pragma mark - Getter Methods - (NSDictionary *) apiKey { - return [NSDictionary dictionaryWithDictionary:self.mutableApiKey]; +return [NSDictionary dictionaryWithDictionary:self.mutableApiKey]; } - (NSDictionary *) apiKeyPrefix { - return [NSDictionary dictionaryWithDictionary:self.mutableApiKeyPrefix]; +return [NSDictionary dictionaryWithDictionary:self.mutableApiKeyPrefix]; } #pragma mark - - (NSDictionary *) authSettings { - return @{ - @"api_key": @{ - @"type": @"api_key", - @"in": @"header", - @"key": @"api_key", - @"value": [self getApiKeyWithPrefix:@"api_key"] - }, - - }; +return @{ + @"api_key": @{ + @"type": @"api_key", + @"in": @"header", + @"key": @"api_key", + @"value": [self getApiKeyWithPrefix:@"api_key"] + }, + +}; } @end diff --git a/samples/client/petstore/objc/client/SWGOrder.h b/samples/client/petstore/objc/client/SWGOrder.h index c4f4f6e81ad..397158e4e7e 100644 --- a/samples/client/petstore/objc/client/SWGOrder.h +++ b/samples/client/petstore/objc/client/SWGOrder.h @@ -1,24 +1,34 @@ -#import +#import + #import "SWGObject.h" - -@protocol SWGOrder -@end - -@interface SWGOrder : SWGObject - - -@property(nonatomic) NSNumber* _id; - -@property(nonatomic) NSNumber* petId; - -@property(nonatomic) NSNumber* quantity; - -@property(nonatomic) NSDate* shipDate; -/* Order Status [optional] - */ -@property(nonatomic) NSString* status; - -@property(nonatomic) BOOL complete; - -@end + + + @protocol SWGOrder + @end + + @interface SWGOrder : SWGObject + + + + @property(nonatomic) NSNumber* _id; + + + @property(nonatomic) NSNumber* petId; + + + @property(nonatomic) NSNumber* quantity; + + + @property(nonatomic) NSDate* shipDate; + + /* Order Status [optional] + */ + @property(nonatomic) NSString* status; + + + @property(nonatomic) BOOL complete; + + + @end + diff --git a/samples/client/petstore/objc/client/SWGOrder.m b/samples/client/petstore/objc/client/SWGOrder.m index 5d3179446ed..19da01c2ad4 100644 --- a/samples/client/petstore/objc/client/SWGOrder.m +++ b/samples/client/petstore/objc/client/SWGOrder.m @@ -1,22 +1,24 @@ -#import "SWGOrder.h" + + #import "SWGOrder.h" -@implementation SWGOrder - -+ (JSONKeyMapper *)keyMapper -{ - return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"petId": @"petId", @"quantity": @"quantity", @"shipDate": @"shipDate", @"status": @"status", @"complete": @"complete" }]; -} + @implementation SWGOrder -+ (BOOL)propertyIsOptional:(NSString *)propertyName -{ - NSArray *optionalProperties = @[@"_id", @"petId", @"quantity", @"shipDate", @"status", @"complete"]; + + (JSONKeyMapper *)keyMapper + { + return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"petId": @"petId", @"quantity": @"quantity", @"shipDate": @"shipDate", @"status": @"status", @"complete": @"complete" }]; + } - if ([optionalProperties containsObject:propertyName]) { - return YES; - } - else { - return NO; - } -} + + (BOOL)propertyIsOptional:(NSString *)propertyName + { + NSArray *optionalProperties = @[@"_id", @"petId", @"quantity", @"shipDate", @"status", @"complete"]; -@end + if ([optionalProperties containsObject:propertyName]) { + return YES; + } + else { + return NO; + } + } + + + @end diff --git a/samples/client/petstore/objc/client/SWGPet.h b/samples/client/petstore/objc/client/SWGPet.h index edd54e9f31a..d979eaa3845 100644 --- a/samples/client/petstore/objc/client/SWGPet.h +++ b/samples/client/petstore/objc/client/SWGPet.h @@ -1,26 +1,36 @@ -#import +#import + #import "SWGObject.h" #import "SWGTag.h" #import "SWGCategory.h" - -@protocol SWGPet -@end - -@interface SWGPet : SWGObject - - -@property(nonatomic) NSNumber* _id; - -@property(nonatomic) SWGCategory* category; - -@property(nonatomic) NSString* name; - -@property(nonatomic) NSArray* photoUrls; - -@property(nonatomic) NSArray* tags; -/* pet status in the store [optional] - */ -@property(nonatomic) NSString* status; - -@end + + + @protocol SWGPet + @end + + @interface SWGPet : SWGObject + + + + @property(nonatomic) NSNumber* _id; + + + @property(nonatomic) SWGCategory* category; + + + @property(nonatomic) NSString* name; + + + @property(nonatomic) NSArray* photoUrls; + + + @property(nonatomic) NSArray* tags; + + /* pet status in the store [optional] + */ + @property(nonatomic) NSString* status; + + + @end + diff --git a/samples/client/petstore/objc/client/SWGPet.m b/samples/client/petstore/objc/client/SWGPet.m index d5559aa6f72..07acd4087bc 100644 --- a/samples/client/petstore/objc/client/SWGPet.m +++ b/samples/client/petstore/objc/client/SWGPet.m @@ -1,22 +1,24 @@ -#import "SWGPet.h" + + #import "SWGPet.h" -@implementation SWGPet - -+ (JSONKeyMapper *)keyMapper -{ - return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"category": @"category", @"name": @"name", @"photoUrls": @"photoUrls", @"tags": @"tags", @"status": @"status" }]; -} + @implementation SWGPet -+ (BOOL)propertyIsOptional:(NSString *)propertyName -{ - NSArray *optionalProperties = @[@"_id", @"category", @"tags", @"status"]; + + (JSONKeyMapper *)keyMapper + { + return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"category": @"category", @"name": @"name", @"photoUrls": @"photoUrls", @"tags": @"tags", @"status": @"status" }]; + } - if ([optionalProperties containsObject:propertyName]) { - return YES; - } - else { - return NO; - } -} + + (BOOL)propertyIsOptional:(NSString *)propertyName + { + NSArray *optionalProperties = @[@"_id", @"category", @"tags", @"status"]; -@end + if ([optionalProperties containsObject:propertyName]) { + return YES; + } + else { + return NO; + } + } + + + @end diff --git a/samples/client/petstore/objc/client/SWGPetApi.h b/samples/client/petstore/objc/client/SWGPetApi.h index aa255cd144e..a164578f6be 100644 --- a/samples/client/petstore/objc/client/SWGPetApi.h +++ b/samples/client/petstore/objc/client/SWGPetApi.h @@ -1,157 +1,167 @@ -#import +#import + #import "SWGPet.h" #import "SWGFile.h" #import "SWGObject.h" #import "SWGApiClient.h" -@interface SWGPetApi: NSObject + @interface SWGPetApi: NSObject -@property(nonatomic, assign)SWGApiClient *apiClient; + @property(nonatomic, assign)SWGApiClient *apiClient; --(instancetype) initWithApiClient:(SWGApiClient *)apiClient; --(void) addHeader:(NSString*)value forKey:(NSString*)key; --(unsigned long) requestQueueSize; -+(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; -+(void) setBasePath:(NSString*)basePath; -+(NSString*) getBasePath; -/** + -(instancetype) initWithApiClient:(SWGApiClient *)apiClient; + -(void) addHeader:(NSString*)value forKey:(NSString*)key; + -(unsigned long) requestQueueSize; + +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; + +(void) setBasePath:(NSString*)basePath; + +(NSString*) getBasePath; + + /** - Update an existing pet - + Update an existing pet + - @param body Pet object that needs to be added to the store - + @param body Pet object that needs to be added to the store + - return type: - */ --(NSNumber*) updatePetWithCompletionBlock :(SWGPet*) body - - - completionHandler: (void (^)(NSError* error))completionBlock; + return type: + */ + -(NSNumber*) updatePetWithCompletionBlock :(SWGPet*) body + + + completionHandler: (void (^)(NSError* error))completionBlock; + + + /** -/** + Add a new pet to the store + - Add a new pet to the store - + @param body Pet object that needs to be added to the store + - @param body Pet object that needs to be added to the store - + return type: + */ + -(NSNumber*) addPetWithCompletionBlock :(SWGPet*) body + + + completionHandler: (void (^)(NSError* error))completionBlock; - return type: - */ --(NSNumber*) addPetWithCompletionBlock :(SWGPet*) body - + - completionHandler: (void (^)(NSError* error))completionBlock; + /** + 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 + - Finds Pets by status - Multiple status values can be provided with comma seperated strings + return type: NSArray* + */ + -(NSNumber*) findPetsByStatusWithCompletionBlock :(NSArray*) status + + completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock; + - @param status Status values that need to be considered for filter - - - return type: NSArray* - */ --(NSNumber*) findPetsByStatusWithCompletionBlock :(NSArray*) status - - completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock; + + /** + Finds Pets by tags + Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. -/** - - 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 + - @param tags Tags to filter by - + return type: NSArray* + */ + -(NSNumber*) findPetsByTagsWithCompletionBlock :(NSArray*) tags + + completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock; + - return type: NSArray* - */ --(NSNumber*) findPetsByTagsWithCompletionBlock :(NSArray*) tags + - completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock; - - + /** -/** + Find pet by ID + Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions - 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 + - @param petId ID of pet that needs to be fetched - + return type: SWGPet* + */ + -(NSNumber*) getPetByIdWithCompletionBlock :(NSNumber*) petId + + completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock; + - return type: SWGPet* - */ --(NSNumber*) getPetByIdWithCompletionBlock :(NSNumber*) petId + - completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock; - - + /** -/** + Updates a pet in the store with form data + - 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 + - @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 type: + */ + -(NSNumber*) updatePetWithFormWithCompletionBlock :(NSString*) petId + name:(NSString*) name + status:(NSString*) status + + + completionHandler: (void (^)(NSError* error))completionBlock; - return type: - */ --(NSNumber*) updatePetWithFormWithCompletionBlock :(NSString*) petId - name:(NSString*) name - status:(NSString*) status - + - completionHandler: (void (^)(NSError* error))completionBlock; + /** + Deletes a pet + -/** + @param apiKey + @param petId Pet id to delete + - Deletes a pet - + return type: + */ + -(NSNumber*) deletePetWithCompletionBlock :(NSString*) apiKey + petId:(NSNumber*) petId + + + completionHandler: (void (^)(NSError* error))completionBlock; - @param apiKey - @param petId Pet id to delete - - - return type: - */ --(NSNumber*) deletePetWithCompletionBlock :(NSString*) apiKey - petId:(NSNumber*) petId - + - completionHandler: (void (^)(NSError* error))completionBlock; + /** + uploads an image + -/** + @param petId ID of pet to update + @param additionalMetadata Additional data to pass to server + @param file file to upload + - uploads an image - + return type: + */ + -(NSNumber*) uploadFileWithCompletionBlock :(NSNumber*) petId + additionalMetadata:(NSString*) additionalMetadata + file:(SWGFile*) file + + + completionHandler: (void (^)(NSError* error))completionBlock; - @param petId ID of pet to update - @param additionalMetadata Additional data to pass to server - @param file file to upload - - - return type: - */ --(NSNumber*) uploadFileWithCompletionBlock :(NSNumber*) petId - additionalMetadata:(NSString*) additionalMetadata - file:(SWGFile*) file - + - completionHandler: (void (^)(NSError* error))completionBlock; - - @end diff --git a/samples/client/petstore/objc/client/SWGPetApi.m b/samples/client/petstore/objc/client/SWGPetApi.m index c14da125af5..64349d7dcc0 100644 --- a/samples/client/petstore/objc/client/SWGPetApi.m +++ b/samples/client/petstore/objc/client/SWGPetApi.m @@ -1,918 +1,924 @@ -#import "SWGPetApi.h" -#import "SWGFile.h" -#import "SWGQueryParamCollection.h" -#import "SWGPet.h" -#import "SWGFile.h" - + #import "SWGPetApi.h" + #import "SWGFile.h" + #import "SWGQueryParamCollection.h" + #import "SWGPet.h" + #import "SWGFile.h" + + -@interface SWGPetApi () + @interface SWGPetApi () @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders; -@end + @end -@implementation SWGPetApi + @implementation SWGPetApi -static NSString * basePath = @"http://petstore.swagger.io/v2"; + static NSString * basePath = @"http://petstore.swagger.io/v2"; -#pragma mark - Initialize methods + #pragma mark - Initialize methods -- (id) init { + - (id) init { self = [super init]; if (self) { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - self.defaultHeaders = [NSMutableDictionary dictionary]; + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -- (id) initWithApiClient:(SWGApiClient *)apiClient { + - (id) initWithApiClient:(SWGApiClient *)apiClient { self = [super init]; if (self) { - if (apiClient) { - self.apiClient = apiClient; - } - else { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - } - self.defaultHeaders = [NSMutableDictionary dictionary]; + if (apiClient) { + self.apiClient = apiClient; + } + else { + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + } + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -#pragma mark - + #pragma mark - -+(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { + +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { static SWGPetApi* singletonAPI = nil; if (singletonAPI == nil) { - singletonAPI = [[SWGPetApi alloc] init]; - [singletonAPI addHeader:headerValue forKey:key]; + singletonAPI = [[SWGPetApi alloc] init]; + [singletonAPI addHeader:headerValue forKey:key]; } return singletonAPI; -} + } -+(void) setBasePath:(NSString*)path { + +(void) setBasePath:(NSString*)path { basePath = path; -} + } -+(NSString*) getBasePath { + +(NSString*) getBasePath { return basePath; -} + } --(void) addHeader:(NSString*)value forKey:(NSString*)key { + -(void) addHeader:(NSString*)value forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(void) setHeaderValue:(NSString*) value - forKey:(NSString*)key { + -(void) setHeaderValue:(NSString*) value + forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(unsigned long) requestQueueSize { + -(unsigned long) requestQueueSize { return [SWGApiClient requestQueueSize]; -} + } -/*! - * Update an existing pet - * - * \param body Pet object that needs to be added to the store - * \returns void - */ --(NSNumber*) updatePetWithCompletionBlock: (SWGPet*) body + + /*! + * Update an existing pet + * + * \param body Pet object that needs to be added to the store + * \returns void + */ + -(NSNumber*) updatePetWithCompletionBlock: (SWGPet*) body completionHandler: (void (^)(NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; + + id bodyDictionary = nil; + + id __body = body; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"PUT" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"PUT" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * Add a new pet to the store - * - * \param body Pet object that needs to be added to the store - * \returns void - */ --(NSNumber*) addPetWithCompletionBlock: (SWGPet*) body + + } + + + /*! + * Add a new pet to the store + * + * \param body Pet object that needs to be added to the store + * \returns void + */ + -(NSNumber*) addPetWithCompletionBlock: (SWGPet*) body completionHandler: (void (^)(NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + id bodyDictionary = nil; + + id __body = body; + + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"POST" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * 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 - * \returns NSArray* - */ --(NSNumber*) findPetsByStatusWithCompletionBlock: (NSArray*) status + + } + + + /*! + * 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 + * \returns NSArray* + */ + -(NSNumber*) findPetsByStatusWithCompletionBlock: (NSArray*) status completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByStatus", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByStatus", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - if(status != nil) { + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + if(status != nil) { - queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"]; + queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"]; - } - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + } + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + + + + + + + + // response is in a container + // array container response type +return [self.apiClient dictionary: requestUrl +method: @"GET" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSDictionary *data, NSError *error) { +if (error) { +completionBlock(nil, error); +return; +} + + if([data isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]]; + for (NSDictionary* dict in (NSArray*)data) { - + SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil]; - + [objs addObject:d]; + } + completionBlock((NSArray*)objs, nil); + } - // response is in a container - // array container response type - return [self.apiClient dictionary: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - return; - } - - if([data isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]]; - for (NSDictionary* dict in (NSArray*)data) { - - - SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil]; - - [objs addObject:d]; - } - completionBlock((NSArray*)objs, nil); - } - - - }]; +}]; - + - -} + + } -/*! - * 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 - * \returns NSArray* - */ --(NSNumber*) findPetsByTagsWithCompletionBlock: (NSArray*) tags + + /*! + * 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 + * \returns NSArray* + */ + -(NSNumber*) findPetsByTagsWithCompletionBlock: (NSArray*) tags completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByTags", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByTags", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - if(tags != nil) { + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + if(tags != nil) { - queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"]; + queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"]; - } - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + } + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; + + id bodyDictionary = nil; + + - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + + + + + + + // response is in a container + // array container response type +return [self.apiClient dictionary: requestUrl +method: @"GET" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSDictionary *data, NSError *error) { +if (error) { +completionBlock(nil, error); +return; +} + + if([data isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]]; + for (NSDictionary* dict in (NSArray*)data) { - + SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil]; - + [objs addObject:d]; + } + completionBlock((NSArray*)objs, nil); + } - // response is in a container - // array container response type - return [self.apiClient dictionary: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - return; - } - - if([data isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]]; - for (NSDictionary* dict in (NSArray*)data) { - - - SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil]; - - [objs addObject:d]; - } - completionBlock((NSArray*)objs, nil); - } - - - }]; +}]; - + - -} + + } -/*! - * 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 - * \returns SWGPet* - */ --(NSNumber*) getPetByIdWithCompletionBlock: (NSNumber*) petId + + /*! + * 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 + * \returns SWGPet* + */ + -(NSNumber*) getPetByIdWithCompletionBlock: (NSNumber*) petId completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock { - - // verify the required parameter 'petId' is set - NSAssert(petId != nil, @"Missing the required parameter `petId` when calling getPetById"); - + + // verify the required parameter 'petId' is set + NSAssert(petId != nil, @"Missing the required parameter `petId` when calling getPetById"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } - - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + } - // Authentication setting - NSArray *authSettings = @[@"api_key", @"petstore_auth"]; - - id bodyDictionary = nil; - - + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + // Authentication setting + NSArray *authSettings = @[@"api_key", @"petstore_auth"]; - - + id bodyDictionary = nil; + + - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - - // non container response + - + - - // complex response - // comples response type + // non container response + + + + + // complex response + // comples response type return [self.apiClient dictionary: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - - return; - } - SWGPet* result = nil; - if (data) { - result = [[SWGPet alloc] initWithDictionary:data error:nil]; - } - completionBlock(result , nil); - - }]; + method: @"GET" + queryParams: queryParams + body: bodyDictionary + headerParams: headerParams + authSettings: authSettings + requestContentType: requestContentType + responseContentType: responseContentType + completionBlock: ^(NSDictionary *data, NSError *error) { + if (error) { + completionBlock(nil, error); - + return; + } + SWGPet* result = nil; + if (data) { + result = [[SWGPet alloc] initWithDictionary:data error:nil]; + } + completionBlock(result , nil); + }]; - -} + -/*! - * 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 - * \returns void - */ --(NSNumber*) updatePetWithFormWithCompletionBlock: (NSString*) 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 + * \returns void + */ + -(NSNumber*) updatePetWithFormWithCompletionBlock: (NSString*) petId name: (NSString*) name status: (NSString*) status completionHandler: (void (^)(NSError* error))completionBlock { - - // verify the required parameter 'petId' is set - NSAssert(petId != nil, @"Missing the required parameter `petId` when calling updatePetWithForm"); - + + // verify the required parameter 'petId' is set + NSAssert(petId != nil, @"Missing the required parameter `petId` when calling updatePetWithForm"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/x-www-form-urlencoded"]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/x-www-form-urlencoded"]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - - formParams[@"name"] = name; - - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - [bodyDictionary addObject:formParams]; - - - formParams[@"status"] = status; - - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - [bodyDictionary addObject:formParams]; - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + + formParams[@"name"] = name; + + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + [bodyDictionary addObject:formParams]; + + + formParams[@"status"] = status; + + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + [bodyDictionary addObject:formParams]; + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"POST" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * Deletes a pet - * - * \param apiKey - * \param petId Pet id to delete - * \returns void - */ --(NSNumber*) deletePetWithCompletionBlock: (NSString*) apiKey + + } + + + /*! + * Deletes a pet + * + * \param apiKey + * \param petId Pet id to delete + * \returns void + */ + -(NSNumber*) deletePetWithCompletionBlock: (NSString*) apiKey petId: (NSNumber*) petId completionHandler: (void (^)(NSError* error))completionBlock { - - // verify the required parameter 'petId' is set - NSAssert(petId != nil, @"Missing the required parameter `petId` when calling deletePet"); - + + // verify the required parameter 'petId' is set + NSAssert(petId != nil, @"Missing the required parameter `petId` when calling deletePet"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - if(apiKey != nil) + if(apiKey != nil) headerParams[@"api_key"] = apiKey; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"DELETE" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"DELETE" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * uploads an image - * - * \param petId ID of pet to update - * \param additionalMetadata Additional data to pass to server - * \param file file to upload - * \returns void - */ --(NSNumber*) uploadFileWithCompletionBlock: (NSNumber*) petId + + } + + + /*! + * uploads an image + * + * \param petId ID of pet to update + * \param additionalMetadata Additional data to pass to server + * \param file file to upload + * \returns void + */ + -(NSNumber*) uploadFileWithCompletionBlock: (NSNumber*) petId additionalMetadata: (NSString*) additionalMetadata file: (SWGFile*) file completionHandler: (void (^)(NSError* error))completionBlock { - - // verify the required parameter 'petId' is set - NSAssert(petId != nil, @"Missing the required parameter `petId` when calling uploadFile"); - + + // verify the required parameter 'petId' is set + NSAssert(petId != nil, @"Missing the required parameter `petId` when calling uploadFile"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}/uploadImage", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}/uploadImage", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"multipart/form-data"]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"multipart/form-data"]]; - // Authentication setting - NSArray *authSettings = @[@"petstore_auth"]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[@"petstore_auth"]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - - formParams[@"additionalMetadata"] = additionalMetadata; - - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - [bodyDictionary addObject:formParams]; - - - requestContentType = @"multipart/form-data"; - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - if(file != nil) { - [bodyDictionary addObject:file]; - file.paramName = @"file"; - } - - if(bodyDictionary == nil) { - bodyDictionary = [[NSMutableArray alloc] init]; - } - [bodyDictionary addObject:formParams]; - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + + formParams[@"additionalMetadata"] = additionalMetadata; + + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + [bodyDictionary addObject:formParams]; + + + requestContentType = @"multipart/form-data"; + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + if(file != nil) { + [bodyDictionary addObject:file]; + file.paramName = @"file"; + } + + if(bodyDictionary == nil) { + bodyDictionary = [[NSMutableArray alloc] init]; + } + [bodyDictionary addObject:formParams]; + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"POST" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; + + } + + @end diff --git a/samples/client/petstore/objc/client/SWGStoreApi.h b/samples/client/petstore/objc/client/SWGStoreApi.h index 49d8db806c8..b24b00aea7a 100644 --- a/samples/client/petstore/objc/client/SWGStoreApi.h +++ b/samples/client/petstore/objc/client/SWGStoreApi.h @@ -1,80 +1,86 @@ -#import +#import + #import "SWGOrder.h" #import "SWGObject.h" #import "SWGApiClient.h" -@interface SWGStoreApi: NSObject + @interface SWGStoreApi: NSObject -@property(nonatomic, assign)SWGApiClient *apiClient; + @property(nonatomic, assign)SWGApiClient *apiClient; --(instancetype) initWithApiClient:(SWGApiClient *)apiClient; --(void) addHeader:(NSString*)value forKey:(NSString*)key; --(unsigned long) requestQueueSize; -+(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; -+(void) setBasePath:(NSString*)basePath; -+(NSString*) getBasePath; -/** + -(instancetype) initWithApiClient:(SWGApiClient *)apiClient; + -(void) addHeader:(NSString*)value forKey:(NSString*)key; + -(unsigned long) requestQueueSize; + +(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; + +(void) setBasePath:(NSString*)basePath; + +(NSString*) getBasePath; + + /** - Returns pet inventories by status - Returns a map of status codes to quantities + Returns pet inventories by status + Returns a map of status codes to quantities - + - return type: NSDictionary* - */ --(NSNumber*) getInventoryWithCompletionBlock : - (void (^)(NSDictionary* output, NSError* error))completionBlock; - + return type: NSDictionary* + */ + -(NSNumber*) getInventoryWithCompletionBlock : + (void (^)(NSDictionary* output, NSError* error))completionBlock; + + + + /** -/** + Place an order for a pet + - Place an order for a pet - + @param body order placed for purchasing the pet + - @param body order placed for purchasing the pet - + return type: SWGOrder* + */ + -(NSNumber*) placeOrderWithCompletionBlock :(SWGOrder*) body + + completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock; + - return type: SWGOrder* - */ --(NSNumber*) placeOrderWithCompletionBlock :(SWGOrder*) body + - completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock; - - + /** -/** + Find purchase order by ID + For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - 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 + - @param orderId ID of pet that needs to be fetched - + return type: SWGOrder* + */ + -(NSNumber*) getOrderByIdWithCompletionBlock :(NSString*) orderId + + completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock; + - return type: SWGOrder* - */ --(NSNumber*) getOrderByIdWithCompletionBlock :(NSString*) orderId + - completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock; - - + /** -/** + Delete purchase order by ID + For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - 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 + - @param orderId ID of the order that needs to be deleted - + return type: + */ + -(NSNumber*) deleteOrderWithCompletionBlock :(NSString*) orderId + + + completionHandler: (void (^)(NSError* error))completionBlock; - return type: - */ --(NSNumber*) deleteOrderWithCompletionBlock :(NSString*) orderId - + - completionHandler: (void (^)(NSError* error))completionBlock; - - @end diff --git a/samples/client/petstore/objc/client/SWGStoreApi.m b/samples/client/petstore/objc/client/SWGStoreApi.m index a112db6d639..6f548410dc8 100644 --- a/samples/client/petstore/objc/client/SWGStoreApi.m +++ b/samples/client/petstore/objc/client/SWGStoreApi.m @@ -1,478 +1,478 @@ -#import "SWGStoreApi.h" -#import "SWGFile.h" -#import "SWGQueryParamCollection.h" -#import "SWGOrder.h" - + #import "SWGStoreApi.h" + #import "SWGFile.h" + #import "SWGQueryParamCollection.h" + #import "SWGOrder.h" + + -@interface SWGStoreApi () + @interface SWGStoreApi () @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders; -@end + @end -@implementation SWGStoreApi + @implementation SWGStoreApi -static NSString * basePath = @"http://petstore.swagger.io/v2"; + static NSString * basePath = @"http://petstore.swagger.io/v2"; -#pragma mark - Initialize methods + #pragma mark - Initialize methods -- (id) init { + - (id) init { self = [super init]; if (self) { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - self.defaultHeaders = [NSMutableDictionary dictionary]; + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -- (id) initWithApiClient:(SWGApiClient *)apiClient { + - (id) initWithApiClient:(SWGApiClient *)apiClient { self = [super init]; if (self) { - if (apiClient) { - self.apiClient = apiClient; - } - else { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - } - self.defaultHeaders = [NSMutableDictionary dictionary]; + if (apiClient) { + self.apiClient = apiClient; + } + else { + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + } + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -#pragma mark - + #pragma mark - -+(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { + +(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { static SWGStoreApi* singletonAPI = nil; if (singletonAPI == nil) { - singletonAPI = [[SWGStoreApi alloc] init]; - [singletonAPI addHeader:headerValue forKey:key]; + singletonAPI = [[SWGStoreApi alloc] init]; + [singletonAPI addHeader:headerValue forKey:key]; } return singletonAPI; -} + } -+(void) setBasePath:(NSString*)path { + +(void) setBasePath:(NSString*)path { basePath = path; -} + } -+(NSString*) getBasePath { + +(NSString*) getBasePath { return basePath; -} + } --(void) addHeader:(NSString*)value forKey:(NSString*)key { + -(void) addHeader:(NSString*)value forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(void) setHeaderValue:(NSString*) value - forKey:(NSString*)key { + -(void) setHeaderValue:(NSString*) value + forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(unsigned long) requestQueueSize { + -(unsigned long) requestQueueSize { return [SWGApiClient requestQueueSize]; -} + } -/*! - * Returns pet inventories by status - * Returns a map of status codes to quantities - * \returns NSDictionary* - */ --(NSNumber*) getInventoryWithCompletionBlock: + + /*! + * Returns pet inventories by status + * Returns a map of status codes to quantities + * \returns NSDictionary* + */ + -(NSNumber*) getInventoryWithCompletionBlock: (void (^)(NSDictionary* output, NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/inventory", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/inventory", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[@"api_key"]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[@"api_key"]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - - // response is in a container - // map container response type - return [self.apiClient dictionary: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - return; - } - - NSDictionary *result = nil; - if (data) { - result = [[NSDictionary alloc]initWithDictionary: data]; - } - completionBlock(data, nil); - - }]; + + + + // response is in a container + // map container response type +return [self.apiClient dictionary: requestUrl +method: @"GET" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSDictionary *data, NSError *error) { +if (error) { +completionBlock(nil, error); +return; +} + NSDictionary *result = nil; + if (data) { + result = [[NSDictionary alloc]initWithDictionary: data]; + } + completionBlock(data, nil); +}]; - + - -} + + } -/*! - * Place an order for a pet - * - * \param body order placed for purchasing the pet - * \returns SWGOrder* - */ --(NSNumber*) placeOrderWithCompletionBlock: (SWGOrder*) body + + /*! + * Place an order for a pet + * + * \param body order placed for purchasing the pet + * \returns SWGOrder* + */ + -(NSNumber*) placeOrderWithCompletionBlock: (SWGOrder*) body completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[]; + + id bodyDictionary = nil; + + id __body = body; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // non container response + + // non container response - + - - // complex response - - // comples response type + + // complex response + // comples response type return [self.apiClient dictionary: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - - return; - } - SWGOrder* result = nil; - if (data) { - result = [[SWGOrder alloc] initWithDictionary:data error:nil]; - } - completionBlock(result , nil); - - }]; + method: @"POST" + queryParams: queryParams + body: bodyDictionary + headerParams: headerParams + authSettings: authSettings + requestContentType: requestContentType + responseContentType: responseContentType + completionBlock: ^(NSDictionary *data, NSError *error) { + if (error) { + completionBlock(nil, error); + + return; + } + SWGOrder* result = nil; + if (data) { + result = [[SWGOrder alloc] initWithDictionary:data error:nil]; + } + completionBlock(result , nil); + }]; - + - -} + + } -/*! - * 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 - * \returns SWGOrder* - */ --(NSNumber*) getOrderByIdWithCompletionBlock: (NSString*) orderId + + /*! + * 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 + * \returns SWGOrder* + */ + -(NSNumber*) getOrderByIdWithCompletionBlock: (NSString*) orderId completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock { - - // verify the required parameter 'orderId' is set - NSAssert(orderId != nil, @"Missing the required parameter `orderId` when calling getOrderById"); - + + // verify the required parameter 'orderId' is set + NSAssert(orderId != nil, @"Missing the required parameter `orderId` when calling getOrderById"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape:orderId]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape:orderId]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } - - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + } - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + // Authentication setting + NSArray *authSettings = @[]; - - + id bodyDictionary = nil; + + - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - - // non container response + - + - - // complex response - // comples response type + // non container response + + + + + // complex response + // comples response type return [self.apiClient dictionary: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - - return; - } - SWGOrder* result = nil; - if (data) { - result = [[SWGOrder alloc] initWithDictionary:data error:nil]; - } - completionBlock(result , nil); - - }]; + method: @"GET" + queryParams: queryParams + body: bodyDictionary + headerParams: headerParams + authSettings: authSettings + requestContentType: requestContentType + responseContentType: responseContentType + completionBlock: ^(NSDictionary *data, NSError *error) { + if (error) { + completionBlock(nil, error); + + return; + } + SWGOrder* result = nil; + if (data) { + result = [[SWGOrder alloc] initWithDictionary:data error:nil]; + } + completionBlock(result , nil); + }]; - + - -} + + } -/*! - * 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 - * \returns void - */ --(NSNumber*) deleteOrderWithCompletionBlock: (NSString*) 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 + * \returns void + */ + -(NSNumber*) deleteOrderWithCompletionBlock: (NSString*) orderId completionHandler: (void (^)(NSError* error))completionBlock { - - // verify the required parameter 'orderId' is set - NSAssert(orderId != nil, @"Missing the required parameter `orderId` when calling deleteOrder"); - + + // verify the required parameter 'orderId' is set + NSAssert(orderId != nil, @"Missing the required parameter `orderId` when calling deleteOrder"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape:orderId]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape:orderId]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"DELETE" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"DELETE" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; + + } + + @end diff --git a/samples/client/petstore/objc/client/SWGTag.h b/samples/client/petstore/objc/client/SWGTag.h index d9cc84be270..0938ab30905 100644 --- a/samples/client/petstore/objc/client/SWGTag.h +++ b/samples/client/petstore/objc/client/SWGTag.h @@ -1,15 +1,21 @@ -#import +#import + #import "SWGObject.h" + -@protocol SWGTag -@end - -@interface SWGTag : SWGObject + @protocol SWGTag + @end + @interface SWGTag : SWGObject -@property(nonatomic) NSNumber* _id; + + + @property(nonatomic) NSNumber* _id; + + + @property(nonatomic) NSString* name; + -@property(nonatomic) NSString* name; - -@end + @end + diff --git a/samples/client/petstore/objc/client/SWGTag.m b/samples/client/petstore/objc/client/SWGTag.m index 5d48a099070..8425464dbd5 100644 --- a/samples/client/petstore/objc/client/SWGTag.m +++ b/samples/client/petstore/objc/client/SWGTag.m @@ -1,22 +1,24 @@ -#import "SWGTag.h" + + #import "SWGTag.h" -@implementation SWGTag - -+ (JSONKeyMapper *)keyMapper -{ - return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }]; -} + @implementation SWGTag -+ (BOOL)propertyIsOptional:(NSString *)propertyName -{ - NSArray *optionalProperties = @[@"_id", @"name"]; + + (JSONKeyMapper *)keyMapper + { + return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }]; + } - if ([optionalProperties containsObject:propertyName]) { - return YES; - } - else { - return NO; - } -} + + (BOOL)propertyIsOptional:(NSString *)propertyName + { + NSArray *optionalProperties = @[@"_id", @"name"]; -@end + if ([optionalProperties containsObject:propertyName]) { + return YES; + } + else { + return NO; + } + } + + + @end diff --git a/samples/client/petstore/objc/client/SWGUser.h b/samples/client/petstore/objc/client/SWGUser.h index f505ca2c041..a4ffaf6ae72 100644 --- a/samples/client/petstore/objc/client/SWGUser.h +++ b/samples/client/petstore/objc/client/SWGUser.h @@ -1,28 +1,40 @@ -#import +#import + #import "SWGObject.h" - -@protocol SWGUser -@end - -@interface SWGUser : SWGObject - - -@property(nonatomic) NSNumber* _id; - -@property(nonatomic) NSString* username; - -@property(nonatomic) NSString* firstName; - -@property(nonatomic) NSString* lastName; - -@property(nonatomic) NSString* email; - -@property(nonatomic) NSString* password; - -@property(nonatomic) NSString* phone; -/* User Status [optional] - */ -@property(nonatomic) NSNumber* userStatus; - -@end + + + @protocol SWGUser + @end + + @interface SWGUser : SWGObject + + + + @property(nonatomic) NSNumber* _id; + + + @property(nonatomic) NSString* username; + + + @property(nonatomic) NSString* firstName; + + + @property(nonatomic) NSString* lastName; + + + @property(nonatomic) NSString* email; + + + @property(nonatomic) NSString* password; + + + @property(nonatomic) NSString* phone; + + /* User Status [optional] + */ + @property(nonatomic) NSNumber* userStatus; + + + @end + diff --git a/samples/client/petstore/objc/client/SWGUser.m b/samples/client/petstore/objc/client/SWGUser.m index 060b65ffa12..4fd1dbdbe28 100644 --- a/samples/client/petstore/objc/client/SWGUser.m +++ b/samples/client/petstore/objc/client/SWGUser.m @@ -1,22 +1,24 @@ -#import "SWGUser.h" + + #import "SWGUser.h" -@implementation SWGUser - -+ (JSONKeyMapper *)keyMapper -{ - return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"username": @"username", @"firstName": @"firstName", @"lastName": @"lastName", @"email": @"email", @"password": @"password", @"phone": @"phone", @"userStatus": @"userStatus" }]; -} + @implementation SWGUser -+ (BOOL)propertyIsOptional:(NSString *)propertyName -{ - NSArray *optionalProperties = @[@"_id", @"username", @"firstName", @"lastName", @"email", @"password", @"phone", @"userStatus"]; + + (JSONKeyMapper *)keyMapper + { + return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"username": @"username", @"firstName": @"firstName", @"lastName": @"lastName", @"email": @"email", @"password": @"password", @"phone": @"phone", @"userStatus": @"userStatus" }]; + } - if ([optionalProperties containsObject:propertyName]) { - return YES; - } - else { - return NO; - } -} + + (BOOL)propertyIsOptional:(NSString *)propertyName + { + NSArray *optionalProperties = @[@"_id", @"username", @"firstName", @"lastName", @"email", @"password", @"phone", @"userStatus"]; -@end + if ([optionalProperties containsObject:propertyName]) { + return YES; + } + else { + return NO; + } + } + + + @end diff --git a/samples/client/petstore/objc/client/SWGUserApi.h b/samples/client/petstore/objc/client/SWGUserApi.h index e6e73ddfba6..acaa861a536 100644 --- a/samples/client/petstore/objc/client/SWGUserApi.h +++ b/samples/client/petstore/objc/client/SWGUserApi.h @@ -1,148 +1,158 @@ -#import +#import + #import "SWGUser.h" #import "SWGObject.h" #import "SWGApiClient.h" -@interface SWGUserApi: NSObject + @interface SWGUserApi: NSObject -@property(nonatomic, assign)SWGApiClient *apiClient; + @property(nonatomic, assign)SWGApiClient *apiClient; --(instancetype) initWithApiClient:(SWGApiClient *)apiClient; --(void) addHeader:(NSString*)value forKey:(NSString*)key; --(unsigned long) requestQueueSize; -+(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; -+(void) setBasePath:(NSString*)basePath; -+(NSString*) getBasePath; -/** + -(instancetype) initWithApiClient:(SWGApiClient *)apiClient; + -(void) addHeader:(NSString*)value forKey:(NSString*)key; + -(unsigned long) requestQueueSize; + +(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key; + +(void) setBasePath:(NSString*)basePath; + +(NSString*) getBasePath; + + /** - Create user - This can only be done by the logged in user. + Create user + This can only be done by the logged in user. - @param body Created user object - + @param body Created user object + - return type: - */ --(NSNumber*) createUserWithCompletionBlock :(SWGUser*) body - - - completionHandler: (void (^)(NSError* error))completionBlock; + return type: + */ + -(NSNumber*) createUserWithCompletionBlock :(SWGUser*) body + + + completionHandler: (void (^)(NSError* error))completionBlock; + + + /** -/** + Creates list of users with given input array + - Creates list of users with given input array - + @param body List of user object + - @param body List of user object - + return type: + */ + -(NSNumber*) createUsersWithArrayInputWithCompletionBlock :(NSArray*) body + + + completionHandler: (void (^)(NSError* error))completionBlock; - return type: - */ --(NSNumber*) createUsersWithArrayInputWithCompletionBlock :(NSArray*) body - + - completionHandler: (void (^)(NSError* error))completionBlock; + /** + Creates list of users with given input array + -/** + @param body List of user object + - Creates list of users with given input array - + return type: + */ + -(NSNumber*) createUsersWithListInputWithCompletionBlock :(NSArray*) body + + + completionHandler: (void (^)(NSError* error))completionBlock; - @param body List of user object - - - return type: - */ --(NSNumber*) createUsersWithListInputWithCompletionBlock :(NSArray*) body - + - completionHandler: (void (^)(NSError* error))completionBlock; + /** + Logs user into the system + -/** + @param username The user name for login + @param password The password for login in clear text + - Logs user into the system - + return type: NSString* + */ + -(NSNumber*) loginUserWithCompletionBlock :(NSString*) username + password:(NSString*) password + + completionHandler: (void (^)(NSString* output, NSError* error))completionBlock; + - @param username The user name for login - @param password The password for login in clear text - - - return type: NSString* - */ --(NSNumber*) loginUserWithCompletionBlock :(NSString*) username - password:(NSString*) password - - completionHandler: (void (^)(NSString* output, NSError* error))completionBlock; + + /** + Logs out current logged in user session + -/** + - Logs out current logged in user session - + return type: + */ + -(NSNumber*) logoutUserWithCompletionBlock : + + (void (^)(NSError* error))completionBlock; - - - return type: - */ --(NSNumber*) logoutUserWithCompletionBlock : + - (void (^)(NSError* error))completionBlock; - + /** -/** + Get user by user name + - Get user by user name - + @param username The name that needs to be fetched. Use user1 for testing. + - @param username The name that needs to be fetched. Use user1 for testing. - + return type: SWGUser* + */ + -(NSNumber*) getUserByNameWithCompletionBlock :(NSString*) username + + completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock; + - return type: SWGUser* - */ --(NSNumber*) getUserByNameWithCompletionBlock :(NSString*) username - - completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock; + + /** + 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 + - Updated user - This can only be done by the logged in user. + return type: + */ + -(NSNumber*) updateUserWithCompletionBlock :(NSString*) username + body:(SWGUser*) body + + + completionHandler: (void (^)(NSError* error))completionBlock; - @param username name that need to be deleted - @param body Updated user object - - - return type: - */ --(NSNumber*) updateUserWithCompletionBlock :(NSString*) username - body:(SWGUser*) body - + - completionHandler: (void (^)(NSError* error))completionBlock; + /** + Delete user + This can only be done by the logged in user. -/** + @param username The name that needs to be deleted + - Delete user - This can only be done by the logged in user. + return type: + */ + -(NSNumber*) deleteUserWithCompletionBlock :(NSString*) username + + + completionHandler: (void (^)(NSError* error))completionBlock; - @param username The name that needs to be deleted - - - return type: - */ --(NSNumber*) deleteUserWithCompletionBlock :(NSString*) username - + - completionHandler: (void (^)(NSError* error))completionBlock; - - @end diff --git a/samples/client/petstore/objc/client/SWGUserApi.m b/samples/client/petstore/objc/client/SWGUserApi.m index e2fe69aca8d..7c861609f36 100644 --- a/samples/client/petstore/objc/client/SWGUserApi.m +++ b/samples/client/petstore/objc/client/SWGUserApi.m @@ -1,891 +1,896 @@ -#import "SWGUserApi.h" -#import "SWGFile.h" -#import "SWGQueryParamCollection.h" -#import "SWGUser.h" - + #import "SWGUserApi.h" + #import "SWGFile.h" + #import "SWGQueryParamCollection.h" + #import "SWGUser.h" + + -@interface SWGUserApi () + @interface SWGUserApi () @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders; -@end + @end -@implementation SWGUserApi + @implementation SWGUserApi -static NSString * basePath = @"http://petstore.swagger.io/v2"; + static NSString * basePath = @"http://petstore.swagger.io/v2"; -#pragma mark - Initialize methods + #pragma mark - Initialize methods -- (id) init { + - (id) init { self = [super init]; if (self) { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - self.defaultHeaders = [NSMutableDictionary dictionary]; + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -- (id) initWithApiClient:(SWGApiClient *)apiClient { + - (id) initWithApiClient:(SWGApiClient *)apiClient { self = [super init]; if (self) { - if (apiClient) { - self.apiClient = apiClient; - } - else { - self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; - } - self.defaultHeaders = [NSMutableDictionary dictionary]; + if (apiClient) { + self.apiClient = apiClient; + } + else { + self.apiClient = [SWGApiClient sharedClientFromPool:basePath]; + } + self.defaultHeaders = [NSMutableDictionary dictionary]; } return self; -} + } -#pragma mark - + #pragma mark - -+(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { + +(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key { static SWGUserApi* singletonAPI = nil; if (singletonAPI == nil) { - singletonAPI = [[SWGUserApi alloc] init]; - [singletonAPI addHeader:headerValue forKey:key]; + singletonAPI = [[SWGUserApi alloc] init]; + [singletonAPI addHeader:headerValue forKey:key]; } return singletonAPI; -} + } -+(void) setBasePath:(NSString*)path { + +(void) setBasePath:(NSString*)path { basePath = path; -} + } -+(NSString*) getBasePath { + +(NSString*) getBasePath { return basePath; -} + } --(void) addHeader:(NSString*)value forKey:(NSString*)key { + -(void) addHeader:(NSString*)value forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(void) setHeaderValue:(NSString*) value - forKey:(NSString*)key { + -(void) setHeaderValue:(NSString*) value + forKey:(NSString*)key { [self.defaultHeaders setValue:value forKey:key]; -} + } --(unsigned long) requestQueueSize { + -(unsigned long) requestQueueSize { return [SWGApiClient requestQueueSize]; -} + } -/*! - * Create user - * This can only be done by the logged in user. - * \param body Created user object - * \returns void - */ --(NSNumber*) createUserWithCompletionBlock: (SWGUser*) body + + /*! + * Create user + * This can only be done by the logged in user. + * \param body Created user object + * \returns void + */ + -(NSNumber*) createUserWithCompletionBlock: (SWGUser*) body completionHandler: (void (^)(NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[]; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + id bodyDictionary = nil; + + id __body = body; + + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"POST" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; + + + } -/*! - * Creates list of users with given input array - * - * \param body List of user object - * \returns void - */ --(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray*) body + + /*! + * Creates list of users with given input array + * + * \param body List of user object + * \returns void + */ + -(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray*) body completionHandler: (void (^)(NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithArray", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithArray", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[]; + + id bodyDictionary = nil; + + id __body = body; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"POST" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * Creates list of users with given input array - * - * \param body List of user object - * \returns void - */ --(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray*) body + + } + + + /*! + * Creates list of users with given input array + * + * \param body List of user object + * \returns void + */ + -(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray*) body completionHandler: (void (^)(NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithList", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithList", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[]; + + id bodyDictionary = nil; + + id __body = body; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"POST" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"POST" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; + + + } -/*! - * Logs user into the system - * - * \param username The user name for login - * \param password The password for login in clear text - * \returns NSString* - */ --(NSNumber*) loginUserWithCompletionBlock: (NSString*) username + + /*! + * Logs user into the system + * + * \param username The user name for login + * \param password The password for login in clear text + * \returns NSString* + */ + -(NSNumber*) loginUserWithCompletionBlock: (NSString*) username password: (NSString*) password completionHandler: (void (^)(NSString* output, NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/login", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/login", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - if(username != nil) { + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + if(username != nil) { queryParams[@"username"] = username; - } - if(password != nil) { + } + if(password != nil) { queryParams[@"password"] = password; - } - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + } + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - + - - // non container response + - - // primitive response - // primitive response type - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(nil, error); - return; - } - NSString *result = data ? [[NSString alloc]initWithString: data] : nil; - completionBlock(result, nil); - }]; - - + + // non container response + + + // primitive response + // primitive response type +return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"GET" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(nil, error); +return; +} +NSString *result = data ? [[NSString alloc]initWithString: data] : nil; +completionBlock(result, nil); +}]; - - // complex response + + // complex response + - + + } -} - -/*! - * Logs out current logged in user session - * - * \returns void - */ --(NSNumber*) logoutUserWithCompletionBlock: + /*! + * Logs out current logged in user session + * + * \returns void + */ + -(NSNumber*) logoutUserWithCompletionBlock: (void (^)(NSError* error))completionBlock { - + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/logout", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/logout", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"GET" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * Get user by user name - * - * \param username The name that needs to be fetched. Use user1 for testing. - * \returns SWGUser* - */ --(NSNumber*) getUserByNameWithCompletionBlock: (NSString*) username + + } + + + /*! + * Get user by user name + * + * \param username The name that needs to be fetched. Use user1 for testing. + * \returns SWGUser* + */ + -(NSNumber*) getUserByNameWithCompletionBlock: (NSString*) username completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock { - - // verify the required parameter 'username' is set - NSAssert(username != nil, @"Missing the required parameter `username` when calling getUserByName"); - + + // verify the required parameter 'username' is set + NSAssert(username != nil, @"Missing the required parameter `username` when calling getUserByName"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } - - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + } - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + // Authentication setting + NSArray *authSettings = @[]; - - + id bodyDictionary = nil; + + - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - - // non container response + - + - - // complex response - // comples response type + // non container response + + + + + // complex response + // comples response type return [self.apiClient dictionary: requestUrl - method: @"GET" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSDictionary *data, NSError *error) { - if (error) { - completionBlock(nil, error); - - return; - } - SWGUser* result = nil; - if (data) { - result = [[SWGUser alloc] initWithDictionary:data error:nil]; - } - completionBlock(result , nil); - - }]; + method: @"GET" + queryParams: queryParams + body: bodyDictionary + headerParams: headerParams + authSettings: authSettings + requestContentType: requestContentType + responseContentType: responseContentType + completionBlock: ^(NSDictionary *data, NSError *error) { + if (error) { + completionBlock(nil, error); - + return; + } + SWGUser* result = nil; + if (data) { + result = [[SWGUser alloc] initWithDictionary:data error:nil]; + } + completionBlock(result , nil); + }]; - -} + + + + } -/*! - * 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 - * \returns void - */ --(NSNumber*) updateUserWithCompletionBlock: (NSString*) 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 + * \returns void + */ + -(NSNumber*) updateUserWithCompletionBlock: (NSString*) username body: (SWGUser*) body completionHandler: (void (^)(NSError* error))completionBlock { - - // verify the required parameter 'username' is set - NSAssert(username != nil, @"Missing the required parameter `username` when calling updateUser"); - + + // verify the required parameter 'username' is set + NSAssert(username != nil, @"Missing the required parameter `username` when calling updateUser"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - id __body = body; + // Authentication setting + NSArray *authSettings = @[]; + + id bodyDictionary = nil; + + id __body = body; - if(__body != nil && [__body isKindOfClass:[NSArray class]]){ - NSMutableArray * objs = [[NSMutableArray alloc] init]; - for (id dict in (NSArray*)__body) { + if(__body != nil && [__body isKindOfClass:[NSArray class]]){ + NSMutableArray * objs = [[NSMutableArray alloc] init]; + for (id dict in (NSArray*)__body) { if([dict respondsToSelector:@selector(toDictionary)]) { - [objs addObject:[(SWGObject*)dict toDictionary]]; + [objs addObject:[(SWGObject*)dict toDictionary]]; } else{ - [objs addObject:dict]; + [objs addObject:dict]; } - } - bodyDictionary = objs; - } - else if([__body respondsToSelector:@selector(toDictionary)]) { - bodyDictionary = [(SWGObject*)__body toDictionary]; - } - else if([__body isKindOfClass:[NSString class]]) { - // convert it to a dictionary - NSError * error; - NSString * str = (NSString*)__body; - NSDictionary *JSON = + } + bodyDictionary = objs; + } + else if([__body respondsToSelector:@selector(toDictionary)]) { + bodyDictionary = [(SWGObject*)__body toDictionary]; + } + else if([__body isKindOfClass:[NSString class]]) { + // convert it to a dictionary + NSError * error; + NSString * str = (NSString*)__body; + NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding: NSUTF8StringEncoding] - options: NSJSONReadingMutableContainers - error: &error]; - bodyDictionary = JSON; - } - - - - + options: NSJSONReadingMutableContainers + error: &error]; + bodyDictionary = JSON; + } + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"PUT" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"PUT" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; -/*! - * Delete user - * This can only be done by the logged in user. - * \param username The name that needs to be deleted - * \returns void - */ --(NSNumber*) deleteUserWithCompletionBlock: (NSString*) username + + } + + + /*! + * Delete user + * This can only be done by the logged in user. + * \param username The name that needs to be deleted + * \returns void + */ + -(NSNumber*) deleteUserWithCompletionBlock: (NSString*) username completionHandler: (void (^)(NSError* error))completionBlock { - - // verify the required parameter 'username' is set - NSAssert(username != nil, @"Missing the required parameter `username` when calling deleteUser"); - + + // verify the required parameter 'username' is set + NSAssert(username != nil, @"Missing the required parameter `username` when calling deleteUser"); + - NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath]; + NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath]; - // remove format in URL if needed - if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) + // remove format in URL if needed + if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound) [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"]; - [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]]; - + [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]]; + - NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; + NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init]; + + NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders]; - - - // HTTP header `Accept` - headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; - if ([headerParams[@"Accept"] length] == 0) { + + + // HTTP header `Accept` + headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]]; + if ([headerParams[@"Accept"] length] == 0) { [headerParams removeObjectForKey:@"Accept"]; - } + } - // response content type - NSString *responseContentType; - if ([headerParams objectForKey:@"Accept"]) { + // response content type + NSString *responseContentType; + if ([headerParams objectForKey:@"Accept"]) { responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0]; - } - else { + } + else { responseContentType = @""; - } + } - // request content type - NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; + // request content type + NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; - // Authentication setting - NSArray *authSettings = @[]; - - id bodyDictionary = nil; - - + // Authentication setting + NSArray *authSettings = @[]; - NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; + id bodyDictionary = nil; + + - - + NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; - + + - + - + - - // it's void - return [self.apiClient stringWithCompletionBlock: requestUrl - method: @"DELETE" - queryParams: queryParams - body: bodyDictionary - headerParams: headerParams - authSettings: authSettings - requestContentType: requestContentType - responseContentType: responseContentType - completionBlock: ^(NSString *data, NSError *error) { - if (error) { - completionBlock(error); - return; - } - completionBlock(nil); - }]; + - + + // it's void + return [self.apiClient stringWithCompletionBlock: requestUrl +method: @"DELETE" +queryParams: queryParams +body: bodyDictionary +headerParams: headerParams +authSettings: authSettings +requestContentType: requestContentType +responseContentType: responseContentType +completionBlock: ^(NSString *data, NSError *error) { +if (error) { +completionBlock(error); +return; } +completionBlock(nil); +}]; + + } + + @end diff --git a/samples/client/petstore/objc/pom.xml b/samples/client/petstore/objc/pom.xml index 42e116ac170..718ef5e1d6f 100644 --- a/samples/client/petstore/objc/pom.xml +++ b/samples/client/petstore/objc/pom.xml @@ -1,65 +1,65 @@ - 4.0.0 - com.wordnik - ObjcPetstoreClientTests - pom - 1.0-SNAPSHOT - Objective-C Swagger Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - install-pods - pre-integration-test - - exec - - - pod - - install - - - - - xcodebuild-test - integration-test - - exec - - - xcodebuild - - -workspace - PetstoreClient.xcworkspace - -scheme - PetstoreClient - test - -destination - platform=iOS Simulator,name=iPhone 6,OS=8.3 - - - - - - - + 4.0.0 + io.swagger + ObjcPetstoreClientTests + pom + 1.0-SNAPSHOT + Objective-C Swagger Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + install-pods + pre-integration-test + + exec + + + pod + + install + + + + + xcodebuild-test + integration-test + + exec + + + xcodebuild + + -workspace + PetstoreClient.xcworkspace + -scheme + PetstoreClient + test + -destination + platform=iOS Simulator,name=iPhone 6,OS=8.3 + + + + + + + diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 44bc1567a3d..0a926625b74 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -1,5 +1,5 @@ # -# Copyright 2015 Reverb Technologies, Inc. +# 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. diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 6e22d4dbcc0..c27d241cb76 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -1,5 +1,5 @@ # -# Copyright 2015 Reverb Technologies, Inc. +# 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. diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index 5b2fc0a0000..ffb9d4b732b 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -1,5 +1,5 @@ # -# Copyright 2015 Reverb Technologies, Inc. +# 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. diff --git a/samples/client/petstore/perl/pom.xml b/samples/client/petstore/perl/pom.xml index 1ce1761c433..f92eaacb134 100644 --- a/samples/client/petstore/perl/pom.xml +++ b/samples/client/petstore/perl/pom.xml @@ -1,46 +1,46 @@ - 4.0.0 - com.wordnik - PerlPetstoreClientTests - pom - 1.0-SNAPSHOT - Perl Swagger Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - Test::More - integration-test - - exec - - - perl - - t/01_pet_api.t - - - - - - - + 4.0.0 + com.wordnik + PerlPetstoreClientTests + pom + 1.0-SNAPSHOT + Perl Swagger Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + Test::More + integration-test + + exec + + + perl + + t/01_pet_api.t + + + + + + + diff --git a/samples/client/petstore/php/SwaggerClient-php/composer.json b/samples/client/petstore/php/SwaggerClient-php/composer.json index 13fc1b62690..a097d929c62 100644 --- a/samples/client/petstore/php/SwaggerClient-php/composer.json +++ b/samples/client/petstore/php/SwaggerClient-php/composer.json @@ -1,32 +1,32 @@ { - "name": "SwaggerClient/SwaggerClient-php", - "description": "", - "keywords": [ - "swagger", - "php", - "sdk", - "api" - ], - "homepage": "http://swagger.io", - "license": "Apache v2", - "authors": [ - { - "name": "Swagger and contributors", - "homepage": "https://github.com/swagger-api/swagger-codegen" - } - ], - "require": { - "php": ">=5.3.3", - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~0.6.1", - "squizlabs/php_codesniffer": "~2.0" - }, - "autoload": { - "psr-4": { "SwaggerClient\\" : "lib/" } - } +"name": "SwaggerClient/SwaggerClient-php", +"description": "", +"keywords": [ +"swagger", +"php", +"sdk", +"api" +], +"homepage": "http://swagger.io", +"license": "Apache v2", +"authors": [ +{ +"name": "Swagger and contributors", +"homepage": "https://github.com/swagger-api/swagger-codegen" +} +], +"require": { +"php": ">=5.3.3", +"ext-curl": "*", +"ext-json": "*", +"ext-mbstring": "*" +}, +"require-dev": { +"phpunit/phpunit": "~4.0", +"satooshi/php-coveralls": "~0.6.1", +"squizlabs/php_codesniffer": "~2.0" +}, +"autoload": { +"psr-4": { "SwaggerClient\\" : "lib/" } +} } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php index 229709562ef..dd4c3c1f1b1 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php @@ -1,6 +1,6 @@ host = 'http://petstore.swagger.io/v2'; - } else { - $this->host = $host; - } - } +} else { +$this->host = $host; +} +} - /** - * add default header - * - * @param string $header_name header name (e.g. Token) - * @param string $header_value header value (e.g. 1z8wp3) - */ - public function addDefaultHeader($header_name, $header_value) { - if (!is_string($header_name)) - throw new \InvalidArgumentException('Header name must be a string.'); +/** +* add default header +* +* @param string $header_name header name (e.g. Token) +* @param string $header_value header value (e.g. 1z8wp3) +*/ +public function addDefaultHeader($header_name, $header_value) { +if (!is_string($header_name)) +throw new \InvalidArgumentException('Header name must be a string.'); + +self::$default_header[$header_name] = $header_value; +} - self::$default_header[$header_name] = $header_value; - } +/** +* get the default header +* +* @return array default header +*/ +public function getDefaultHeader() { +return self::$default_header; +} - /** - * get the default header - * - * @return array default header - */ - public function getDefaultHeader() { - return self::$default_header; - } +/** +* delete the default header based on header name +* +* @param string $header_name header name (e.g. Token) +*/ +public function deleteDefaultHeader($header_name) { +unset(self::$default_header[$header_name]); +} - /** - * delete the default header based on header name - * - * @param string $header_name header name (e.g. Token) - */ - public function deleteDefaultHeader($header_name) { - unset(self::$default_header[$header_name]); - } +/** +* set the user agent of the api client +* +* @param string $user_agent the user agent of the api client +*/ +public function setUserAgent($user_agent) { +if (!is_string($user_agent)) +throw new \InvalidArgumentException('User-agent must be a string.'); + +$this->user_agent= $user_agent; +} - /** - * set the user agent of the api client - * - * @param string $user_agent the user agent of the api client - */ - public function setUserAgent($user_agent) { - if (!is_string($user_agent)) - throw new \InvalidArgumentException('User-agent must be a string.'); +/** +* get the user agent of the api client +* +* @return string user agent +*/ +public function getUserAgent($user_agent) { +return $this->user_agent; +} - $this->user_agent= $user_agent; - } +/** +* set the HTTP timeout value +* +* @param integer $seconds Number of seconds before timing out [set to 0 for no timeout] +*/ +public function setTimeout($seconds) { +if (!is_numeric($seconds) || $seconds < 0) +throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.'); + +$this->curl_timeout = $seconds; +} - /** - * get the user agent of the api client - * - * @return string user agent - */ - public function getUserAgent($user_agent) { - return $this->user_agent; - } +/** +* get the HTTP timeout value +* +* @return string HTTP timeout value +*/ +public function getTimeout() { +return $this->curl_timeout; +} - /** - * set the HTTP timeout value - * - * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout] - */ - public function setTimeout($seconds) { - if (!is_numeric($seconds) || $seconds < 0) - throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.'); - $this->curl_timeout = $seconds; - } +/** +* Get API key (with prefix if set) +* @param string key name +* @return string API key with the prefix +*/ +public function getApiKeyWithPrefix($apiKey) { +if (isset(Configuration::$apiKeyPrefix[$apiKey])) { +return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey]; +} else if (isset(Configuration::$apiKey[$apiKey])) { +return Configuration::$apiKey[$apiKey]; +} else { +return; +} +} - /** - * get the HTTP timeout value - * - * @return string HTTP timeout value - */ - public function getTimeout() { - return $this->curl_timeout; - } +/** +* update hearder 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']) +*/ +public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings) +{ +if (count($authSettings) == 0) +return; + +// one endpoint can have more than 1 auth settings +foreach($authSettings as $auth) { +// determine which one to use +switch($auth) { + case 'api_key': + $headerParams['api_key'] = $this->getApiKeyWithPrefix('api_key'); + + break; + case 'petstore_auth': + + //TODO support oauth + break; +default: +//TODO show warning about security definition not found +} +} +} +/** +* @param string $resourcePath path to method endpoint +* @param string $method method to call +* @param array $queryParams parameters to be place in query URL +* @param array $postData parameters to be placed in POST body +* @param array $headerParams parameters to be place in request header +* @return mixed +*/ +public function callApi($resourcePath, $method, $queryParams, $postData, +$headerParams, $authSettings) { + +$headers = array(); + +# determine authentication setting +$this->updateParamsForAuth($headerParams, $queryParams, $authSettings); + +# construct the http header +$headerParams = array_merge((array)self::$default_header, (array)$headerParams); + +foreach ($headerParams as $key => $val) { +$headers[] = "$key: $val"; +} - /** - * Get API key (with prefix if set) - * @param string key name - * @return string API key with the prefix - */ - public function getApiKeyWithPrefix($apiKey) { - if (isset(Configuration::$apiKeyPrefix[$apiKey])) { - return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey]; - } else if (isset(Configuration::$apiKey[$apiKey])) { - return Configuration::$apiKey[$apiKey]; - } else { - return; - } - } +// 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->sanitizeForSerialization($postData)); +} - /** - * update hearder 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']) - */ - public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings) - { - if (count($authSettings) == 0) - return; - - // one endpoint can have more than 1 auth settings - foreach($authSettings as $auth) { - // determine which one to use - switch($auth) { - - case 'api_key': - $headerParams['api_key'] = $this->getApiKeyWithPrefix('api_key'); - - break; - - case 'petstore_auth': - - //TODO support oauth - break; - - default: - //TODO show warning about security definition not found - } - } - } - - /** - * @param string $resourcePath path to method endpoint - * @param string $method method to call - * @param array $queryParams parameters to be place in query URL - * @param array $postData parameters to be placed in POST body - * @param array $headerParams parameters to be place in request header - * @return mixed - */ - public function callApi($resourcePath, $method, $queryParams, $postData, - $headerParams, $authSettings) { - - $headers = array(); - - # determine authentication setting - $this->updateParamsForAuth($headerParams, $queryParams, $authSettings); - - # construct the http header - $headerParams = array_merge((array)self::$default_header, (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->sanitizeForSerialization($postData)); - } - - $url = $this->host . $resourcePath; - - $curl = curl_init(); - // set timeout, if needed - if ($this->curl_timeout != 0) { - curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout); - } - // return the result on success, rather than just TRUE - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - - curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); - - 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); - } else if ($method == self::$PATCH) { - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH"); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); - } else if ($method == self::$PUT) { - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); - } else if ($method == self::$DELETE) { - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); - } else if ($method != self::$GET) { - throw new ApiException('Method ' . $method . ' is not recognized.'); - } - curl_setopt($curl, CURLOPT_URL, $url); - - // Set user agent - curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent); - - // debugging for curl - if (Configuration::$debug) { - error_log("[DEBUG] HTTP Request body ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file); - - curl_setopt($curl, CURLOPT_VERBOSE, 1); - curl_setopt($curl, CURLOPT_STDERR, fopen(Configuration::$debug_file, '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 (Configuration::$debug) { - error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file); - } - - // 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 ) { - $data = json_decode($http_body); - if (json_last_error() > 0) { // if response is a string - $data = $http_body; - } - } else { - throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)", - $response_info['http_code'], $http_header, $http_body); - } - return $data; - } +$url = $this->host . $resourcePath; - /** - * Build a JSON POST object - */ - protected function sanitizeForSerialization($data) - { - if (is_scalar($data) || null === $data) { - $sanitized = $data; - } else if ($data instanceof \DateTime) { - $sanitized = $data->format(\DateTime::ISO8601); - } else if (is_array($data)) { - foreach ($data as $property => $value) { - $data[$property] = $this->sanitizeForSerialization($value); - } - $sanitized = $data; - } else if (is_object($data)) { - $values = array(); - foreach (array_keys($data::$swaggerTypes) as $property) { - if ($data->$property !== null) { - $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property); - } - } - $sanitized = $values; - } else { - $sanitized = (string)$data; - } - - return $sanitized; - } +$curl = curl_init(); +// set timeout, if needed +if ($this->curl_timeout != 0) { +curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout); +} +// return the result on success, rather than just TRUE +curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - /** - * Take value and turn it into a string suitable for inclusion in - * the path, by url-encoding. - * @param string $value a string which will be part of the path - * @return string the serialized object - */ - public static function toPathValue($value) { - return rawurlencode(self::toString($value)); - } +curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); - /** - * Take value and turn it into a string suitable for inclusion in - * the query, by imploding comma-separated if it's an object. - * If it's a string, pass through unchanged. It will be url-encoded - * later. - * @param object $object an object to be serialized to a string - * @return string the serialized object - */ - public static function toQueryValue($object) { - if (is_array($object)) { - return implode(',', $object); - } else { - return self::toString($object); - } - } +if (! empty($queryParams)) { +$url = ($url . '?' . http_build_query($queryParams)); +} - /** - * 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 - * @param string $value a string which will be part of the header - * @return string the header string - */ - public static function toHeaderValue($value) { - return self::toString($value); - } +if ($method == self::$POST) { +curl_setopt($curl, CURLOPT_POST, true); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method == self::$PATCH) { +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH"); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method == self::$PUT) { +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT"); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method == self::$DELETE) { +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE"); +curl_setopt($curl, CURLOPT_POSTFIELDS, $postData); +} else if ($method != self::$GET) { +throw new ApiException('Method ' . $method . ' is not recognized.'); +} +curl_setopt($curl, CURLOPT_URL, $url); - /** - * Take value and turn it into a string suitable for inclusion in - * the http body (form parameter). If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * @param string $value the value of the form parameter - * @return string the form string - */ - public static function toFormValue($value) { - return self::toString($value); - } +// Set user agent +curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent); - /** - * Take value and turn it into a string suitable for inclusion in - * the parameter. If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * @param string $value the value of the parameter - * @return string the header string - */ - public static function toString($value) { - if ($value instanceof \DateTime) { // datetime in ISO8601 format - return $value->format(\DateTime::ISO8601); - } - else { - return $value; - } - } +// debugging for curl +if (Configuration::$debug) { +error_log("[DEBUG] HTTP Request body ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file); - /** - * Deserialize a JSON string into an object - * - * @param object $object object or primitive to be deserialized - * @param string $class class name is passed as a string - * @return object an instance of $class - */ - public static function deserialize($data, $class) - { - if (null === $data) { - $deserialized = null; - } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int] - $inner = substr($class, 4, -1); - $deserialized = array(); - if(strrpos($inner, ",") !== false) { - $subClass_array = explode(',', $inner, 2); - $subClass = $subClass_array[1]; - foreach ($data as $key => $value) { - $deserialized[$key] = self::deserialize($value, $subClass); - } - } - } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) { - $subClass = substr($class, 6, -1); - $values = array(); - foreach ($data as $key => $value) { - $values[] = self::deserialize($value, $subClass); - } - $deserialized = $values; - } elseif ($class == 'DateTime') { - $deserialized = new \DateTime($data); - } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) { - settype($data, $class); - $deserialized = $data; - } else { - $class = "SwaggerClient\\models\\".$class; - $instance = new $class(); - foreach ($instance::$swaggerTypes as $property => $type) { - $original_property_name = $instance::$attributeMap[$property]; - if (isset($original_property_name) && isset($data->$original_property_name)) { - $instance->$property = self::deserialize($data->$original_property_name, $type); - } - } - $deserialized = $instance; - } - - return $deserialized; - } +curl_setopt($curl, CURLOPT_VERBOSE, 1); +curl_setopt($curl, CURLOPT_STDERR, fopen(Configuration::$debug_file, 'a')); +} else { +curl_setopt($curl, CURLOPT_VERBOSE, 0); +} - /* - * return the header 'Accept' based on an array of Accept provided - * - * @param array[string] $accept Array of header - * @return string Accept (e.g. application/json) - */ - public static function selectHeaderAccept($accept) { - if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) { - return NULL; - } elseif (preg_grep("/application\/json/i", $accept)) { - return 'application/json'; - } else { - return implode(',', $accept); - } - } +// obtain the HTTP response headers +curl_setopt($curl, CURLOPT_HEADER, 1); - /* - * return the content type based on an array of content-type provided - * - * @param array[string] content_type_array Array fo content-type - * @return string Content-Type (e.g. application/json) - */ - public static function selectHeaderContentType($content_type) { - if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) { - return 'application/json'; - } elseif (preg_grep("/application\/json/i", $content_type)) { - return 'application/json'; - } else { - return implode(',', $content_type); - } - } +// 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 (Configuration::$debug) { +error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file); +} + +// 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 ) { +$data = json_decode($http_body); +if (json_last_error() > 0) { // if response is a string +$data = $http_body; +} +} else { +throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)", +$response_info['http_code'], $http_header, $http_body); +} +return $data; +} + +/** +* Build a JSON POST object +*/ +protected function sanitizeForSerialization($data) +{ +if (is_scalar($data) || null === $data) { +$sanitized = $data; +} else if ($data instanceof \DateTime) { +$sanitized = $data->format(\DateTime::ISO8601); +} else if (is_array($data)) { +foreach ($data as $property => $value) { +$data[$property] = $this->sanitizeForSerialization($value); +} +$sanitized = $data; +} else if (is_object($data)) { +$values = array(); +foreach (array_keys($data::$swaggerTypes) as $property) { +if ($data->$property !== null) { +$values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property); +} +} +$sanitized = $values; +} else { +$sanitized = (string)$data; +} + +return $sanitized; +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the path, by url-encoding. +* @param string $value a string which will be part of the path +* @return string the serialized object +*/ +public static function toPathValue($value) { +return rawurlencode(self::toString($value)); +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the query, by imploding comma-separated if it's an object. +* If it's a string, pass through unchanged. It will be url-encoded +* later. +* @param object $object an object to be serialized to a string +* @return string the serialized object +*/ +public static function toQueryValue($object) { +if (is_array($object)) { +return implode(',', $object); +} else { +return self::toString($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 +* @param string $value a string which will be part of the header +* @return string the header string +*/ +public static function toHeaderValue($value) { +return self::toString($value); +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the http body (form parameter). If it's a string, pass through unchanged +* If it's a datetime object, format it in ISO8601 +* @param string $value the value of the form parameter +* @return string the form string +*/ +public static function toFormValue($value) { +return self::toString($value); +} + +/** +* Take value and turn it into a string suitable for inclusion in +* the parameter. If it's a string, pass through unchanged +* If it's a datetime object, format it in ISO8601 +* @param string $value the value of the parameter +* @return string the header string +*/ +public static function toString($value) { +if ($value instanceof \DateTime) { // datetime in ISO8601 format +return $value->format(\DateTime::ISO8601); +} +else { +return $value; +} +} + +/** +* Deserialize a JSON string into an object +* +* @param object $object object or primitive to be deserialized +* @param string $class class name is passed as a string +* @return object an instance of $class +*/ +public static function deserialize($data, $class) +{ +if (null === $data) { +$deserialized = null; +} elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int] +$inner = substr($class, 4, -1); +$deserialized = array(); +if(strrpos($inner, ",") !== false) { +$subClass_array = explode(',', $inner, 2); +$subClass = $subClass_array[1]; +foreach ($data as $key => $value) { +$deserialized[$key] = self::deserialize($value, $subClass); +} +} +} elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) { +$subClass = substr($class, 6, -1); +$values = array(); +foreach ($data as $key => $value) { +$values[] = self::deserialize($value, $subClass); +} +$deserialized = $values; +} elseif ($class == 'DateTime') { +$deserialized = new \DateTime($data); +} elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) { +settype($data, $class); +$deserialized = $data; +} else { +$class = "SwaggerClient\\models\\".$class; +$instance = new $class(); +foreach ($instance::$swaggerTypes as $property => $type) { +$original_property_name = $instance::$attributeMap[$property]; +if (isset($original_property_name) && isset($data->$original_property_name)) { +$instance->$property = self::deserialize($data->$original_property_name, $type); +} +} +$deserialized = $instance; +} + +return $deserialized; +} + +/* +* return the header 'Accept' based on an array of Accept provided +* +* @param array[string] $accept Array of header +* @return string Accept (e.g. application/json) +*/ +public static function selectHeaderAccept($accept) { +if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) { +return NULL; +} elseif (preg_grep("/application\/json/i", $accept)) { +return 'application/json'; +} else { +return implode(',', $accept); +} +} + +/* +* return the content type based on an array of content-type provided +* +* @param array[string] content_type_array Array fo content-type +* @return string Content-Type (e.g. application/json) +*/ +public static function selectHeaderContentType($content_type) { +if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) { +return 'application/json'; +} elseif (preg_grep("/application\/json/i", $content_type)) { +return 'application/json'; +} else { +return implode(',', $content_type); +} +} } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php index 40158cf76e6..f11b319a4ce 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php @@ -1,6 +1,6 @@ response_headers = $responseHeaders; - $this->response_body = $responseBody; - } +$this->response_body = $responseBody; +} - /** - * Get the HTTP response header - * - * @return string HTTP response header - */ - public function getResponseHeaders() { - return $this->response_headers; - } +/** +* Get the HTTP response header +* +* @return string HTTP response header +*/ +public function getResponseHeaders() { +return $this->response_headers; +} - /** - * Get the HTTP response body - * - * @return string HTTP response body - */ - public function getResponseBody() { - return $this->response_body; - } +/** +* Get the HTTP response body +* +* @return string HTTP response body +*/ +public function getResponseBody() { +return $this->response_body; +} } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php index 8a0dc734a0d..cd514956a29 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php @@ -1,6 +1,6 @@ apiClient = Configuration::$apiClient; - } - else - $this->apiClient = Configuration::$apiClient; // use the default one - } else { - $this->apiClient = $apiClient; // use the one provided by the user - } - } - - private $apiClient; // instance of the ApiClient - - /** - * get the API client - */ - public function getApiClient() { - return $this->apiClient; - } - - /** - * set the API client - */ - public function setApiClient($apiClient) { - $this->apiClient = $apiClient; - } - - - /** - * updatePet - * - * Update an existing pet - * - * @param Pet $body Pet object that needs to be added to the store (required) - * @return void - */ - public function updatePet($body) { - - - // parse inputs - $resourcePath = "/pet"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "PUT"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/json','application/xml')); - - - - - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * addPet - * - * Add a new pet to the store - * - * @param Pet $body Pet object that needs to be added to the store (required) - * @return void - */ - public function addPet($body) { - - - // parse inputs - $resourcePath = "/pet"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/json','application/xml')); - - - - - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * findPetsByStatus - * - * Finds Pets by status - * - * @param array[string] $status Status values that need to be considered for filter (required) - * @return array[Pet] - */ - public function findPetsByStatus($status) { - - - // parse inputs - $resourcePath = "/pet/findByStatus"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - // query params - if($status !== null) { - $queryParams['status'] = $this->apiClient->toQueryValue($status); - } - - - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'array[Pet]'); - return $responseObject; - } - - /** - * findPetsByTags - * - * Finds Pets by tags - * - * @param array[string] $tags Tags to filter by (required) - * @return array[Pet] - */ - public function findPetsByTags($tags) { - - - // parse inputs - $resourcePath = "/pet/findByTags"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - // query params - if($tags !== null) { - $queryParams['tags'] = $this->apiClient->toQueryValue($tags); - } - - - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'array[Pet]'); - return $responseObject; - } - - /** - * getPetById - * - * Find pet by ID - * - * @param int $pet_id ID of pet that needs to be fetched (required) - * @return Pet - */ - public function getPetById($pet_id) { - - // verify the required parameter 'pet_id' is set - if ($pet_id === null) { +} +else +$this->apiClient = Configuration::$apiClient; // use the default one +} else { +$this->apiClient = $apiClient; // use the one provided by the user +} +} + +private $apiClient; // instance of the ApiClient + +/** +* get the API client +*/ +public function getApiClient() { +return $this->apiClient; +} + +/** +* set the API client +*/ +public function setApiClient($apiClient) { +$this->apiClient = $apiClient; +} + + /** + * updatePet + * + * Update an existing pet + * + * @param Pet $body Pet object that needs to be added to the store (required) + * @return void + */ + public function updatePet($body) { + + + // parse inputs + $resourcePath = "/pet"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "PUT"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/json','application/xml')); + + + + + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * addPet + * + * Add a new pet to the store + * + * @param Pet $body Pet object that needs to be added to the store (required) + * @return void + */ + public function addPet($body) { + + + // parse inputs + $resourcePath = "/pet"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/json','application/xml')); + + + + + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * findPetsByStatus + * + * Finds Pets by status + * + * @param array[string] $status Status values that need to be considered for filter (required) + * @return array[Pet] + */ + public function findPetsByStatus($status) { + + + // parse inputs + $resourcePath = "/pet/findByStatus"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + // query params + if($status !== null) { + $queryParams['status'] = $this->apiClient->toQueryValue($status); + } + + + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'array[Pet]'); + return $responseObject; + } + /** + * findPetsByTags + * + * Finds Pets by tags + * + * @param array[string] $tags Tags to filter by (required) + * @return array[Pet] + */ + public function findPetsByTags($tags) { + + + // parse inputs + $resourcePath = "/pet/findByTags"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + // query params + if($tags !== null) { + $queryParams['tags'] = $this->apiClient->toQueryValue($tags); + } + + + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'array[Pet]'); + return $responseObject; + } + /** + * getPetById + * + * Find pet by ID + * + * @param int $pet_id ID of pet that needs to be fetched (required) + * @return Pet + */ + public function getPetById($pet_id) { + + // verify the required parameter 'pet_id' is set + if ($pet_id === null) { throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById'); - } - - - // parse inputs - $resourcePath = "/pet/{petId}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - // path params - if($pet_id !== null) { - $resourcePath = str_replace("{" . "petId" . "}", - $this->apiClient->toPathValue($pet_id), $resourcePath); - } - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('api_key', 'petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'Pet'); - return $responseObject; - } - - /** - * updatePetWithForm - * - * Updates a pet in the store with form data - * - * @param string $pet_id ID of pet that needs to be updated (required) - * @param string $name Updated name of the pet (required) - * @param string $status Updated status of the pet (required) - * @return void - */ - public function updatePetWithForm($pet_id, $name, $status) { - - // verify the required parameter 'pet_id' is set - if ($pet_id === null) { + } + + + // parse inputs + $resourcePath = "/pet/{petId}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + // path params + if($pet_id !== null) { + $resourcePath = str_replace("{" . "petId" . "}", + $this->apiClient->toPathValue($pet_id), $resourcePath); + } + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('api_key', 'petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'Pet'); + return $responseObject; + } + /** + * updatePetWithForm + * + * Updates a pet in the store with form data + * + * @param string $pet_id ID of pet that needs to be updated (required) + * @param string $name Updated name of the pet (required) + * @param string $status Updated status of the pet (required) + * @return void + */ + public function updatePetWithForm($pet_id, $name, $status) { + + // verify the required parameter 'pet_id' is set + if ($pet_id === null) { throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm'); - } - - - // parse inputs - $resourcePath = "/pet/{petId}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/x-www-form-urlencoded')); - - - - // path params - if($pet_id !== null) { - $resourcePath = str_replace("{" . "petId" . "}", - $this->apiClient->toPathValue($pet_id), $resourcePath); - } - // form params - if ($name !== null) { - $formParams['name'] = $this->apiClient->toFormValue($name); - }// form params - if ($status !== null) { - $formParams['status'] = $this->apiClient->toFormValue($status); - } - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * deletePet - * - * Deletes a pet - * - * @param string $api_key (required) - * @param int $pet_id Pet id to delete (required) - * @return void - */ - public function deletePet($api_key, $pet_id) { - - // verify the required parameter 'pet_id' is set - if ($pet_id === null) { + } + + + // parse inputs + $resourcePath = "/pet/{petId}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/x-www-form-urlencoded')); + + + + // path params + if($pet_id !== null) { + $resourcePath = str_replace("{" . "petId" . "}", + $this->apiClient->toPathValue($pet_id), $resourcePath); + } + // form params + if ($name !== null) { + $formParams['name'] = $this->apiClient->toFormValue($name); + }// form params + if ($status !== null) { + $formParams['status'] = $this->apiClient->toFormValue($status); + } + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * deletePet + * + * Deletes a pet + * + * @param string $api_key (required) + * @param int $pet_id Pet id to delete (required) + * @return void + */ + public function deletePet($api_key, $pet_id) { + + // verify the required parameter 'pet_id' is set + if ($pet_id === null) { throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling deletePet'); - } - - - // parse inputs - $resourcePath = "/pet/{petId}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "DELETE"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - // header params - if($api_key !== null) { - $headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key); - } - // path params - if($pet_id !== null) { - $resourcePath = str_replace("{" . "petId" . "}", - $this->apiClient->toPathValue($pet_id), $resourcePath); - } - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * uploadFile - * - * uploads an image - * - * @param int $pet_id ID of pet to update (required) - * @param string $additional_metadata Additional data to pass to server (required) - * @param string $file file to upload (required) - * @return void - */ - public function uploadFile($pet_id, $additional_metadata, $file) { - - // verify the required parameter 'pet_id' is set - if ($pet_id === null) { + } + + + // parse inputs + $resourcePath = "/pet/{petId}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "DELETE"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + // header params + if($api_key !== null) { + $headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key); + } + // path params + if($pet_id !== null) { + $resourcePath = str_replace("{" . "petId" . "}", + $this->apiClient->toPathValue($pet_id), $resourcePath); + } + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * uploadFile + * + * uploads an image + * + * @param int $pet_id ID of pet to update (required) + * @param string $additional_metadata Additional data to pass to server (required) + * @param string $file file to upload (required) + * @return void + */ + public function uploadFile($pet_id, $additional_metadata, $file) { + + // verify the required parameter 'pet_id' is set + if ($pet_id === null) { throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile'); - } - - - // parse inputs - $resourcePath = "/pet/{petId}/uploadImage"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('multipart/form-data')); - - - - // path params - if($pet_id !== null) { - $resourcePath = str_replace("{" . "petId" . "}", - $this->apiClient->toPathValue($pet_id), $resourcePath); - } - // form params - if ($additional_metadata !== null) { - $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata); - }// form params - if ($file !== null) { - $formParams['file'] = '@' . $this->apiClient->toFormValue($file); - } - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('petstore_auth'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - + } + + + // parse inputs + $resourcePath = "/pet/{petId}/uploadImage"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('multipart/form-data')); + + + + // path params + if($pet_id !== null) { + $resourcePath = str_replace("{" . "petId" . "}", + $this->apiClient->toPathValue($pet_id), $resourcePath); + } + // form params + if ($additional_metadata !== null) { + $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata); + }// form params + if ($file !== null) { + $formParams['file'] = '@' . $this->apiClient->toFormValue($file); + } + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('petstore_auth'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php index 73a060f421d..c4a5dd98127 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php @@ -1,6 +1,6 @@ apiClient = Configuration::$apiClient; - } - else - $this->apiClient = Configuration::$apiClient; // use the default one - } else { - $this->apiClient = $apiClient; // use the one provided by the user +} +else +$this->apiClient = Configuration::$apiClient; // use the default one +} else { +$this->apiClient = $apiClient; // use the one provided by the user +} +} + +private $apiClient; // instance of the ApiClient + +/** +* get the API client +*/ +public function getApiClient() { +return $this->apiClient; +} + +/** +* set the API client +*/ +public function setApiClient($apiClient) { +$this->apiClient = $apiClient; +} + + /** + * getInventory + * + * Returns pet inventories by status + * + * @return map[string,int] + */ + public function getInventory() { + + + // parse inputs + $resourcePath = "/store/inventory"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array('api_key'); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'map[string,int]'); + return $responseObject; + } + /** + * placeOrder + * + * Place an order for a pet + * + * @param Order $body order placed for purchasing the pet (required) + * @return Order + */ + public function placeOrder($body) { + + + // parse inputs + $resourcePath = "/store/order"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; } - } - - private $apiClient; // instance of the ApiClient - - /** - * get the API client - */ - public function getApiClient() { - return $this->apiClient; - } - - /** - * set the API client - */ - public function setApiClient($apiClient) { - $this->apiClient = $apiClient; - } - - - /** - * getInventory - * - * Returns pet inventories by status - * - * @return map[string,int] - */ - public function getInventory() { - - - // parse inputs - $resourcePath = "/store/inventory"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array('api_key'); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'map[string,int]'); - return $responseObject; - } - - /** - * placeOrder - * - * Place an order for a pet - * - * @param Order $body order placed for purchasing the pet (required) - * @return Order - */ - public function placeOrder($body) { - - - // parse inputs - $resourcePath = "/store/order"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'Order'); - return $responseObject; - } - - /** - * getOrderById - * - * Find purchase order by ID - * - * @param string $order_id ID of pet that needs to be fetched (required) - * @return Order - */ - public function getOrderById($order_id) { - - // verify the required parameter 'order_id' is set - if ($order_id === null) { + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'Order'); + return $responseObject; + } + /** + * getOrderById + * + * Find purchase order by ID + * + * @param string $order_id ID of pet that needs to be fetched (required) + * @return Order + */ + public function getOrderById($order_id) { + + // verify the required parameter 'order_id' is set + if ($order_id === null) { throw new \InvalidArgumentException('Missing the required parameter $order_id when calling getOrderById'); - } - - - // parse inputs - $resourcePath = "/store/order/{orderId}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - // path params - if($order_id !== null) { - $resourcePath = str_replace("{" . "orderId" . "}", - $this->apiClient->toPathValue($order_id), $resourcePath); - } - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'Order'); - return $responseObject; - } - - /** - * deleteOrder - * - * Delete purchase order by ID - * - * @param string $order_id ID of the order that needs to be deleted (required) - * @return void - */ - public function deleteOrder($order_id) { - - // verify the required parameter 'order_id' is set - if ($order_id === null) { + } + + + // parse inputs + $resourcePath = "/store/order/{orderId}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + // path params + if($order_id !== null) { + $resourcePath = str_replace("{" . "orderId" . "}", + $this->apiClient->toPathValue($order_id), $resourcePath); + } + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'Order'); + return $responseObject; + } + /** + * deleteOrder + * + * Delete purchase order by ID + * + * @param string $order_id ID of the order that needs to be deleted (required) + * @return void + */ + public function deleteOrder($order_id) { + + // verify the required parameter 'order_id' is set + if ($order_id === null) { throw new \InvalidArgumentException('Missing the required parameter $order_id when calling deleteOrder'); - } - - - // parse inputs - $resourcePath = "/store/order/{orderId}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "DELETE"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - // path params - if($order_id !== null) { - $resourcePath = str_replace("{" . "orderId" . "}", - $this->apiClient->toPathValue($order_id), $resourcePath); - } - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - + } + + + // parse inputs + $resourcePath = "/store/order/{orderId}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "DELETE"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + // path params + if($order_id !== null) { + $resourcePath = str_replace("{" . "orderId" . "}", + $this->apiClient->toPathValue($order_id), $resourcePath); + } + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php index 1e4f7dbc293..7063d11353f 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php @@ -1,6 +1,6 @@ apiClient = Configuration::$apiClient; - } - else - $this->apiClient = Configuration::$apiClient; // use the default one - } else { - $this->apiClient = $apiClient; // use the one provided by the user - } - } - - private $apiClient; // instance of the ApiClient - - /** - * get the API client - */ - public function getApiClient() { - return $this->apiClient; - } - - /** - * set the API client - */ - public function setApiClient($apiClient) { - $this->apiClient = $apiClient; - } - - - /** - * createUser - * - * Create user - * - * @param User $body Created user object (required) - * @return void - */ - public function createUser($body) { - - - // parse inputs - $resourcePath = "/user"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * createUsersWithArrayInput - * - * Creates list of users with given input array - * - * @param array[User] $body List of user object (required) - * @return void - */ - public function createUsersWithArrayInput($body) { - - - // parse inputs - $resourcePath = "/user/createWithArray"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * createUsersWithListInput - * - * Creates list of users with given input array - * - * @param array[User] $body List of user object (required) - * @return void - */ - public function createUsersWithListInput($body) { - - - // parse inputs - $resourcePath = "/user/createWithList"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "POST"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * loginUser - * - * 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) - * @return string - */ - public function loginUser($username, $password) { - - - // parse inputs - $resourcePath = "/user/login"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - // query params - if($username !== null) { - $queryParams['username'] = $this->apiClient->toQueryValue($username); - }// query params - if($password !== null) { - $queryParams['password'] = $this->apiClient->toQueryValue($password); - } - - - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'string'); - return $responseObject; - } - - /** - * logoutUser - * - * Logs out current logged in user session - * - * @return void - */ - public function logoutUser() { - - - // parse inputs - $resourcePath = "/user/logout"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * getUserByName - * - * Get user by user name - * - * @param string $username The name that needs to be fetched. Use user1 for testing. (required) - * @return User - */ - public function getUserByName($username) { - - // verify the required parameter 'username' is set - if ($username === null) { +} +else +$this->apiClient = Configuration::$apiClient; // use the default one +} else { +$this->apiClient = $apiClient; // use the one provided by the user +} +} + +private $apiClient; // instance of the ApiClient + +/** +* get the API client +*/ +public function getApiClient() { +return $this->apiClient; +} + +/** +* set the API client +*/ +public function setApiClient($apiClient) { +$this->apiClient = $apiClient; +} + + /** + * createUser + * + * Create user + * + * @param User $body Created user object (required) + * @return void + */ + public function createUser($body) { + + + // parse inputs + $resourcePath = "/user"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * createUsersWithArrayInput + * + * Creates list of users with given input array + * + * @param array[User] $body List of user object (required) + * @return void + */ + public function createUsersWithArrayInput($body) { + + + // parse inputs + $resourcePath = "/user/createWithArray"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * createUsersWithListInput + * + * Creates list of users with given input array + * + * @param array[User] $body List of user object (required) + * @return void + */ + public function createUsersWithListInput($body) { + + + // parse inputs + $resourcePath = "/user/createWithList"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "POST"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * loginUser + * + * 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) + * @return string + */ + public function loginUser($username, $password) { + + + // parse inputs + $resourcePath = "/user/login"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + // query params + if($username !== null) { + $queryParams['username'] = $this->apiClient->toQueryValue($username); + }// query params + if($password !== null) { + $queryParams['password'] = $this->apiClient->toQueryValue($password); + } + + + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'string'); + return $responseObject; + } + /** + * logoutUser + * + * Logs out current logged in user session + * + * @return void + */ + public function logoutUser() { + + + // parse inputs + $resourcePath = "/user/logout"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * getUserByName + * + * Get user by user name + * + * @param string $username The name that needs to be fetched. Use user1 for testing. (required) + * @return User + */ + public function getUserByName($username) { + + // verify the required parameter 'username' is set + if ($username === null) { throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName'); - } - - - // parse inputs - $resourcePath = "/user/{username}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "GET"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - // path params - if($username !== null) { - $resourcePath = str_replace("{" . "username" . "}", - $this->apiClient->toPathValue($username), $resourcePath); - } - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - if(! $response) { - return null; - } - - $responseObject = $this->apiClient->deserialize($response,'User'); - return $responseObject; - } - - /** - * updateUser - * - * Updated user - * - * @param string $username name that need to be deleted (required) - * @param User $body Updated user object (required) - * @return void - */ - public function updateUser($username, $body) { - - // verify the required parameter 'username' is set - if ($username === null) { + } + + + // parse inputs + $resourcePath = "/user/{username}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "GET"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + // path params + if($username !== null) { + $resourcePath = str_replace("{" . "username" . "}", + $this->apiClient->toPathValue($username), $resourcePath); + } + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + if(! $response) { + return null; + } + + $responseObject = $this->apiClient->deserialize($response,'User'); + return $responseObject; + } + /** + * updateUser + * + * Updated user + * + * @param string $username name that need to be deleted (required) + * @param User $body Updated user object (required) + * @return void + */ + public function updateUser($username, $body) { + + // verify the required parameter 'username' is set + if ($username === null) { throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser'); - } - - - // parse inputs - $resourcePath = "/user/{username}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "PUT"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - // path params - if($username !== null) { - $resourcePath = str_replace("{" . "username" . "}", - $this->apiClient->toPathValue($username), $resourcePath); - } - - // body params - $_tempBody = null; - if (isset($body)) { - $_tempBody = $body; - } - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - - /** - * deleteUser - * - * Delete user - * - * @param string $username The name that needs to be deleted (required) - * @return void - */ - public function deleteUser($username) { - - // verify the required parameter 'username' is set - if ($username === null) { + } + + + // parse inputs + $resourcePath = "/user/{username}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "PUT"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + // path params + if($username !== null) { + $resourcePath = str_replace("{" . "username" . "}", + $this->apiClient->toPathValue($username), $resourcePath); + } + + // body params + $_tempBody = null; + if (isset($body)) { + $_tempBody = $body; + } + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } + /** + * deleteUser + * + * Delete user + * + * @param string $username The name that needs to be deleted (required) + * @return void + */ + public function deleteUser($username) { + + // verify the required parameter 'username' is set + if ($username === null) { throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser'); - } - - - // parse inputs - $resourcePath = "/user/{username}"; - $resourcePath = str_replace("{format}", "json", $resourcePath); - $method = "DELETE"; - $httpBody = ''; - $queryParams = array(); - $headerParams = array(); - $formParams = array(); - $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); - if (!is_null($_header_accept)) { - $headerParams['Accept'] = $_header_accept; - } - $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); - - - - // path params - if($username !== null) { - $resourcePath = str_replace("{" . "username" . "}", - $this->apiClient->toPathValue($username), $resourcePath); - } - - - - // for model (json/xml) - if (isset($_tempBody)) { - $httpBody = $_tempBody; // $_tempBody is the method argument, if present - } else if (count($formParams) > 0) { - // for HTTP post (form) - $httpBody = $formParams; - } - - // authentication setting, if any - $authSettings = array(); - - // make the API Call - $response = $this->apiClient->callAPI($resourcePath, $method, - $queryParams, $httpBody, - $headerParams, $authSettings); - - - } - + } + + + // parse inputs + $resourcePath = "/user/{username}"; + $resourcePath = str_replace("{format}", "json", $resourcePath); + $method = "DELETE"; + $httpBody = ''; + $queryParams = array(); + $headerParams = array(); + $formParams = array(); + $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml')); + if (!is_null($_header_accept)) { + $headerParams['Accept'] = $_header_accept; + } + $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array()); + + + + // path params + if($username !== null) { + $resourcePath = str_replace("{" . "username" . "}", + $this->apiClient->toPathValue($username), $resourcePath); + } + + + + // for model (json/xml) + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present + } else if (count($formParams) > 0) { + // for HTTP post (form) + $httpBody = $formParams; + } + + // authentication setting, if any + $authSettings = array(); + + // make the API Call + $response = $this->apiClient->callAPI($resourcePath, $method, + $queryParams, $httpBody, + $headerParams, $authSettings); + + + } } diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php index 9c2a6542301..bd7d6e9a8d0 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php @@ -1,6 +1,6 @@ 'int', - 'name' => 'string' - ); + 'name' => 'string' + ); - static $attributeMap = array( - 'id' => 'id', - 'name' => 'name' - ); + static $attributeMap = array( + 'id' => 'id', + 'name' => 'name' + ); - - public $id; /* int */ - public $name; /* string */ + + public $id; /* int */ + public $name; /* string */ - public function __construct(array $data = null) { + public function __construct(array $data = null) { $this->id = $data["id"]; $this->name = $data["name"]; - } + } - public function offsetExists($offset) { + public function offsetExists($offset) { return isset($this->$offset); - } + } - public function offsetGet($offset) { + public function offsetGet($offset) { return $this->$offset; - } + } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) { $this->$offset = $value; - } + } - public function offsetUnset($offset) { + public function offsetUnset($offset) { unset($this->$offset); - } -} + } + } + diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php index c6a909b29ef..8f25f8da3c5 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php @@ -1,6 +1,6 @@ 'int', - 'pet_id' => 'int', - 'quantity' => 'int', - 'ship_date' => 'DateTime', - 'status' => 'string', - 'complete' => 'boolean' - ); + 'pet_id' => 'int', + 'quantity' => 'int', + 'ship_date' => 'DateTime', + 'status' => 'string', + 'complete' => 'boolean' + ); - static $attributeMap = array( - 'id' => 'id', - 'pet_id' => 'petId', - 'quantity' => 'quantity', - 'ship_date' => 'shipDate', - 'status' => 'status', - 'complete' => 'complete' - ); + static $attributeMap = array( + 'id' => 'id', + 'pet_id' => 'petId', + 'quantity' => 'quantity', + 'ship_date' => 'shipDate', + 'status' => 'status', + 'complete' => 'complete' + ); - - public $id; /* int */ - public $pet_id; /* int */ - public $quantity; /* int */ - public $ship_date; /* DateTime */ - /** - * Order Status - */ - public $status; /* string */ - public $complete; /* boolean */ + + public $id; /* int */ + public $pet_id; /* int */ + public $quantity; /* int */ + public $ship_date; /* DateTime */ + /** + * Order Status + */ + public $status; /* string */ + public $complete; /* boolean */ - public function __construct(array $data = null) { + public function __construct(array $data = null) { $this->id = $data["id"]; $this->pet_id = $data["pet_id"]; $this->quantity = $data["quantity"]; $this->ship_date = $data["ship_date"]; $this->status = $data["status"]; $this->complete = $data["complete"]; - } + } - public function offsetExists($offset) { + public function offsetExists($offset) { return isset($this->$offset); - } + } - public function offsetGet($offset) { + public function offsetGet($offset) { return $this->$offset; - } + } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) { $this->$offset = $value; - } + } - public function offsetUnset($offset) { + public function offsetUnset($offset) { unset($this->$offset); - } -} + } + } + diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php index d2014f3fa34..918b39b9adf 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php @@ -1,6 +1,6 @@ 'int', - 'category' => 'Category', - 'name' => 'string', - 'photo_urls' => 'array[string]', - 'tags' => 'array[Tag]', - 'status' => 'string' - ); + 'category' => 'Category', + 'name' => 'string', + 'photo_urls' => 'array[string]', + 'tags' => 'array[Tag]', + 'status' => 'string' + ); - static $attributeMap = array( - 'id' => 'id', - 'category' => 'category', - 'name' => 'name', - 'photo_urls' => 'photoUrls', - 'tags' => 'tags', - 'status' => 'status' - ); + static $attributeMap = array( + 'id' => 'id', + 'category' => 'category', + 'name' => 'name', + 'photo_urls' => 'photoUrls', + 'tags' => 'tags', + 'status' => 'status' + ); - - public $id; /* int */ - public $category; /* Category */ - public $name; /* string */ - public $photo_urls; /* array[string] */ - public $tags; /* array[Tag] */ - /** - * pet status in the store - */ - public $status; /* string */ + + public $id; /* int */ + public $category; /* Category */ + public $name; /* string */ + public $photo_urls; /* array[string] */ + public $tags; /* array[Tag] */ + /** + * pet status in the store + */ + public $status; /* string */ - public function __construct(array $data = null) { + public function __construct(array $data = null) { $this->id = $data["id"]; $this->category = $data["category"]; $this->name = $data["name"]; $this->photo_urls = $data["photo_urls"]; $this->tags = $data["tags"]; $this->status = $data["status"]; - } + } - public function offsetExists($offset) { + public function offsetExists($offset) { return isset($this->$offset); - } + } - public function offsetGet($offset) { + public function offsetGet($offset) { return $this->$offset; - } + } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) { $this->$offset = $value; - } + } - public function offsetUnset($offset) { + public function offsetUnset($offset) { unset($this->$offset); - } -} + } + } + diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php index 4a87c0626f1..7ae6cc68a3c 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php @@ -1,6 +1,6 @@ 'int', - 'name' => 'string' - ); + 'name' => 'string' + ); - static $attributeMap = array( - 'id' => 'id', - 'name' => 'name' - ); + static $attributeMap = array( + 'id' => 'id', + 'name' => 'name' + ); - - public $id; /* int */ - public $name; /* string */ + + public $id; /* int */ + public $name; /* string */ - public function __construct(array $data = null) { + public function __construct(array $data = null) { $this->id = $data["id"]; $this->name = $data["name"]; - } + } - public function offsetExists($offset) { + public function offsetExists($offset) { return isset($this->$offset); - } + } - public function offsetGet($offset) { + public function offsetGet($offset) { return $this->$offset; - } + } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) { $this->$offset = $value; - } + } - public function offsetUnset($offset) { + public function offsetUnset($offset) { unset($this->$offset); - } -} + } + } + diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php index ab8b4a60fc4..a705c55af74 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php @@ -1,6 +1,6 @@ 'int', - 'username' => 'string', - 'first_name' => 'string', - 'last_name' => 'string', - 'email' => 'string', - 'password' => 'string', - 'phone' => 'string', - 'user_status' => 'int' - ); + 'username' => 'string', + 'first_name' => 'string', + 'last_name' => 'string', + 'email' => 'string', + 'password' => 'string', + 'phone' => 'string', + 'user_status' => 'int' + ); - static $attributeMap = array( - 'id' => 'id', - 'username' => 'username', - 'first_name' => 'firstName', - 'last_name' => 'lastName', - 'email' => 'email', - 'password' => 'password', - 'phone' => 'phone', - 'user_status' => 'userStatus' - ); + static $attributeMap = array( + 'id' => 'id', + 'username' => 'username', + 'first_name' => 'firstName', + 'last_name' => 'lastName', + 'email' => 'email', + 'password' => 'password', + 'phone' => 'phone', + 'user_status' => 'userStatus' + ); - - public $id; /* int */ - public $username; /* string */ - public $first_name; /* string */ - public $last_name; /* string */ - public $email; /* string */ - public $password; /* string */ - public $phone; /* string */ - /** - * User Status - */ - public $user_status; /* int */ + + public $id; /* int */ + public $username; /* string */ + public $first_name; /* string */ + public $last_name; /* string */ + public $email; /* string */ + public $password; /* string */ + public $phone; /* string */ + /** + * User Status + */ + public $user_status; /* int */ - public function __construct(array $data = null) { + public function __construct(array $data = null) { $this->id = $data["id"]; $this->username = $data["username"]; $this->first_name = $data["first_name"]; @@ -71,21 +72,22 @@ public function __construct(array $data = null) { $this->password = $data["password"]; $this->phone = $data["phone"]; $this->user_status = $data["user_status"]; - } + } - public function offsetExists($offset) { + public function offsetExists($offset) { return isset($this->$offset); - } + } - public function offsetGet($offset) { + public function offsetGet($offset) { return $this->$offset; - } + } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) { $this->$offset = $value; - } + } - public function offsetUnset($offset) { + public function offsetUnset($offset) { unset($this->$offset); - } -} + } + } + diff --git a/samples/client/petstore/php/SwaggerClient-php/pom.xml b/samples/client/petstore/php/SwaggerClient-php/pom.xml index b1aeddcf7ea..fa23a1145a8 100644 --- a/samples/client/petstore/php/SwaggerClient-php/pom.xml +++ b/samples/client/petstore/php/SwaggerClient-php/pom.xml @@ -1,60 +1,60 @@ - 4.0.0 - com.wordnik - PhpPetstoreClientTests - pom - 1.0-SNAPSHOT - PHP Swagger Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - bundle-install - pre-integration-test - - exec - - - composer - - install - - - - - bundle-test - integration-test - - exec - - - vendor/bin/phpunit - - tests - - - - - - - + 4.0.0 + com.wordnik + PhpPetstoreClientTests + pom + 1.0-SNAPSHOT + PHP Swagger Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + bundle-install + pre-integration-test + + exec + + + composer + + install + + + + + bundle-test + integration-test + + exec + + + vendor/bin/phpunit + + tests + + + + + + + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/README.md b/samples/client/petstore/python/SwaggerPetstore-python/README.md index 9c590a9a508..f4e99c9fbc9 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/README.md +++ b/samples/client/petstore/python/SwaggerPetstore-python/README.md @@ -67,8 +67,8 @@ If you want to run the tests in all the python platforms: ```sh $ make test-all [... tox creates a virtualenv for every platform and runs tests inside of each] - py27: commands succeeded - py34: commands succeeded - congratulations :) +py27: commands succeeded +py34: commands succeeded +congratulations :) ``` diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py index b8cc4cc2a84..fc0e7c60549 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py @@ -22,282 +22,282 @@ from six import iteritems try: - # for python3 - from urllib.parse import quote +# for python3 +from urllib.parse import quote except ImportError: - # for python2 - from urllib import quote +# for python2 +from urllib import quote from . import configuration class ApiClient(object): - """ - Generic API client for Swagger client library builds - - :param host: The base path for the server to call - :param header_name: a header to pass when making calls to the API - :param header_value: a header value to pass when making calls to the API - """ - def __init__(self, host=configuration.host, header_name=None, header_value=None): - self.default_headers = {} - if header_name is not None: - self.default_headers[header_name] = header_value - self.host = host - self.cookie = None - # Set default User-Agent. - self.user_agent = 'Python-Swagger' - - @property - def user_agent(self): - return self.default_headers['User-Agent'] - - @user_agent.setter - def user_agent(self, value): - self.default_headers['User-Agent'] = value - - def set_default_header(self, header_name, header_value): - self.default_headers[header_name] = header_value - - def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None, - body=None, post_params=None, files=None, response=None, auth_settings=None): - - # headers parameters - header_params = header_params or {} - header_params.update(self.default_headers) - if self.cookie: - header_params['Cookie'] = self.cookie - if header_params: - header_params = self.sanitize_for_serialization(header_params) - - # path parameters - if path_params: - path_params = self.sanitize_for_serialization(path_params) - for k, v in iteritems(path_params): - replacement = quote(str(self.to_path_value(v))) - resource_path = resource_path.replace('{' + k + '}', replacement) - - # query parameters - if query_params: - query_params = self.sanitize_for_serialization(query_params) - query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)} - - # post parameters - if post_params: - post_params = self.prepare_post_parameters(post_params, files) - post_params = self.sanitize_for_serialization(post_params) - - # auth setting - self.update_params_for_auth(header_params, query_params, auth_settings) - - # body - if body: - body = self.sanitize_for_serialization(body) - - # request url - url = self.host + resource_path - - # perform request and return response - response_data = self.request(method, url, query_params=query_params, headers=header_params, - post_params=post_params, body=body) - - # deserialize response data - if response: - return self.deserialize(response_data, response) - else: - return None - - def to_path_value(self, obj): - """ - Convert a string or object to a path-friendly value - - :param obj: object or string value - - :return string: quoted value - """ - if type(obj) == list: - return ','.join(obj) - else: - return str(obj) - - def sanitize_for_serialization(self, obj): - """ - Sanitize an object for Request. - - If obj is None, return None. - If obj is str, int, float, bool, return directly. - If obj is datetime.datetime, datetime.date convert to string in iso8601 format. - If obj is list, santize each element in the list. - If obj is dict, return the dict. - If obj is swagger model, return the properties dict. - """ - if isinstance(obj, type(None)): - return None - elif isinstance(obj, (str, int, float, bool, tuple)): - return obj - elif isinstance(obj, list): - return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj] - elif isinstance(obj, (datetime.datetime, datetime.date)): - return obj.isoformat() - else: - if isinstance(obj, dict): - obj_dict = obj - else: - # Convert model obj to dict except attributes `swagger_types`, `attribute_map` - # and attributes which value is not None. - # Convert attribute name to json key in model definition for request. - obj_dict = {obj.attribute_map[key]: val - for key, val in iteritems(obj.__dict__) - if key != 'swagger_types' and key != 'attribute_map' and val is not None} - return {key: self.sanitize_for_serialization(val) - for key, val in iteritems(obj_dict)} - - def deserialize(self, obj, obj_class): - """ - Derialize a JSON string into an object. - - :param obj: string or object to be deserialized - :param obj_class: class literal for deserialzied object, or string of class name - - :return object: deserialized object - """ - # Have to accept obj_class as string or actual type. Type could be a - # native Python type, or one of the model classes. - if type(obj_class) == str: - if 'list[' in obj_class: - match = re.match('list\[(.*)\]', obj_class) - sub_class = match.group(1) - return [self.deserialize(sub_obj, sub_class) for sub_obj in obj] - - if obj_class in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']: - obj_class = eval(obj_class) - else: # not a native type, must be model class - obj_class = eval('models.' + obj_class) - - if obj_class in [int, float, dict, list, str, bool]: - return obj_class(obj) - elif obj_class == datetime: - return self.__parse_string_to_datetime(obj) - - instance = obj_class() - - for attr, attr_type in iteritems(instance.swagger_types): - if obj is not None and instance.attribute_map[attr] in obj and type(obj) in [list, dict]: - value = obj[instance.attribute_map[attr]] - if attr_type in ['str', 'int', 'float', 'bool']: - attr_type = eval(attr_type) - try: - value = attr_type(value) - except UnicodeEncodeError: - value = unicode(value) - except TypeError: - value = value - setattr(instance, attr, value) - elif attr_type == 'datetime': - setattr(instance, attr, self.__parse_string_to_datetime(value)) - elif 'list[' in attr_type: - match = re.match('list\[(.*)\]', attr_type) - sub_class = match.group(1) - sub_values = [] - if not value: - setattr(instance, attr, None) - else: - for sub_value in value: - sub_values.append(self.deserialize(sub_value, sub_class)) - setattr(instance, attr, sub_values) - else: - setattr(instance, attr, self.deserialize(value, attr_type)) - - return instance - - def __parse_string_to_datetime(self, string): - """ - Parse datetime in string to datetime. - - The string should be in iso8601 datetime format. - """ - try: - from dateutil.parser import parse - return parse(string) - except ImportError: - return string - - def request(self, method, url, query_params=None, headers=None, post_params=None, body=None): - """ - Perform http request using RESTClient. - """ - if method == "GET": - return RESTClient.GET(url, query_params=query_params, headers=headers) - elif method == "HEAD": - return RESTClient.HEAD(url, query_params=query_params, headers=headers) - elif method == "POST": - return RESTClient.POST(url, headers=headers, post_params=post_params, body=body) - elif method == "PUT": - return RESTClient.PUT(url, headers=headers, post_params=post_params, body=body) - elif method == "PATCH": - return RESTClient.PATCH(url, headers=headers, post_params=post_params, body=body) - elif method == "DELETE": - return RESTClient.DELETE(url, query_params=query_params, headers=headers) - else: - raise ValueError("http method must be `GET`, `HEAD`, `POST`, `PATCH`, `PUT` or `DELETE`") - - def prepare_post_parameters(self, post_params=None, files=None): - params = {} - - if post_params: - params.update(post_params) - - if files: - for k, v in iteritems(files): - if v: - with open(v, 'rb') as f: - filename = os.path.basename(f.name) - filedata = f.read() - mimetype = mimetypes.guess_type(filename)[0] or 'application/octet-stream' - params[k] = tuple([filename, filedata, mimetype]) - - return params - - def select_header_accept(self, accepts): - """ - Return `Accept` based on an array of accepts provided - """ - if not accepts: - return - - accepts = list(map(lambda x: x.lower(), accepts)) - - if 'application/json' in accepts: - return 'application/json' - else: - return ', '.join(accepts) - - def select_header_content_type(self, content_types): - """ - Return `Content-Type` baseed on an array of content_types provided - """ - if not content_types: - return 'application/json' - - content_types = list(map(lambda x: x.lower(), content_types)) - - if 'application/json' in content_types: - return 'application/json' - else: - return content_types[0] - - def update_params_for_auth(self, headers, querys, auth_settings): - """ - Update header and query params based on authentication setting - """ - if not auth_settings: - return - - for auth in auth_settings: - auth_setting = configuration.auth_settings().get(auth) - if auth_setting: - if auth_setting['in'] == 'header': - headers[auth_setting['key']] = auth_setting['value'] - elif auth_setting['in'] == 'query': - querys[auth_setting['key']] = auth_setting['value'] - else: - raise ValueError('Authentication token must be in `query` or `header`') +""" +Generic API client for Swagger client library builds + +:param host: The base path for the server to call +:param header_name: a header to pass when making calls to the API +:param header_value: a header value to pass when making calls to the API +""" +def __init__(self, host=configuration.host, header_name=None, header_value=None): +self.default_headers = {} +if header_name is not None: +self.default_headers[header_name] = header_value +self.host = host +self.cookie = None +# Set default User-Agent. +self.user_agent = 'Python-Swagger' + +@property +def user_agent(self): +return self.default_headers['User-Agent'] + +@user_agent.setter +def user_agent(self, value): +self.default_headers['User-Agent'] = value + +def set_default_header(self, header_name, header_value): +self.default_headers[header_name] = header_value + +def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None, +body=None, post_params=None, files=None, response=None, auth_settings=None): + +# headers parameters +header_params = header_params or {} +header_params.update(self.default_headers) +if self.cookie: +header_params['Cookie'] = self.cookie +if header_params: +header_params = self.sanitize_for_serialization(header_params) + +# path parameters +if path_params: +path_params = self.sanitize_for_serialization(path_params) +for k, v in iteritems(path_params): +replacement = quote(str(self.to_path_value(v))) +resource_path = resource_path.replace('{' + k + '}', replacement) + +# query parameters +if query_params: +query_params = self.sanitize_for_serialization(query_params) +query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)} + +# post parameters +if post_params: +post_params = self.prepare_post_parameters(post_params, files) +post_params = self.sanitize_for_serialization(post_params) + +# auth setting +self.update_params_for_auth(header_params, query_params, auth_settings) + +# body +if body: +body = self.sanitize_for_serialization(body) + +# request url +url = self.host + resource_path + +# perform request and return response +response_data = self.request(method, url, query_params=query_params, headers=header_params, +post_params=post_params, body=body) + +# deserialize response data +if response: +return self.deserialize(response_data, response) +else: +return None + +def to_path_value(self, obj): +""" +Convert a string or object to a path-friendly value + +:param obj: object or string value + +:return string: quoted value +""" +if type(obj) == list: +return ','.join(obj) +else: +return str(obj) + +def sanitize_for_serialization(self, obj): +""" +Sanitize an object for Request. + +If obj is None, return None. +If obj is str, int, float, bool, return directly. +If obj is datetime.datetime, datetime.date convert to string in iso8601 format. +If obj is list, santize each element in the list. +If obj is dict, return the dict. +If obj is swagger model, return the properties dict. +""" +if isinstance(obj, type(None)): +return None +elif isinstance(obj, (str, int, float, bool, tuple)): +return obj +elif isinstance(obj, list): +return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj] +elif isinstance(obj, (datetime.datetime, datetime.date)): +return obj.isoformat() +else: +if isinstance(obj, dict): +obj_dict = obj +else: +# Convert model obj to dict except attributes `swagger_types`, `attribute_map` +# and attributes which value is not None. +# Convert attribute name to json key in model definition for request. +obj_dict = {obj.attribute_map[key]: val +for key, val in iteritems(obj.__dict__) +if key != 'swagger_types' and key != 'attribute_map' and val is not None} +return {key: self.sanitize_for_serialization(val) +for key, val in iteritems(obj_dict)} + +def deserialize(self, obj, obj_class): +""" +Derialize a JSON string into an object. + +:param obj: string or object to be deserialized +:param obj_class: class literal for deserialzied object, or string of class name + +:return object: deserialized object +""" +# Have to accept obj_class as string or actual type. Type could be a +# native Python type, or one of the model classes. +if type(obj_class) == str: +if 'list[' in obj_class: +match = re.match('list\[(.*)\]', obj_class) +sub_class = match.group(1) +return [self.deserialize(sub_obj, sub_class) for sub_obj in obj] + +if obj_class in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']: +obj_class = eval(obj_class) +else: # not a native type, must be model class +obj_class = eval('models.' + obj_class) + +if obj_class in [int, float, dict, list, str, bool]: +return obj_class(obj) +elif obj_class == datetime: +return self.__parse_string_to_datetime(obj) + +instance = obj_class() + +for attr, attr_type in iteritems(instance.swagger_types): +if obj is not None and instance.attribute_map[attr] in obj and type(obj) in [list, dict]: +value = obj[instance.attribute_map[attr]] +if attr_type in ['str', 'int', 'float', 'bool']: +attr_type = eval(attr_type) +try: +value = attr_type(value) +except UnicodeEncodeError: +value = unicode(value) +except TypeError: +value = value +setattr(instance, attr, value) +elif attr_type == 'datetime': +setattr(instance, attr, self.__parse_string_to_datetime(value)) +elif 'list[' in attr_type: +match = re.match('list\[(.*)\]', attr_type) +sub_class = match.group(1) +sub_values = [] +if not value: +setattr(instance, attr, None) +else: +for sub_value in value: +sub_values.append(self.deserialize(sub_value, sub_class)) +setattr(instance, attr, sub_values) +else: +setattr(instance, attr, self.deserialize(value, attr_type)) + +return instance + +def __parse_string_to_datetime(self, string): +""" +Parse datetime in string to datetime. + +The string should be in iso8601 datetime format. +""" +try: +from dateutil.parser import parse +return parse(string) +except ImportError: +return string + +def request(self, method, url, query_params=None, headers=None, post_params=None, body=None): +""" +Perform http request using RESTClient. +""" +if method == "GET": +return RESTClient.GET(url, query_params=query_params, headers=headers) +elif method == "HEAD": +return RESTClient.HEAD(url, query_params=query_params, headers=headers) +elif method == "POST": +return RESTClient.POST(url, headers=headers, post_params=post_params, body=body) +elif method == "PUT": +return RESTClient.PUT(url, headers=headers, post_params=post_params, body=body) +elif method == "PATCH": +return RESTClient.PATCH(url, headers=headers, post_params=post_params, body=body) +elif method == "DELETE": +return RESTClient.DELETE(url, query_params=query_params, headers=headers) +else: +raise ValueError("http method must be `GET`, `HEAD`, `POST`, `PATCH`, `PUT` or `DELETE`") + +def prepare_post_parameters(self, post_params=None, files=None): +params = {} + +if post_params: +params.update(post_params) + +if files: +for k, v in iteritems(files): +if v: +with open(v, 'rb') as f: +filename = os.path.basename(f.name) +filedata = f.read() +mimetype = mimetypes.guess_type(filename)[0] or 'application/octet-stream' +params[k] = tuple([filename, filedata, mimetype]) + +return params + +def select_header_accept(self, accepts): +""" +Return `Accept` based on an array of accepts provided +""" +if not accepts: +return + +accepts = list(map(lambda x: x.lower(), accepts)) + +if 'application/json' in accepts: +return 'application/json' +else: +return ', '.join(accepts) + +def select_header_content_type(self, content_types): +""" +Return `Content-Type` baseed on an array of content_types provided +""" +if not content_types: +return 'application/json' + +content_types = list(map(lambda x: x.lower(), content_types)) + +if 'application/json' in content_types: +return 'application/json' +else: +return content_types[0] + +def update_params_for_auth(self, headers, querys, auth_settings): +""" +Update header and query params based on authentication setting +""" +if not auth_settings: +return + +for auth in auth_settings: +auth_setting = configuration.auth_settings().get(auth) +if auth_setting: +if auth_setting['in'] == 'header': +headers[auth_setting['key']] = auth_setting['value'] +elif auth_setting['in'] == 'query': +querys[auth_setting['key']] = auth_setting['value'] +else: +raise ValueError('Authentication token must be in `query` or `header`') diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py index 549b7fe956f..cb262e45343 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py @@ -3,19 +3,19 @@ """ PetApi.py -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ @@ -30,18 +30,18 @@ from .. import configuration from ..api_client import ApiClient -class PetApi(object): + class PetApi(object): def __init__(self, api_client=None): - if api_client: - self.api_client = api_client - else: - if not configuration.api_client: - configuration.api_client = ApiClient('http://petstore.swagger.io/v2') - self.api_client = configuration.api_client - + if api_client: + self.api_client = api_client + else: + if not configuration.api_client: + configuration.api_client = ApiClient('http://petstore.swagger.io/v2') + self.api_client = configuration.api_client + - def update_pet(self, **kwargs): + def update_pet(self, **kwargs): """ Update an existing pet @@ -55,9 +55,9 @@ def update_pet(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method update_pet" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method update_pet" % key) + params[key] = val del params['kwargs'] resource_path = '/pet'.replace('{format}', 'json') @@ -74,13 +74,13 @@ def update_pet(self, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type(['application/json', 'application/xml']) @@ -89,10 +89,10 @@ def update_pet(self, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def add_pet(self, **kwargs): + def add_pet(self, **kwargs): """ Add a new pet to the store @@ -106,9 +106,9 @@ def add_pet(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method add_pet" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method add_pet" % key) + params[key] = val del params['kwargs'] resource_path = '/pet'.replace('{format}', 'json') @@ -125,13 +125,13 @@ def add_pet(self, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type(['application/json', 'application/xml']) @@ -140,10 +140,10 @@ def add_pet(self, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def find_pets_by_status(self, **kwargs): + def find_pets_by_status(self, **kwargs): """ Finds Pets by status Multiple status values can be provided with comma seperated strings @@ -157,9 +157,9 @@ def find_pets_by_status(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_status" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_status" % key) + params[key] = val del params['kwargs'] resource_path = '/pet/findByStatus'.replace('{format}', 'json') @@ -169,7 +169,7 @@ def find_pets_by_status(self, **kwargs): query_params = {} - if 'status' in params: + if 'status' in params: query_params['status'] = params['status'] header_params = {} @@ -182,7 +182,7 @@ def find_pets_by_status(self, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -191,12 +191,12 @@ def find_pets_by_status(self, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='list[Pet]', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='list[Pet]', auth_settings=auth_settings) - return response + return response - def find_pets_by_tags(self, **kwargs): + def find_pets_by_tags(self, **kwargs): """ Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. @@ -210,9 +210,9 @@ def find_pets_by_tags(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_tags" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_tags" % key) + params[key] = val del params['kwargs'] resource_path = '/pet/findByTags'.replace('{format}', 'json') @@ -222,7 +222,7 @@ def find_pets_by_tags(self, **kwargs): query_params = {} - if 'tags' in params: + if 'tags' in params: query_params['tags'] = params['tags'] header_params = {} @@ -235,7 +235,7 @@ def find_pets_by_tags(self, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -244,12 +244,12 @@ def find_pets_by_tags(self, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='list[Pet]', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='list[Pet]', auth_settings=auth_settings) - return response + return response - def get_pet_by_id(self, pet_id, **kwargs): + def get_pet_by_id(self, pet_id, **kwargs): """ Find pet by ID Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions @@ -259,17 +259,17 @@ def get_pet_by_id(self, pet_id, **kwargs): :return: Pet """ - # verify the required parameter 'pet_id' is set - if pet_id is None: + # verify the required parameter 'pet_id' is set + if pet_id is None: raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id`") all_params = ['pet_id'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method get_pet_by_id" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method get_pet_by_id" % key) + params[key] = val del params['kwargs'] resource_path = '/pet/{petId}'.replace('{format}', 'json') @@ -277,8 +277,8 @@ def get_pet_by_id(self, pet_id, **kwargs): path_params = {} - if 'pet_id' in params: - path_params['petId'] = params['pet_id'] + if 'pet_id' in params: + path_params['petId'] = params['pet_id'] query_params = {} @@ -292,7 +292,7 @@ def get_pet_by_id(self, pet_id, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -301,12 +301,12 @@ def get_pet_by_id(self, pet_id, **kwargs): auth_settings = ['api_key', 'petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='Pet', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='Pet', auth_settings=auth_settings) - return response + return response - def update_pet_with_form(self, pet_id, **kwargs): + def update_pet_with_form(self, pet_id, **kwargs): """ Updates a pet in the store with form data @@ -318,17 +318,17 @@ def update_pet_with_form(self, pet_id, **kwargs): :return: None """ - # verify the required parameter 'pet_id' is set - if pet_id is None: + # verify the required parameter 'pet_id' is set + if pet_id is None: raise ValueError("Missing the required parameter `pet_id` when calling `update_pet_with_form`") all_params = ['pet_id', 'name', 'status'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method update_pet_with_form" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method update_pet_with_form" % key) + params[key] = val del params['kwargs'] resource_path = '/pet/{petId}'.replace('{format}', 'json') @@ -336,8 +336,8 @@ def update_pet_with_form(self, pet_id, **kwargs): path_params = {} - if 'pet_id' in params: - path_params['petId'] = params['pet_id'] + if 'pet_id' in params: + path_params['petId'] = params['pet_id'] query_params = {} @@ -346,10 +346,10 @@ def update_pet_with_form(self, pet_id, **kwargs): form_params = {} files = {} - if 'name' in params: + if 'name' in params: form_params['name'] = params['name'] - if 'status' in params: + if 'status' in params: form_params['status'] = params['status'] body_params = None @@ -357,7 +357,7 @@ def update_pet_with_form(self, pet_id, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type(['application/x-www-form-urlencoded']) @@ -366,10 +366,10 @@ def update_pet_with_form(self, pet_id, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def delete_pet(self, pet_id, **kwargs): + def delete_pet(self, pet_id, **kwargs): """ Deletes a pet @@ -380,17 +380,17 @@ def delete_pet(self, pet_id, **kwargs): :return: None """ - # verify the required parameter 'pet_id' is set - if pet_id is None: + # verify the required parameter 'pet_id' is set + if pet_id is None: raise ValueError("Missing the required parameter `pet_id` when calling `delete_pet`") all_params = ['api_key', 'pet_id'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method delete_pet" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method delete_pet" % key) + params[key] = val del params['kwargs'] resource_path = '/pet/{petId}'.replace('{format}', 'json') @@ -398,14 +398,14 @@ def delete_pet(self, pet_id, **kwargs): path_params = {} - if 'pet_id' in params: - path_params['petId'] = params['pet_id'] + if 'pet_id' in params: + path_params['petId'] = params['pet_id'] query_params = {} header_params = {} - if 'api_key' in params: + if 'api_key' in params: header_params['api_key'] = params['api_key'] form_params = {} @@ -416,7 +416,7 @@ def delete_pet(self, pet_id, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -425,10 +425,10 @@ def delete_pet(self, pet_id, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def upload_file(self, pet_id, **kwargs): + def upload_file(self, pet_id, **kwargs): """ uploads an image @@ -440,17 +440,17 @@ def upload_file(self, pet_id, **kwargs): :return: None """ - # verify the required parameter 'pet_id' is set - if pet_id is None: + # verify the required parameter 'pet_id' is set + if pet_id is None: raise ValueError("Missing the required parameter `pet_id` when calling `upload_file`") all_params = ['pet_id', 'additional_metadata', 'file'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method upload_file" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method upload_file" % key) + params[key] = val del params['kwargs'] resource_path = '/pet/{petId}/uploadImage'.replace('{format}', 'json') @@ -458,8 +458,8 @@ def upload_file(self, pet_id, **kwargs): path_params = {} - if 'pet_id' in params: - path_params['petId'] = params['pet_id'] + if 'pet_id' in params: + path_params['petId'] = params['pet_id'] query_params = {} @@ -468,10 +468,10 @@ def upload_file(self, pet_id, **kwargs): form_params = {} files = {} - if 'additional_metadata' in params: + if 'additional_metadata' in params: form_params['additionalMetadata'] = params['additional_metadata'] - if 'file' in params: + if 'file' in params: files['file'] = params['file'] body_params = None @@ -479,7 +479,7 @@ def upload_file(self, pet_id, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type(['multipart/form-data']) @@ -488,8 +488,8 @@ def upload_file(self, pet_id, **kwargs): auth_settings = ['petstore_auth'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py index bd2fd9b8080..4483ea01bd5 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py @@ -3,19 +3,19 @@ """ StoreApi.py -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ @@ -30,18 +30,18 @@ from .. import configuration from ..api_client import ApiClient -class StoreApi(object): + class StoreApi(object): def __init__(self, api_client=None): - if api_client: - self.api_client = api_client - else: - if not configuration.api_client: - configuration.api_client = ApiClient('http://petstore.swagger.io/v2') - self.api_client = configuration.api_client - + if api_client: + self.api_client = api_client + else: + if not configuration.api_client: + configuration.api_client = ApiClient('http://petstore.swagger.io/v2') + self.api_client = configuration.api_client + - def get_inventory(self, **kwargs): + def get_inventory(self, **kwargs): """ Returns pet inventories by status Returns a map of status codes to quantities @@ -54,9 +54,9 @@ def get_inventory(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method get_inventory" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method get_inventory" % key) + params[key] = val del params['kwargs'] resource_path = '/store/inventory'.replace('{format}', 'json') @@ -76,7 +76,7 @@ def get_inventory(self, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -85,12 +85,12 @@ def get_inventory(self, **kwargs): auth_settings = ['api_key'] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='map(String, int)', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='map(String, int)', auth_settings=auth_settings) - return response + return response - def place_order(self, **kwargs): + def place_order(self, **kwargs): """ Place an order for a pet @@ -104,9 +104,9 @@ def place_order(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method place_order" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method place_order" % key) + params[key] = val del params['kwargs'] resource_path = '/store/order'.replace('{format}', 'json') @@ -123,13 +123,13 @@ def place_order(self, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -138,12 +138,12 @@ def place_order(self, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='Order', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='Order', auth_settings=auth_settings) - return response + return response - def get_order_by_id(self, order_id, **kwargs): + def get_order_by_id(self, order_id, **kwargs): """ Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions @@ -153,17 +153,17 @@ def get_order_by_id(self, order_id, **kwargs): :return: Order """ - # verify the required parameter 'order_id' is set - if order_id is None: + # verify the required parameter 'order_id' is set + if order_id is None: raise ValueError("Missing the required parameter `order_id` when calling `get_order_by_id`") all_params = ['order_id'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method get_order_by_id" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method get_order_by_id" % key) + params[key] = val del params['kwargs'] resource_path = '/store/order/{orderId}'.replace('{format}', 'json') @@ -171,8 +171,8 @@ def get_order_by_id(self, order_id, **kwargs): path_params = {} - if 'order_id' in params: - path_params['orderId'] = params['order_id'] + if 'order_id' in params: + path_params['orderId'] = params['order_id'] query_params = {} @@ -186,7 +186,7 @@ def get_order_by_id(self, order_id, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -195,12 +195,12 @@ def get_order_by_id(self, order_id, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='Order', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='Order', auth_settings=auth_settings) - return response + return response - def delete_order(self, order_id, **kwargs): + def delete_order(self, order_id, **kwargs): """ Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors @@ -210,17 +210,17 @@ def delete_order(self, order_id, **kwargs): :return: None """ - # verify the required parameter 'order_id' is set - if order_id is None: + # verify the required parameter 'order_id' is set + if order_id is None: raise ValueError("Missing the required parameter `order_id` when calling `delete_order`") all_params = ['order_id'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method delete_order" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method delete_order" % key) + params[key] = val del params['kwargs'] resource_path = '/store/order/{orderId}'.replace('{format}', 'json') @@ -228,8 +228,8 @@ def delete_order(self, order_id, **kwargs): path_params = {} - if 'order_id' in params: - path_params['orderId'] = params['order_id'] + if 'order_id' in params: + path_params['orderId'] = params['order_id'] query_params = {} @@ -243,7 +243,7 @@ def delete_order(self, order_id, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -252,8 +252,8 @@ def delete_order(self, order_id, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py index 5aca93818d0..893e5e3a5c7 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py @@ -3,19 +3,19 @@ """ UserApi.py -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ @@ -30,18 +30,18 @@ from .. import configuration from ..api_client import ApiClient -class UserApi(object): + class UserApi(object): def __init__(self, api_client=None): - if api_client: - self.api_client = api_client - else: - if not configuration.api_client: - configuration.api_client = ApiClient('http://petstore.swagger.io/v2') - self.api_client = configuration.api_client - + if api_client: + self.api_client = api_client + else: + if not configuration.api_client: + configuration.api_client = ApiClient('http://petstore.swagger.io/v2') + self.api_client = configuration.api_client + - def create_user(self, **kwargs): + def create_user(self, **kwargs): """ Create user This can only be done by the logged in user. @@ -55,9 +55,9 @@ def create_user(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method create_user" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method create_user" % key) + params[key] = val del params['kwargs'] resource_path = '/user'.replace('{format}', 'json') @@ -74,13 +74,13 @@ def create_user(self, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -89,10 +89,10 @@ def create_user(self, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def create_users_with_array_input(self, **kwargs): + def create_users_with_array_input(self, **kwargs): """ Creates list of users with given input array @@ -106,9 +106,9 @@ def create_users_with_array_input(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_array_input" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_array_input" % key) + params[key] = val del params['kwargs'] resource_path = '/user/createWithArray'.replace('{format}', 'json') @@ -125,13 +125,13 @@ def create_users_with_array_input(self, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -140,10 +140,10 @@ def create_users_with_array_input(self, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def create_users_with_list_input(self, **kwargs): + def create_users_with_list_input(self, **kwargs): """ Creates list of users with given input array @@ -157,9 +157,9 @@ def create_users_with_list_input(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_list_input" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_list_input" % key) + params[key] = val del params['kwargs'] resource_path = '/user/createWithList'.replace('{format}', 'json') @@ -176,13 +176,13 @@ def create_users_with_list_input(self, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -191,10 +191,10 @@ def create_users_with_list_input(self, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def login_user(self, **kwargs): + def login_user(self, **kwargs): """ Logs user into the system @@ -209,9 +209,9 @@ def login_user(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method login_user" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method login_user" % key) + params[key] = val del params['kwargs'] resource_path = '/user/login'.replace('{format}', 'json') @@ -221,10 +221,10 @@ def login_user(self, **kwargs): query_params = {} - if 'username' in params: + if 'username' in params: query_params['username'] = params['username'] - if 'password' in params: + if 'password' in params: query_params['password'] = params['password'] header_params = {} @@ -237,7 +237,7 @@ def login_user(self, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -246,12 +246,12 @@ def login_user(self, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='str', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='str', auth_settings=auth_settings) - return response + return response - def logout_user(self, **kwargs): + def logout_user(self, **kwargs): """ Logs out current logged in user session @@ -264,9 +264,9 @@ def logout_user(self, **kwargs): params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method logout_user" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method logout_user" % key) + params[key] = val del params['kwargs'] resource_path = '/user/logout'.replace('{format}', 'json') @@ -286,7 +286,7 @@ def logout_user(self, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -295,10 +295,10 @@ def logout_user(self, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def get_user_by_name(self, username, **kwargs): + def get_user_by_name(self, username, **kwargs): """ Get user by user name @@ -308,17 +308,17 @@ def get_user_by_name(self, username, **kwargs): :return: User """ - # verify the required parameter 'username' is set - if username is None: + # verify the required parameter 'username' is set + if username is None: raise ValueError("Missing the required parameter `username` when calling `get_user_by_name`") all_params = ['username'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method get_user_by_name" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method get_user_by_name" % key) + params[key] = val del params['kwargs'] resource_path = '/user/{username}'.replace('{format}', 'json') @@ -326,8 +326,8 @@ def get_user_by_name(self, username, **kwargs): path_params = {} - if 'username' in params: - path_params['username'] = params['username'] + if 'username' in params: + path_params['username'] = params['username'] query_params = {} @@ -341,7 +341,7 @@ def get_user_by_name(self, username, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -350,12 +350,12 @@ def get_user_by_name(self, username, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response='User', auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response='User', auth_settings=auth_settings) - return response + return response - def update_user(self, username, **kwargs): + def update_user(self, username, **kwargs): """ Updated user This can only be done by the logged in user. @@ -366,17 +366,17 @@ def update_user(self, username, **kwargs): :return: None """ - # verify the required parameter 'username' is set - if username is None: + # verify the required parameter 'username' is set + if username is None: raise ValueError("Missing the required parameter `username` when calling `update_user`") all_params = ['username', 'body'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method update_user" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method update_user" % key) + params[key] = val del params['kwargs'] resource_path = '/user/{username}'.replace('{format}', 'json') @@ -384,8 +384,8 @@ def update_user(self, username, **kwargs): path_params = {} - if 'username' in params: - path_params['username'] = params['username'] + if 'username' in params: + path_params['username'] = params['username'] query_params = {} @@ -396,13 +396,13 @@ def update_user(self, username, **kwargs): body_params = None - if 'body' in params: + if 'body' in params: body_params = params['body'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -411,10 +411,10 @@ def update_user(self, username, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) - def delete_user(self, username, **kwargs): + def delete_user(self, username, **kwargs): """ Delete user This can only be done by the logged in user. @@ -424,17 +424,17 @@ def delete_user(self, username, **kwargs): :return: None """ - # verify the required parameter 'username' is set - if username is None: + # verify the required parameter 'username' is set + if username is None: raise ValueError("Missing the required parameter `username` when calling `delete_user`") all_params = ['username'] params = locals() for key, val in iteritems(params['kwargs']): - if key not in all_params: - raise TypeError("Got an unexpected keyword argument '%s' to method delete_user" % key) - params[key] = val + if key not in all_params: + raise TypeError("Got an unexpected keyword argument '%s' to method delete_user" % key) + params[key] = val del params['kwargs'] resource_path = '/user/{username}'.replace('{format}', 'json') @@ -442,8 +442,8 @@ def delete_user(self, username, **kwargs): path_params = {} - if 'username' in params: - path_params['username'] = params['username'] + if 'username' in params: + path_params['username'] = params['username'] query_params = {} @@ -457,7 +457,7 @@ def delete_user(self, username, **kwargs): # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept(['application/json', 'application/xml']) if not header_params['Accept']: - del header_params['Accept'] + del header_params['Accept'] # HTTP header `Content-Type` header_params['Content-Type'] = self.api_client.select_header_content_type([]) @@ -466,8 +466,8 @@ def delete_user(self, username, **kwargs): auth_settings = [] response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params, - body=body_params, post_params=form_params, files=files, - response=None, auth_settings=auth_settings) + body=body_params, post_params=form_params, files=files, + response=None, auth_settings=auth_settings) diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py index b5bd0a64e0a..c7b3d5af141 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py @@ -3,37 +3,37 @@ import urllib3 def get_api_key_with_prefix(key): - global api_key - global api_key_prefix +global api_key +global api_key_prefix - if api_key.get(key) and api_key_prefix.get(key): - return api_key_prefix[key] + ' ' + api_key[key] - elif api_key.get(key): - return api_key[key] +if api_key.get(key) and api_key_prefix.get(key): +return api_key_prefix[key] + ' ' + api_key[key] +elif api_key.get(key): +return api_key[key] def get_basic_auth_token(): - global username - global password +global username +global password - return urllib3.util.make_headers(basic_auth=username + ':' + password).get('authorization') +return urllib3.util.make_headers(basic_auth=username + ':' + password).get('authorization') def auth_settings(): - return { - 'api_key': { - 'type': 'api_key', - 'in': 'header', - 'key': 'api_key', - 'value': get_api_key_with_prefix('api_key') - }, - - } +return { + 'api_key': { + 'type': 'api_key', + 'in': 'header', + 'key': 'api_key', + 'value': get_api_key_with_prefix('api_key') + }, + +} # Default Base url host = "http://petstore.swagger.io/v2" # Default api client api_client = None - + # Authentication settings api_key = {} diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py index 8fba78ca18e..ada2f33efd3 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py @@ -2,28 +2,29 @@ # coding: utf-8 """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ + -class Category(object): - """ - NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually. - """ + class Category(object): + """ + NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually. + """ - def __init__(self): + def __init__(self): """ Swagger model @@ -31,28 +32,29 @@ def __init__(self): :param dict attributeMap: The key is attribute name and the value is json key in definition. """ self.swagger_types = { - 'id': 'int', - 'name': 'str' + 'id': 'int', + 'name': 'str' } self.attribute_map = { - 'id': 'id', - 'name': 'name' + 'id': 'id', + 'name': 'name' } + + self.id = None # int - self.id = None # int - - - self.name = None # str + + self.name = None # str - def __repr__(self): + def __repr__(self): properties = [] for p in self.__dict__: - if p != 'swaggerTypes' and p != 'attributeMap': - properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) + if p != 'swaggerTypes' and p != 'attributeMap': + properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) return '<{name} {props}>'.format(name=__name__, props=' '.join(properties)) + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py index 8a84ee81bea..02f3d75bb90 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py @@ -2,28 +2,29 @@ # coding: utf-8 """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ + -class Order(object): - """ - NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually. - """ + class Order(object): + """ + NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually. + """ - def __init__(self): + def __init__(self): """ Swagger model @@ -31,48 +32,49 @@ def __init__(self): :param dict attributeMap: The key is attribute name and the value is json key in definition. """ self.swagger_types = { - 'id': 'int', - 'pet_id': 'int', - 'quantity': 'int', - 'ship_date': 'DateTime', - 'status': 'str', - 'complete': 'bool' + 'id': 'int', + 'pet_id': 'int', + 'quantity': 'int', + 'ship_date': 'DateTime', + 'status': 'str', + 'complete': 'bool' } self.attribute_map = { - 'id': 'id', - 'pet_id': 'petId', - 'quantity': 'quantity', - 'ship_date': 'shipDate', - 'status': 'status', - 'complete': 'complete' + 'id': 'id', + 'pet_id': 'petId', + 'quantity': 'quantity', + 'ship_date': 'shipDate', + 'status': 'status', + 'complete': 'complete' } + + self.id = None # int - self.id = None # int - - - self.pet_id = None # int - - - self.quantity = None # int - + + self.pet_id = None # int - self.ship_date = None # DateTime + + self.quantity = None # int - # Order Status - self.status = None # str + + self.ship_date = None # DateTime + # Order Status + self.status = None # str - self.complete = None # bool + + self.complete = None # bool - def __repr__(self): + def __repr__(self): properties = [] for p in self.__dict__: - if p != 'swaggerTypes' and p != 'attributeMap': - properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) + if p != 'swaggerTypes' and p != 'attributeMap': + properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) return '<{name} {props}>'.format(name=__name__, props=' '.join(properties)) + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py index af667e42489..dedde9a455a 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py @@ -2,28 +2,29 @@ # coding: utf-8 """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ + -class Pet(object): - """ - NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually. - """ + class Pet(object): + """ + NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually. + """ - def __init__(self): + def __init__(self): """ Swagger model @@ -31,48 +32,49 @@ def __init__(self): :param dict attributeMap: The key is attribute name and the value is json key in definition. """ self.swagger_types = { - 'id': 'int', - 'category': 'Category', - 'name': 'str', - 'photo_urls': 'list[str]', - 'tags': 'list[Tag]', - 'status': 'str' + 'id': 'int', + 'category': 'Category', + 'name': 'str', + 'photo_urls': 'list[str]', + 'tags': 'list[Tag]', + 'status': 'str' } self.attribute_map = { - 'id': 'id', - 'category': 'category', - 'name': 'name', - 'photo_urls': 'photoUrls', - 'tags': 'tags', - 'status': 'status' + 'id': 'id', + 'category': 'category', + 'name': 'name', + 'photo_urls': 'photoUrls', + 'tags': 'tags', + 'status': 'status' } + + self.id = None # int - self.id = None # int - - - self.category = None # Category - - - self.name = None # str - + + self.category = None # Category - self.photo_urls = None # list[str] + + self.name = None # str + + self.photo_urls = None # list[str] - self.tags = None # list[Tag] + + self.tags = None # list[Tag] - # pet status in the store - self.status = None # str + # pet status in the store + self.status = None # str - def __repr__(self): + def __repr__(self): properties = [] for p in self.__dict__: - if p != 'swaggerTypes' and p != 'attributeMap': - properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) + if p != 'swaggerTypes' and p != 'attributeMap': + properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) return '<{name} {props}>'.format(name=__name__, props=' '.join(properties)) + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py index 08918be37fb..fdf647a6e26 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py @@ -2,28 +2,29 @@ # coding: utf-8 """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ + -class Tag(object): - """ - NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually. - """ + class Tag(object): + """ + NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually. + """ - def __init__(self): + def __init__(self): """ Swagger model @@ -31,28 +32,29 @@ def __init__(self): :param dict attributeMap: The key is attribute name and the value is json key in definition. """ self.swagger_types = { - 'id': 'int', - 'name': 'str' + 'id': 'int', + 'name': 'str' } self.attribute_map = { - 'id': 'id', - 'name': 'name' + 'id': 'id', + 'name': 'name' } + + self.id = None # int - self.id = None # int - - - self.name = None # str + + self.name = None # str - def __repr__(self): + def __repr__(self): properties = [] for p in self.__dict__: - if p != 'swaggerTypes' and p != 'attributeMap': - properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) + if p != 'swaggerTypes' and p != 'attributeMap': + properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) return '<{name} {props}>'.format(name=__name__, props=' '.join(properties)) + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py index b218c720fae..b6c2eb930d2 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py @@ -2,28 +2,29 @@ # coding: utf-8 """ -Copyright 2015 Reverb Technologies, Inc. +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 +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 +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. +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. """ + -class User(object): - """ - NOTE: This class is auto generated by the swagger code generator program. - Do not edit the class manually. - """ + class User(object): + """ + NOTE: This class is auto generated by the swagger code generator program. + Do not edit the class manually. + """ - def __init__(self): + def __init__(self): """ Swagger model @@ -31,58 +32,59 @@ def __init__(self): :param dict attributeMap: The key is attribute name and the value is json key in definition. """ self.swagger_types = { - 'id': 'int', - 'username': 'str', - 'first_name': 'str', - 'last_name': 'str', - 'email': 'str', - 'password': 'str', - 'phone': 'str', - 'user_status': 'int' + 'id': 'int', + 'username': 'str', + 'first_name': 'str', + 'last_name': 'str', + 'email': 'str', + 'password': 'str', + 'phone': 'str', + 'user_status': 'int' } self.attribute_map = { - 'id': 'id', - 'username': 'username', - 'first_name': 'firstName', - 'last_name': 'lastName', - 'email': 'email', - 'password': 'password', - 'phone': 'phone', - 'user_status': 'userStatus' + 'id': 'id', + 'username': 'username', + 'first_name': 'firstName', + 'last_name': 'lastName', + 'email': 'email', + 'password': 'password', + 'phone': 'phone', + 'user_status': 'userStatus' } + + self.id = None # int - self.id = None # int - - - self.username = None # str - - - self.first_name = None # str - - - self.last_name = None # str - + + self.username = None # str - self.email = None # str + + self.first_name = None # str + + self.last_name = None # str - self.password = None # str + + self.email = None # str + + self.password = None # str - self.phone = None # str + + self.phone = None # str - # User Status - self.user_status = None # int + # User Status + self.user_status = None # int - def __repr__(self): + def __repr__(self): properties = [] for p in self.__dict__: - if p != 'swaggerTypes' and p != 'attributeMap': - properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) + if p != 'swaggerTypes' and p != 'attributeMap': + properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p])) return '<{name} {props}>'.format(name=__name__, props=' '.join(properties)) + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py index 508f3d6693a..d5c79d8395a 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py @@ -15,239 +15,239 @@ from six import iteritems try: - import urllib3 +import urllib3 except ImportError: - raise ImportError('Swagger python client requires urllib3.') +raise ImportError('Swagger python client requires urllib3.') try: - # for python3 - from urllib.parse import urlencode +# for python3 +from urllib.parse import urlencode except ImportError: - # for python2 - from urllib import urlencode +# for python2 +from urllib import urlencode class RESTResponse(io.IOBase): - def __init__(self, resp): - self.urllib3_response = resp - self.status = resp.status - self.reason = resp.reason - self.data = resp.data +def __init__(self, resp): +self.urllib3_response = resp +self.status = resp.status +self.reason = resp.reason +self.data = resp.data - def getheaders(self): - """ - Returns a dictionary of the response headers. - """ - return self.urllib3_response.getheaders() +def getheaders(self): +""" +Returns a dictionary of the response headers. +""" +return self.urllib3_response.getheaders() - def getheader(self, name, default=None): - """ - Returns a given response header. - """ - return self.urllib3_response.getheader(name, default) +def getheader(self, name, default=None): +""" +Returns a given response header. +""" +return self.urllib3_response.getheader(name, default) class RESTClientObject(object): - def __init__(self, pools_size=4): - # http pool manager - self.pool_manager = urllib3.PoolManager( - num_pools=pools_size - ) - - # https pool manager - # certificates validated using Mozilla’s root certificates - self.ssl_pool_manager = urllib3.PoolManager( - num_pools=pools_size, - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=certifi.where() - ) - - def agent(self, url): - """ - Return proper pool manager for the http\https schemes. - """ - url = urllib3.util.url.parse_url(url) - scheme = url.scheme - if scheme == 'https': - return self.ssl_pool_manager - else: - return self.pool_manager - - def request(self, method, url, query_params=None, headers=None, - body=None, post_params=None): - """ - :param method: http request method - :param url: http request url - :param query_params: query parameters in the url - :param headers: http request headers - :param body: request json body, for `application/json` - :param post_params: request post parameters, `application/x-www-form-urlencode` - and `multipart/form-data` - """ - method = method.upper() - assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH'] - - if post_params and body: - raise ValueError("body parameter cannot be used with post_params parameter.") - - post_params = post_params or {} - headers = headers or {} - - if 'Content-Type' not in headers: - headers['Content-Type'] = 'application/json' - - # For `POST`, `PUT`, `PATCH` - if method in ['POST', 'PUT', 'PATCH']: - if query_params: - url += '?' + urlencode(query_params) - if headers['Content-Type'] == 'application/json': - r = self.agent(url).request(method, url, - body=json.dumps(body), - headers=headers) - if headers['Content-Type'] == 'application/x-www-form-urlencoded': - r = self.agent(url).request(method, url, - fields=post_params, - encode_multipart=False, - headers=headers) - if headers['Content-Type'] == 'multipart/form-data': - # must del headers['Content-Type'], or the correct Content-Type - # which generated by urllib3 will be overwritten. - del headers['Content-Type'] - r = self.agent(url).request(method, url, - fields=post_params, - encode_multipart=True, - headers=headers) - # For `GET`, `HEAD`, `DELETE` - else: - r = self.agent(url).request(method, url, - fields=query_params, - headers=headers) - r = RESTResponse(r) - - if r.status not in range(200, 206): - raise ApiException(r) - - return self.process_response(r) - - def process_response(self, response): - # In the python 3, the response.data is bytes. - # we need to decode it to string. - if sys.version_info > (3,): - data = response.data.decode('utf8') - else: - data = response.data - try: - resp = json.loads(data) - except ValueError: - resp = data - - return resp - - def GET(self, url, headers=None, query_params=None): - return self.request("GET", url, headers=headers, query_params=query_params) - - def HEAD(self, url, headers=None, query_params=None): - return self.request("HEAD", url, headers=headers, query_params=query_params) - - def DELETE(self, url, headers=None, query_params=None): - return self.request("DELETE", url, headers=headers, query_params=query_params) - - def POST(self, url, headers=None, post_params=None, body=None): - return self.request("POST", url, headers=headers, post_params=post_params, body=body) - - def PUT(self, url, headers=None, post_params=None, body=None): - return self.request("PUT", url, headers=headers, post_params=post_params, body=body) - - def PATCH(self, url, headers=None, post_params=None, body=None): - return self.request("PATCH", url, headers=headers, post_params=post_params, body=body) +def __init__(self, pools_size=4): +# http pool manager +self.pool_manager = urllib3.PoolManager( +num_pools=pools_size +) + +# https pool manager +# certificates validated using Mozilla’s root certificates +self.ssl_pool_manager = urllib3.PoolManager( +num_pools=pools_size, +cert_reqs=ssl.CERT_REQUIRED, +ca_certs=certifi.where() +) + +def agent(self, url): +""" +Return proper pool manager for the http\https schemes. +""" +url = urllib3.util.url.parse_url(url) +scheme = url.scheme +if scheme == 'https': +return self.ssl_pool_manager +else: +return self.pool_manager + +def request(self, method, url, query_params=None, headers=None, +body=None, post_params=None): +""" +:param method: http request method +:param url: http request url +:param query_params: query parameters in the url +:param headers: http request headers +:param body: request json body, for `application/json` +:param post_params: request post parameters, `application/x-www-form-urlencode` +and `multipart/form-data` +""" +method = method.upper() +assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH'] + +if post_params and body: +raise ValueError("body parameter cannot be used with post_params parameter.") + +post_params = post_params or {} +headers = headers or {} + +if 'Content-Type' not in headers: +headers['Content-Type'] = 'application/json' + +# For `POST`, `PUT`, `PATCH` +if method in ['POST', 'PUT', 'PATCH']: +if query_params: +url += '?' + urlencode(query_params) +if headers['Content-Type'] == 'application/json': +r = self.agent(url).request(method, url, +body=json.dumps(body), +headers=headers) +if headers['Content-Type'] == 'application/x-www-form-urlencoded': +r = self.agent(url).request(method, url, +fields=post_params, +encode_multipart=False, +headers=headers) +if headers['Content-Type'] == 'multipart/form-data': +# must del headers['Content-Type'], or the correct Content-Type +# which generated by urllib3 will be overwritten. +del headers['Content-Type'] +r = self.agent(url).request(method, url, +fields=post_params, +encode_multipart=True, +headers=headers) +# For `GET`, `HEAD`, `DELETE` +else: +r = self.agent(url).request(method, url, +fields=query_params, +headers=headers) +r = RESTResponse(r) + +if r.status not in range(200, 206): +raise ApiException(r) + +return self.process_response(r) + +def process_response(self, response): +# In the python 3, the response.data is bytes. +# we need to decode it to string. +if sys.version_info > (3,): +data = response.data.decode('utf8') +else: +data = response.data +try: +resp = json.loads(data) +except ValueError: +resp = data + +return resp + +def GET(self, url, headers=None, query_params=None): +return self.request("GET", url, headers=headers, query_params=query_params) + +def HEAD(self, url, headers=None, query_params=None): +return self.request("HEAD", url, headers=headers, query_params=query_params) + +def DELETE(self, url, headers=None, query_params=None): +return self.request("DELETE", url, headers=headers, query_params=query_params) + +def POST(self, url, headers=None, post_params=None, body=None): +return self.request("POST", url, headers=headers, post_params=post_params, body=body) + +def PUT(self, url, headers=None, post_params=None, body=None): +return self.request("PUT", url, headers=headers, post_params=post_params, body=body) + +def PATCH(self, url, headers=None, post_params=None, body=None): +return self.request("PATCH", url, headers=headers, post_params=post_params, body=body) class ApiException(Exception): - """ - Non-2xx HTTP response - """ - - def __init__(self, http_resp): - self.status = http_resp.status - self.reason = http_resp.reason - self.body = http_resp.data - self.headers = http_resp.getheaders() - - # In the python 3, the self.body is bytes. - # we need to decode it to string. - if sys.version_info > (3,): - data = self.body.decode('utf8') - else: - data = self.body - - try: - self.body = json.loads(data) - except ValueError: - self.body = data - - def __str__(self): - """ - Custom error response messages - """ - return "({0})\n"\ - "Reason: {1}\n"\ - "HTTP response headers: {2}\n"\ - "HTTP response body: {3}\n".\ - format(self.status, self.reason, self.headers, self.body) +""" +Non-2xx HTTP response +""" + +def __init__(self, http_resp): +self.status = http_resp.status +self.reason = http_resp.reason +self.body = http_resp.data +self.headers = http_resp.getheaders() + +# In the python 3, the self.body is bytes. +# we need to decode it to string. +if sys.version_info > (3,): +data = self.body.decode('utf8') +else: +data = self.body + +try: +self.body = json.loads(data) +except ValueError: +self.body = data + +def __str__(self): +""" +Custom error response messages +""" +return "({0})\n"\ +"Reason: {1}\n"\ +"HTTP response headers: {2}\n"\ +"HTTP response body: {3}\n".\ +format(self.status, self.reason, self.headers, self.body) class RESTClient(object): - """ - A class with all class methods to perform JSON requests. - """ - - IMPL = RESTClientObject() - - @classmethod - def request(cls, *n, **kw): - """ - Perform a REST request and parse the response. - """ - return cls.IMPL.request(*n, **kw) - - @classmethod - def GET(cls, *n, **kw): - """ - Perform a GET request using `RESTClient.request()`. - """ - return cls.IMPL.GET(*n, **kw) - - @classmethod - def HEAD(cls, *n, **kw): - """ - Perform a HEAD request using `RESTClient.request()`. - """ - return cls.IMPL.GET(*n, **kw) - - @classmethod - def POST(cls, *n, **kw): - """ - Perform a POST request using `RESTClient.request()` - """ - return cls.IMPL.POST(*n, **kw) - - @classmethod - def PUT(cls, *n, **kw): - """ - Perform a PUT request using `RESTClient.request()` - """ - return cls.IMPL.PUT(*n, **kw) - - @classmethod - def PATCH(cls, *n, **kw): - """ - Perform a PATCH request using `RESTClient.request()` - """ - return cls.IMPL.PATCH(*n, **kw) - - @classmethod - def DELETE(cls, *n, **kw): - """ - Perform a DELETE request using `RESTClient.request()` - """ - return cls.IMPL.DELETE(*n, **kw) +""" +A class with all class methods to perform JSON requests. +""" + +IMPL = RESTClientObject() + +@classmethod +def request(cls, *n, **kw): +""" +Perform a REST request and parse the response. +""" +return cls.IMPL.request(*n, **kw) + +@classmethod +def GET(cls, *n, **kw): +""" +Perform a GET request using `RESTClient.request()`. +""" +return cls.IMPL.GET(*n, **kw) + +@classmethod +def HEAD(cls, *n, **kw): +""" +Perform a HEAD request using `RESTClient.request()`. +""" +return cls.IMPL.GET(*n, **kw) + +@classmethod +def POST(cls, *n, **kw): +""" +Perform a POST request using `RESTClient.request()` +""" +return cls.IMPL.POST(*n, **kw) + +@classmethod +def PUT(cls, *n, **kw): +""" +Perform a PUT request using `RESTClient.request()` +""" +return cls.IMPL.PUT(*n, **kw) + +@classmethod +def PATCH(cls, *n, **kw): +""" +Perform a PATCH request using `RESTClient.request()` +""" +return cls.IMPL.PATCH(*n, **kw) + +@classmethod +def DELETE(cls, *n, **kw): +""" +Perform a DELETE request using `RESTClient.request()` +""" +return cls.IMPL.DELETE(*n, **kw) diff --git a/samples/client/petstore/python/SwaggerPetstore-python/pom.xml b/samples/client/petstore/python/SwaggerPetstore-python/pom.xml index e21eb2f5a96..9efbfb0a35d 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/pom.xml +++ b/samples/client/petstore/python/SwaggerPetstore-python/pom.xml @@ -1,48 +1,48 @@ - 4.0.0 - com.wordnik - PythonPetstoreClientTests - pom - 1.0-SNAPSHOT - Python Swagger Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - nose-test - integration-test - - exec - - - make - - test - - - - - - - + 4.0.0 + com.wordnik + PythonPetstoreClientTests + pom + 1.0-SNAPSHOT + Python Swagger Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + nose-test + integration-test + + exec + + + make + + test + + + + + + + diff --git a/samples/client/petstore/python/SwaggerPetstore-python/setup.py b/samples/client/petstore/python/SwaggerPetstore-python/setup.py index 50a6ffeb00c..4a1985d4715 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/setup.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/setup.py @@ -3,22 +3,22 @@ -# To install the library, open a Terminal shell, then run this -# file by typing: -# -# python setup.py install -# -# You need to have the setuptools module installed. -# Try reading the setuptools documentation: -# http://pypi.python.org/pypi/setuptools - -REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi"] - -setup( + # To install the library, open a Terminal shell, then run this + # file by typing: + # + # python setup.py install + # + # You need to have the setuptools module installed. + # Try reading the setuptools documentation: + # http://pypi.python.org/pypi/setuptools + + REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi"] + + setup( name="SwaggerPetstore", version="1.0.0", description="Swagger Petstore", - author_email="apiteam@wordnik.com", + author_email="apiteam@swagger.io", url="", keywords=["Swagger", "Swagger Petstore"], install_requires=REQUIRES, @@ -27,7 +27,7 @@ long_description="""\ 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 """ -) + ) diff --git a/samples/client/petstore/python3/Python3PetstoreCodegen.scala b/samples/client/petstore/python3/Python3PetstoreCodegen.scala index 5393d0944a5..270d19743a5 100644 --- a/samples/client/petstore/python3/Python3PetstoreCodegen.scala +++ b/samples/client/petstore/python3/Python3PetstoreCodegen.scala @@ -1,30 +1,28 @@ /** - * Copyright 2014 Wordnik, Inc. + * Copyright 2014 Wordnik, Inc. * - * 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 + * 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 + * 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. + * 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. */ -import com.wordnik.swagger.codegen.BasicPython3Generator - import java.io.File object Python3PetstoreCodegen extends BasicPython3Generator { def main(args: Array[String]) = generateClient(args) - override def destinationDir = "samples/client/petstore/python3" - override def supportingFiles = List( ("__init__.mustache", destinationDir, "__init__.py"), ("swagger.mustache", destinationDir + File.separator + apiPackage.getOrElse(""), "swagger.py"), ("__init__.mustache", destinationDir + File.separator + modelPackage.getOrElse(""), "__init__.py")) + + override def destinationDir = "samples/client/petstore/python3" } diff --git a/samples/client/petstore/python3/client/models/category.py b/samples/client/petstore/python3/client/models/category.py index a959d5c0af1..25b5e7cce95 100644 --- a/samples/client/petstore/python3/client/models/category.py +++ b/samples/client/petstore/python3/client/models/category.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/models/order.py b/samples/client/petstore/python3/client/models/order.py index 0e379ae5896..0988a354338 100644 --- a/samples/client/petstore/python3/client/models/order.py +++ b/samples/client/petstore/python3/client/models/order.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/models/pet.py b/samples/client/petstore/python3/client/models/pet.py index c65e8996f3e..e6b96c47558 100644 --- a/samples/client/petstore/python3/client/models/pet.py +++ b/samples/client/petstore/python3/client/models/pet.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/models/tag.py b/samples/client/petstore/python3/client/models/tag.py index e1c52840060..f9ed397123b 100644 --- a/samples/client/petstore/python3/client/models/tag.py +++ b/samples/client/petstore/python3/client/models/tag.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/models/user.py b/samples/client/petstore/python3/client/models/user.py index e0959ae9d41..0f88d5fc3d4 100644 --- a/samples/client/petstore/python3/client/models/user.py +++ b/samples/client/petstore/python3/client/models/user.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/pet_api.py b/samples/client/petstore/python3/client/pet_api.py index 2f35d07cf95..9293a89d2b0 100644 --- a/samples/client/petstore/python3/client/pet_api.py +++ b/samples/client/petstore/python3/client/pet_api.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """ PetApi.py -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/store_api.py b/samples/client/petstore/python3/client/store_api.py index 1f57de8ea07..8002b473f8a 100644 --- a/samples/client/petstore/python3/client/store_api.py +++ b/samples/client/petstore/python3/client/store_api.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """ StoreApi.py -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/python3/client/user_api.py b/samples/client/petstore/python3/client/user_api.py index 509cb927666..c4c3c2ede52 100644 --- a/samples/client/petstore/python3/client/user_api.py +++ b/samples/client/petstore/python3/client/user_api.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """ UserApi.py -Copyright 2015 Reverb Technologies, Inc. +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. diff --git a/samples/client/petstore/qt5cpp/client/SWGCategory.cpp b/samples/client/petstore/qt5cpp/client/SWGCategory.cpp index 9a5aaa14af7..5676a27b0dd 100644 --- a/samples/client/petstore/qt5cpp/client/SWGCategory.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGCategory.cpp @@ -1,105 +1,112 @@ -#include "SWGCategory.h" + #include "SWGCategory.h" -#include "SWGHelpers.h" + #include "SWGHelpers.h" -#include -#include -#include -#include + #include + + #include + + #include + + #include + -namespace Swagger { + namespace Swagger { -SWGCategory::SWGCategory(QString* json) { - init(); - this->fromJson(*json); -} + SWGCategory::SWGCategory(QString* json) { + init(); + this->fromJson(*json); + } -SWGCategory::SWGCategory() { - init(); -} + SWGCategory::SWGCategory() { + init(); + } -SWGCategory::~SWGCategory() { - this->cleanup(); -} + SWGCategory::~SWGCategory() { + this->cleanup(); + } -void -SWGCategory::init() { + void + SWGCategory::init() { id = 0L; name = new QString(""); -} + } -void -SWGCategory::cleanup() { + void + SWGCategory::cleanup() { if(name != NULL) { - delete name; - } + delete name; + } -} - -SWGCategory* -SWGCategory::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGCategory::fromJsonObject(QJsonObject &pJson) { + } + + SWGCategory* + SWGCategory::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; + } + + void + SWGCategory::fromJsonObject(QJsonObject &pJson) { setValue(&id, pJson["id"], "qint64", ""); setValue(&name, pJson["name"], "QString", "QString"); -} + } -QString -SWGCategory::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - return QString(bytes); -} - -QJsonObject* -SWGCategory::asJsonObject() { - QJsonObject* obj = new QJsonObject(); + QString + SWGCategory::asJson () + { + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + return QString(bytes); + } + + QJsonObject* + SWGCategory::asJsonObject() { + QJsonObject* obj = new QJsonObject(); obj->insert("id", QJsonValue(id)); - - toJsonValue(QString("name"), name, obj, QString("QString")); - - + + toJsonValue(QString("name"), name, obj, QString("QString")); + + - return obj; -} + return obj; + } -qint64 -SWGCategory::getId() { - return id; -} -void -SWGCategory::setId(qint64 id) { - this->id = id; -} + + qint64 + SWGCategory::getId() { + return id; + } + void + SWGCategory::setId(qint64 id) { + this->id = id; + } -QString* -SWGCategory::getName() { - return name; -} -void -SWGCategory::setName(QString* name) { - this->name = name; -} + + QString* + SWGCategory::getName() { + return name; + } + void + SWGCategory::setName(QString* name) { + this->name = name; + } + -} /* namespace Swagger */ + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGCategory.h b/samples/client/petstore/qt5cpp/client/SWGCategory.h index b1d5b65538f..2e7072f9111 100644 --- a/samples/client/petstore/qt5cpp/client/SWGCategory.h +++ b/samples/client/petstore/qt5cpp/client/SWGCategory.h @@ -1,47 +1,48 @@ /* - * SWGCategory.h - * - * - */ +* SWGCategory.h +* +* +*/ #ifndef SWGCategory_H_ #define SWGCategory_H_ -#include +#include + #include -#include "SWGObject.h" + #include "SWGObject.h" -namespace Swagger { + namespace Swagger { -class SWGCategory: public SWGObject { -public: + class SWGCategory: public SWGObject { + public: SWGCategory(); SWGCategory(QString* json); - virtual ~SWGCategory(); - void init(); - void cleanup(); + virtual ~SWGCategory(); + void init(); + void cleanup(); - QString asJson (); - QJsonObject* asJsonObject(); - void fromJsonObject(QJsonObject &json); + QString asJson (); + QJsonObject* asJsonObject(); + void fromJsonObject(QJsonObject &json); SWGCategory* fromJson(QString &jsonString); qint64 getId(); - void setId(qint64 id); + void setId(qint64 id); QString* getName(); - void setName(QString* name); + void setName(QString* name); -private: + private: qint64 id; QString* name; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SWGCategory_H_ */ + #endif /* SWGCategory_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGHelpers.cpp b/samples/client/petstore/qt5cpp/client/SWGHelpers.cpp index 7f4d748c2dc..0cc60d91b90 100644 --- a/samples/client/petstore/qt5cpp/client/SWGHelpers.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGHelpers.cpp @@ -1,166 +1,201 @@ #include "SWGHelpers.h" #include "SWGModelFactory.h" #include "SWGObject.h" -#import -#import -#import +#import + + #import + + #import + -namespace Swagger { + namespace Swagger { -void -setValue(void* value, QJsonValue obj, QString type, QString complexType) { - if(value == NULL) { - // can't set value with a null pointer - return; - } - if(QStringLiteral("bool").compare(type) == 0) { - bool * val = static_cast(value); - *val = obj.toBool(); - } - else if(QStringLiteral("qint32").compare(type) == 0) { - qint32 *val = static_cast(value); - *val = obj.toInt(); - } - else if(QStringLiteral("qint64").compare(type) == 0) { - qint64 *val = static_cast(value); - *val = obj.toVariant().toLongLong(); - } - else if (QStringLiteral("QString").compare(type) == 0) { - QString **val = static_cast(value); + void + setValue(void* value, QJsonValue obj, QString type, QString complexType) { + if(value == NULL) { + // can't set value with a null pointer + return; + } + if(QStringLiteral("bool").compare(type) == 0) { + bool * val = static_cast + (value); + *val = obj.toBool(); + } + else if(QStringLiteral("qint32").compare(type) == 0) { + qint32 *val = static_cast + (value); + *val = obj.toInt(); + } + else if(QStringLiteral("qint64").compare(type) == 0) { + qint64 *val = static_cast + (value); + *val = obj.toVariant().toLongLong(); + } + else if (QStringLiteral("QString").compare(type) == 0) { + QString **val = static_cast + (value); - if(val != NULL) { + if(val != NULL) { if(!obj.isNull()) { - // create a new value and return - delete *val; - *val = new QString(obj.toString()); - return; + // create a new value and return + delete *val; + *val = new QString(obj.toString()); + return; } else { - // set target to NULL - delete *val; - *val = NULL; + // set target to NULL + delete *val; + *val = NULL; + } } - } - else { + else { qDebug() << "Can't set value because the target pointer is NULL"; - } - } - else if(type.startsWith("SWG") && obj.isObject()) { - // complex type - QJsonObject jsonObj = obj.toObject(); - SWGObject * so = (SWGObject*)Swagger::create(type); - if(so != NULL) { + } + } + else if(type.startsWith("SWG") && obj.isObject()) { + // complex type + QJsonObject jsonObj = obj.toObject(); + SWGObject * so = (SWGObject*)Swagger::create(type); + if(so != NULL) { so->fromJsonObject(jsonObj); - SWGObject **val = static_cast(value); + SWGObject **val = static_cast + (value); delete *val; *val = so; - } - } - else if(type.startsWith("QList") && QString("").compare(complexType) != 0 && obj.isArray()) { - // list of values - QList* output = new QList(); - QJsonArray arr = obj.toArray(); - foreach (const QJsonValue & jval, arr) { + } + } + else if(type.startsWith("QList") && QString("").compare(complexType) != 0 && obj.isArray()) { + // list of values + QList + * output = new QList + (); + QJsonArray arr = obj.toArray(); + foreach (const QJsonValue & jval, arr) { if(complexType.startsWith("SWG")) { - // it's an object - SWGObject * val = (SWGObject*)create(complexType); - QJsonObject t = jval.toObject(); + // it's an object + SWGObject * val = (SWGObject*)create(complexType); + QJsonObject t = jval.toObject(); - val->fromJsonObject(t); - output->append(val); + val->fromJsonObject(t); + output->append(val); } else { - // primitives - if(QStringLiteral("qint32").compare(complexType) == 0) { - qint32 val; - setValue(&val, jval, QStringLiteral("qint32"), QStringLiteral("")); - output->append((void*)&val); - } - else if(QStringLiteral("qint64").compare(complexType) == 0) { - qint64 val; - setValue(&val, jval, QStringLiteral("qint64"), QStringLiteral("")); - output->append((void*)&val); - } - else if(QStringLiteral("bool").compare(complexType) == 0) { - bool val; - setValue(&val, jval, QStringLiteral("bool"), QStringLiteral("")); - output->append((void*)&val); - } - } - } - QList **val = static_cast**>(value); - delete *val; - *val = output; - } -} + // primitives + if(QStringLiteral("qint32").compare(complexType) == 0) { + qint32 val; + setValue(&val, jval, QStringLiteral("qint32"), QStringLiteral("")); + output->append((void*)&val); + } + else if(QStringLiteral("qint64").compare(complexType) == 0) { + qint64 val; + setValue(&val, jval, QStringLiteral("qint64"), QStringLiteral("")); + output->append((void*)&val); + } + else if(QStringLiteral("bool").compare(complexType) == 0) { + bool val; + setValue(&val, jval, QStringLiteral("bool"), QStringLiteral("")); + output->append((void*)&val); + } + } + } + QList + **val = static_cast + **>(value); + delete *val; + *val = output; + } + } -void -toJsonValue(QString name, void* value, QJsonObject* output, QString type) { - if(value == NULL) { - return; - } - if(type.startsWith("SWG")) { - SWGObject *swgObject = reinterpret_cast(value); - if(swgObject != NULL) { - QJsonObject* o = (*swgObject).asJsonObject(); - if(name != NULL) { + void + toJsonValue(QString name, void* value, QJsonObject* output, QString type) { + if(value == NULL) { + return; + } + if(type.startsWith("SWG")) { + SWGObject *swgObject = reinterpret_cast + (value); + if(swgObject != NULL) { + QJsonObject* o = (*swgObject).asJsonObject(); + if(name != NULL) { output->insert(name, *o); delete o; - } - else { + } + else { output->empty(); foreach(QString key, o->keys()) { - output->insert(key, o->value(key)); - } - } - } - } - else if(QStringLiteral("QString").compare(type) == 0) { - QString* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } - else if(QStringLiteral("qint32").compare(type) == 0) { - qint32* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } - else if(QStringLiteral("qint64").compare(type) == 0) { - qint64* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } - else if(QStringLiteral("bool").compare(type) == 0) { - bool* str = static_cast(value); - output->insert(name, QJsonValue(*str)); - } -} + output->insert(key, o->value(key)); + } + } + } + } + else if(QStringLiteral("QString").compare(type) == 0) { + QString* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + else if(QStringLiteral("qint32").compare(type) == 0) { + qint32* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + else if(QStringLiteral("qint64").compare(type) == 0) { + qint64* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + else if(QStringLiteral("bool").compare(type) == 0) { + bool* str = static_cast + (value); + output->insert(name, QJsonValue(*str)); + } + } -void -toJsonArray(QList* value, QJsonArray* output, QString innerName, QString innerType) { - foreach(void* obj, *value) { - QJsonObject element; + void + toJsonArray(QList + * value, QJsonArray* output, QString innerName, QString innerType) { + foreach(void* obj, *value) { + QJsonObject element; - toJsonValue(NULL, obj, &element, innerType); - output->append(element); - } -} + toJsonValue(NULL, obj, &element, innerType); + output->append(element); + } + } -QString -stringValue(QString* value) { - QString* str = static_cast(value); - return QString(*str); -} + QString + stringValue(QString* value) { + QString* str = static_cast + (value); + return QString(*str); + } -QString -stringValue(qint32 value) { - return QString::number(value); -} + QString + stringValue(qint32 value) { + return QString::number(value); + } -QString -stringValue(qint64 value) { - return QString::number(value); -} + QString + stringValue(qint64 value) { + return QString::number(value); + } -QString -stringValue(bool value) { - return QString(value ? "true" : "false"); -} -} /* namespace Swagger */ + QString + stringValue(bool value) { + return QString(value ? "true" : "false"); + } + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGHelpers.h b/samples/client/petstore/qt5cpp/client/SWGHelpers.h index 3a02c0952d5..52bba0455bc 100644 --- a/samples/client/petstore/qt5cpp/client/SWGHelpers.h +++ b/samples/client/petstore/qt5cpp/client/SWGHelpers.h @@ -1,17 +1,20 @@ #ifndef SWGHELPERS_H #define SWGHELPERS_H -#include +#include + -namespace Swagger { + namespace Swagger { void setValue(void* value, QJsonValue obj, QString type, QString complexType); - void toJsonArray(QList* value, QJsonArray* output, QString innerName, QString innerType); + void toJsonArray(QList + * value, QJsonArray* output, QString innerName, QString innerType); void toJsonValue(QString name, void* value, QJsonObject* output, QString type); bool isCompatibleJsonValue(QString type); QString stringValue(QString* value); QString stringValue(qint32 value); QString stringValue(qint64 value); QString stringValue(bool value); -} + } -#endif // SWGHELPERS_H + #endif // SWGHELPERS_H diff --git a/samples/client/petstore/qt5cpp/client/SWGModelFactory.h b/samples/client/petstore/qt5cpp/client/SWGModelFactory.h index 588a7ad952b..cdcfc123ee3 100644 --- a/samples/client/petstore/qt5cpp/client/SWGModelFactory.h +++ b/samples/client/petstore/qt5cpp/client/SWGModelFactory.h @@ -2,44 +2,45 @@ #define ModelFactory_H_ -#include "SWGUser.h" -#include "SWGCategory.h" -#include "SWGPet.h" -#include "SWGTag.h" -#include "SWGOrder.h" + #include "SWGUser.h" + #include "SWGCategory.h" + #include "SWGPet.h" + #include "SWGTag.h" + #include "SWGOrder.h" namespace Swagger { - inline void* create(QString type) { - if(QString("SWGUser").compare(type) == 0) { - return new SWGUser(); - } - if(QString("SWGCategory").compare(type) == 0) { - return new SWGCategory(); - } - if(QString("SWGPet").compare(type) == 0) { - return new SWGPet(); - } - if(QString("SWGTag").compare(type) == 0) { - return new SWGTag(); - } - if(QString("SWGOrder").compare(type) == 0) { - return new SWGOrder(); - } - - return NULL; - } +inline void* create(QString type) { +if(QString("SWGUser").compare(type) == 0) { +return new SWGUser(); +} +if(QString("SWGCategory").compare(type) == 0) { +return new SWGCategory(); +} +if(QString("SWGPet").compare(type) == 0) { +return new SWGPet(); +} +if(QString("SWGTag").compare(type) == 0) { +return new SWGTag(); +} +if(QString("SWGOrder").compare(type) == 0) { +return new SWGOrder(); +} - inline void* create(QString json, QString type) { - void* val = create(type); - if(val != NULL) { - SWGObject* obj = static_cast(val); - return obj->fromJson(json); - } - if(type.startsWith("QString")) { - return new QString(); - } - return NULL; - } +return NULL; +} + +inline void* create(QString json, QString type) { +void* val = create(type); +if(val != NULL) { +SWGObject* obj = static_cast +(val); +return obj->fromJson(json); +} +if(type.startsWith("QString")) { +return new QString(); +} +return NULL; +} } /* namespace Swagger */ #endif /* ModelFactory_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGObject.h b/samples/client/petstore/qt5cpp/client/SWGObject.h index 6cb5c042772..f9ccab6ac1d 100644 --- a/samples/client/petstore/qt5cpp/client/SWGObject.h +++ b/samples/client/petstore/qt5cpp/client/SWGObject.h @@ -1,24 +1,25 @@ #ifndef _SWG_OBJECT_H_ #define _SWG_OBJECT_H_ -#include +#include + -class SWGObject { - public: + class SWGObject { + public: virtual QJsonObject* asJsonObject() { - return NULL; + return NULL; } virtual ~SWGObject() {} virtual SWGObject* fromJson(QString &jsonString) { - Q_UNUSED(jsonString); - return NULL; + Q_UNUSED(jsonString); + return NULL; } virtual void fromJsonObject(QJsonObject &json) { - Q_UNUSED(json); + Q_UNUSED(json); } virtual QString asJson() { - return QString(""); + return QString(""); } -}; + }; -#endif /* _SWG_OBJECT_H_ */ + #endif /* _SWG_OBJECT_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGOrder.cpp b/samples/client/petstore/qt5cpp/client/SWGOrder.cpp index 3e34f2669c7..67cc01ad614 100644 --- a/samples/client/petstore/qt5cpp/client/SWGOrder.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGOrder.cpp @@ -1,31 +1,35 @@ -#include "SWGOrder.h" + #include "SWGOrder.h" -#include "SWGHelpers.h" + #include "SWGHelpers.h" -#include -#include -#include -#include + #include + + #include + + #include + + #include + -namespace Swagger { + namespace Swagger { -SWGOrder::SWGOrder(QString* json) { - init(); - this->fromJson(*json); -} + SWGOrder::SWGOrder(QString* json) { + init(); + this->fromJson(*json); + } -SWGOrder::SWGOrder() { - init(); -} + SWGOrder::SWGOrder() { + init(); + } -SWGOrder::~SWGOrder() { - this->cleanup(); -} + SWGOrder::~SWGOrder() { + this->cleanup(); + } -void -SWGOrder::init() { + void + SWGOrder::init() { id = 0L; petId = 0L; quantity = 0; @@ -33,34 +37,34 @@ SWGOrder::init() { status = new QString(""); complete = false; -} + } -void -SWGOrder::cleanup() { + void + SWGOrder::cleanup() { if(shipDate != NULL) { - delete shipDate; - } + delete shipDate; + } if(status != NULL) { - delete status; - } + delete status; + } -} + } -SWGOrder* -SWGOrder::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} + SWGOrder* + SWGOrder::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; + } -void -SWGOrder::fromJsonObject(QJsonObject &pJson) { + void + SWGOrder::fromJsonObject(QJsonObject &pJson) { setValue(&id, pJson["id"], "qint64", ""); setValue(&petId, pJson["petId"], "qint64", ""); setValue(&quantity, pJson["quantity"], "qint32", ""); @@ -68,97 +72,104 @@ SWGOrder::fromJsonObject(QJsonObject &pJson) { setValue(&status, pJson["status"], "QString", "QString"); setValue(&complete, pJson["complete"], "bool", ""); -} + } -QString -SWGOrder::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - return QString(bytes); -} + QString + SWGOrder::asJson () + { + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + return QString(bytes); + } -QJsonObject* -SWGOrder::asJsonObject() { - QJsonObject* obj = new QJsonObject(); + QJsonObject* + SWGOrder::asJsonObject() { + QJsonObject* obj = new QJsonObject(); obj->insert("id", QJsonValue(id)); obj->insert("petId", QJsonValue(petId)); obj->insert("quantity", QJsonValue(quantity)); + + toJsonValue(QString("shipDate"), shipDate, obj, QString("QDateTime")); + + - toJsonValue(QString("shipDate"), shipDate, obj, QString("QDateTime")); + + toJsonValue(QString("status"), status, obj, QString("QString")); + + + obj->insert("complete", QJsonValue(complete)); + + return obj; + } + + + qint64 + SWGOrder::getId() { + return id; + } + void + SWGOrder::setId(qint64 id) { + this->id = id; + } + + qint64 + SWGOrder::getPetId() { + return petId; + } + void + SWGOrder::setPetId(qint64 petId) { + this->petId = petId; + } + - toJsonValue(QString("status"), status, obj, QString("QString")); + qint32 + SWGOrder::getQuantity() { + return quantity; + } + void + SWGOrder::setQuantity(qint32 quantity) { + this->quantity = quantity; + } + + QDateTime* + SWGOrder::getShipDate() { + return shipDate; + } + void + SWGOrder::setShipDate(QDateTime* shipDate) { + this->shipDate = shipDate; + } + + QString* + SWGOrder::getStatus() { + return status; + } + void + SWGOrder::setStatus(QString* status) { + this->status = status; + } + - obj->insert("complete", QJsonValue(complete)); + bool + SWGOrder::getComplete() { + return complete; + } + void + SWGOrder::setComplete(bool complete) { + this->complete = complete; + } + - return obj; -} - -qint64 -SWGOrder::getId() { - return id; -} -void -SWGOrder::setId(qint64 id) { - this->id = id; -} - -qint64 -SWGOrder::getPetId() { - return petId; -} -void -SWGOrder::setPetId(qint64 petId) { - this->petId = petId; -} - -qint32 -SWGOrder::getQuantity() { - return quantity; -} -void -SWGOrder::setQuantity(qint32 quantity) { - this->quantity = quantity; -} - -QDateTime* -SWGOrder::getShipDate() { - return shipDate; -} -void -SWGOrder::setShipDate(QDateTime* shipDate) { - this->shipDate = shipDate; -} - -QString* -SWGOrder::getStatus() { - return status; -} -void -SWGOrder::setStatus(QString* status) { - this->status = status; -} - -bool -SWGOrder::getComplete() { - return complete; -} -void -SWGOrder::setComplete(bool complete) { - this->complete = complete; -} - - - -} /* namespace Swagger */ + + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGOrder.h b/samples/client/petstore/qt5cpp/client/SWGOrder.h index d17713afe78..1127afa9fce 100644 --- a/samples/client/petstore/qt5cpp/client/SWGOrder.h +++ b/samples/client/petstore/qt5cpp/client/SWGOrder.h @@ -1,51 +1,52 @@ /* - * SWGOrder.h - * - * - */ +* SWGOrder.h +* +* +*/ #ifndef SWGOrder_H_ #define SWGOrder_H_ -#include +#include + #include "QDateTime.h" #include -#include "SWGObject.h" + #include "SWGObject.h" -namespace Swagger { + namespace Swagger { -class SWGOrder: public SWGObject { -public: + class SWGOrder: public SWGObject { + public: SWGOrder(); SWGOrder(QString* json); - virtual ~SWGOrder(); - void init(); - void cleanup(); + virtual ~SWGOrder(); + void init(); + void cleanup(); - QString asJson (); - QJsonObject* asJsonObject(); - void fromJsonObject(QJsonObject &json); + QString asJson (); + QJsonObject* asJsonObject(); + void fromJsonObject(QJsonObject &json); SWGOrder* fromJson(QString &jsonString); qint64 getId(); - void setId(qint64 id); + void setId(qint64 id); qint64 getPetId(); - void setPetId(qint64 petId); + void setPetId(qint64 petId); qint32 getQuantity(); - void setQuantity(qint32 quantity); + void setQuantity(qint32 quantity); QDateTime* getShipDate(); - void setShipDate(QDateTime* shipDate); + void setShipDate(QDateTime* shipDate); QString* getStatus(); - void setStatus(QString* status); + void setStatus(QString* status); bool getComplete(); - void setComplete(bool complete); + void setComplete(bool complete); -private: + private: qint64 id; qint64 petId; qint32 quantity; @@ -53,8 +54,8 @@ class SWGOrder: public SWGObject { QString* status; bool complete; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SWGOrder_H_ */ + #endif /* SWGOrder_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGPet.cpp b/samples/client/petstore/qt5cpp/client/SWGPet.cpp index d0e5b8280e2..9ee24fb7d4f 100644 --- a/samples/client/petstore/qt5cpp/client/SWGPet.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGPet.cpp @@ -1,31 +1,35 @@ -#include "SWGPet.h" + #include "SWGPet.h" -#include "SWGHelpers.h" + #include "SWGHelpers.h" -#include -#include -#include -#include + #include + + #include + + #include + + #include + -namespace Swagger { + namespace Swagger { -SWGPet::SWGPet(QString* json) { - init(); - this->fromJson(*json); -} + SWGPet::SWGPet(QString* json) { + init(); + this->fromJson(*json); + } -SWGPet::SWGPet() { - init(); -} + SWGPet::SWGPet() { + init(); + } -SWGPet::~SWGPet() { - this->cleanup(); -} + SWGPet::~SWGPet() { + this->cleanup(); + } -void -SWGPet::init() { + void + SWGPet::init() { id = 0L; category = new SWGCategory(); name = new QString(""); @@ -33,48 +37,48 @@ SWGPet::init() { tags = new QList(); status = new QString(""); -} + } -void -SWGPet::cleanup() { + void + SWGPet::cleanup() { if(category != NULL) { - delete category; - } + delete category; + } if(name != NULL) { - delete name; - } + delete name; + } if(photoUrls != NULL) { - QList* arr = photoUrls; + QList* arr = photoUrls; foreach(QString* o, *arr) { - delete o; + delete o; + } + delete photoUrls; } - delete photoUrls; - } if(tags != NULL) { - QList* arr = tags; + QList* arr = tags; foreach(SWGTag* o, *arr) { - delete o; + delete o; + } + delete tags; } - delete tags; - } if(status != NULL) { - delete status; - } - -} - -SWGPet* -SWGPet::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGPet::fromJsonObject(QJsonObject &pJson) { + delete status; + } + + } + + SWGPet* + SWGPet::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; + } + + void + SWGPet::fromJsonObject(QJsonObject &pJson) { setValue(&id, pJson["id"], "qint64", ""); setValue(&category, pJson["category"], "SWGCategory", "SWGCategory"); setValue(&name, pJson["name"], "QString", "QString"); @@ -82,118 +86,127 @@ SWGPet::fromJsonObject(QJsonObject &pJson) { setValue(&tags, pJson["tags"], "QList", "SWGTag"); setValue(&status, pJson["status"], "QString", "QString"); -} + } -QString -SWGPet::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - return QString(bytes); -} + QString + SWGPet::asJson () + { + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + return QString(bytes); + } -QJsonObject* -SWGPet::asJsonObject() { - QJsonObject* obj = new QJsonObject(); + QJsonObject* + SWGPet::asJsonObject() { + QJsonObject* obj = new QJsonObject(); obj->insert("id", QJsonValue(id)); - - toJsonValue(QString("category"), category, obj, QString("SWGCategory")); - + + toJsonValue(QString("category"), category, obj, QString("SWGCategory")); + + + + toJsonValue(QString("name"), name, obj, QString("QString")); + + - toJsonValue(QString("name"), name, obj, QString("QString")); - - - - - - QList* photoUrlsList = photoUrls; - QJsonArray photoUrlsJsonArray; - toJsonArray((QList*)photoUrls, &photoUrlsJsonArray, "photoUrls", "QString"); + + QList* photoUrlsList = photoUrls; + QJsonArray photoUrlsJsonArray; + toJsonArray((QList + *)photoUrls, &photoUrlsJsonArray, "photoUrls", "QString"); - obj->insert("photoUrls", photoUrlsJsonArray); + obj->insert("photoUrls", photoUrlsJsonArray); + - - - QList* tagsList = tags; - QJsonArray tagsJsonArray; - toJsonArray((QList*)tags, &tagsJsonArray, "tags", "SWGTag"); + + QList* tagsList = tags; + QJsonArray tagsJsonArray; + toJsonArray((QList + *)tags, &tagsJsonArray, "tags", "SWGTag"); - obj->insert("tags", tagsJsonArray); - - - - - toJsonValue(QString("status"), status, obj, QString("QString")); + obj->insert("tags", tagsJsonArray); + + + toJsonValue(QString("status"), status, obj, QString("QString")); + + - return obj; -} + return obj; + } -qint64 -SWGPet::getId() { - return id; -} -void -SWGPet::setId(qint64 id) { - this->id = id; -} + + qint64 + SWGPet::getId() { + return id; + } + void + SWGPet::setId(qint64 id) { + this->id = id; + } -SWGCategory* -SWGPet::getCategory() { - return category; -} -void -SWGPet::setCategory(SWGCategory* category) { - this->category = category; -} + + SWGCategory* + SWGPet::getCategory() { + return category; + } + void + SWGPet::setCategory(SWGCategory* category) { + this->category = category; + } -QString* -SWGPet::getName() { - return name; -} -void -SWGPet::setName(QString* name) { - this->name = name; -} + + QString* + SWGPet::getName() { + return name; + } + void + SWGPet::setName(QString* name) { + this->name = name; + } -QList* -SWGPet::getPhotoUrls() { - return photoUrls; -} -void -SWGPet::setPhotoUrls(QList* photoUrls) { - this->photoUrls = photoUrls; -} + + QList* + SWGPet::getPhotoUrls() { + return photoUrls; + } + void + SWGPet::setPhotoUrls(QList* photoUrls) { + this->photoUrls = photoUrls; + } -QList* -SWGPet::getTags() { - return tags; -} -void -SWGPet::setTags(QList* tags) { - this->tags = tags; -} + + QList* + SWGPet::getTags() { + return tags; + } + void + SWGPet::setTags(QList* tags) { + this->tags = tags; + } -QString* -SWGPet::getStatus() { - return status; -} -void -SWGPet::setStatus(QString* status) { - this->status = status; -} + + QString* + SWGPet::getStatus() { + return status; + } + void + SWGPet::setStatus(QString* status) { + this->status = status; + } + -} /* namespace Swagger */ + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGPet.h b/samples/client/petstore/qt5cpp/client/SWGPet.h index e9cb4d08233..e0bd3f0f8df 100644 --- a/samples/client/petstore/qt5cpp/client/SWGPet.h +++ b/samples/client/petstore/qt5cpp/client/SWGPet.h @@ -1,13 +1,14 @@ /* - * SWGPet.h - * - * - */ +* SWGPet.h +* +* +*/ #ifndef SWGPet_H_ #define SWGPet_H_ -#include +#include + #include "SWGTag.h" @@ -15,39 +16,39 @@ #include "SWGCategory.h" #include -#include "SWGObject.h" + #include "SWGObject.h" -namespace Swagger { + namespace Swagger { -class SWGPet: public SWGObject { -public: + class SWGPet: public SWGObject { + public: SWGPet(); SWGPet(QString* json); - virtual ~SWGPet(); - void init(); - void cleanup(); + virtual ~SWGPet(); + void init(); + void cleanup(); - QString asJson (); - QJsonObject* asJsonObject(); - void fromJsonObject(QJsonObject &json); + QString asJson (); + QJsonObject* asJsonObject(); + void fromJsonObject(QJsonObject &json); SWGPet* fromJson(QString &jsonString); qint64 getId(); - void setId(qint64 id); + void setId(qint64 id); SWGCategory* getCategory(); - void setCategory(SWGCategory* category); + void setCategory(SWGCategory* category); QString* getName(); - void setName(QString* name); + void setName(QString* name); QList* getPhotoUrls(); - void setPhotoUrls(QList* photoUrls); + void setPhotoUrls(QList* photoUrls); QList* getTags(); - void setTags(QList* tags); + void setTags(QList* tags); QString* getStatus(); - void setStatus(QString* status); + void setStatus(QString* status); -private: + private: qint64 id; SWGCategory* category; QString* name; @@ -55,8 +56,8 @@ class SWGPet: public SWGObject { QList* tags; QString* status; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SWGPet_H_ */ + #endif /* SWGPet_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp index 0be3a197cd1..08a71c5df0c 100644 --- a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp @@ -2,530 +2,549 @@ #include "SWGHelpers.h" #include "SWGModelFactory.h" -#include -#include +#include + + #include + -namespace Swagger { -SWGPetApi::SWGPetApi() {} + namespace Swagger { + SWGPetApi::SWGPetApi() {} -SWGPetApi::~SWGPetApi() {} + SWGPetApi::~SWGPetApi() {} -SWGPetApi::SWGPetApi(QString host, QString basePath) { - this->host = host; - this->basePath = basePath; -} - -void -SWGPetApi::updatePet(SWGPet body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet"); - - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "PUT"); - - - - - - - QString output = body.asJson(); - input.request_body.append(output); - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::updatePetCallback); - - worker->execute(&input); -} - -void -SWGPetApi::updatePetCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit updatePetSignal(); -} -void -SWGPetApi::addPet(SWGPet body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet"); - - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); - - - - - - - QString output = body.asJson(); - input.request_body.append(output); - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::addPetCallback); - - worker->execute(&input); -} - -void -SWGPetApi::addPetCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit addPetSignal(); -} -void -SWGPetApi::findPetsByStatus(QList* status) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet/findByStatus"); - - - - - - - - - if(status->size() > 0) { - if(QString("multi").indexOf("multi") == 0) { - foreach(QString* t, *status) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("status=").append(stringValue(t)); - } - } - else if (QString("multi").indexOf("ssv") == 0) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("status="); - qint32 count = 0; - foreach(QString* t, *status) { - if(count > 0) { - fullPath.append(" "); - } - fullPath.append(stringValue(t)); - } - } - else if (QString("multi").indexOf("tsv") == 0) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("status="); - qint32 count = 0; - foreach(QString* t, *status) { - if(count > 0) { - fullPath.append("\t"); - } - fullPath.append(stringValue(t)); - } - } - } - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::findPetsByStatusCallback); - - worker->execute(&input); -} - -void -SWGPetApi::findPetsByStatusCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - QList* output = new QList(); - QString json(worker->response); - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonArray jsonArray = doc.array(); - - foreach(QJsonValue obj, jsonArray) { - SWGPet* o = new SWGPet(); - QJsonObject jv = obj.toObject(); - QJsonObject * ptr = (QJsonObject*)&jv; - o->fromJsonObject(*ptr); - output->append(o); - } - - - - - worker->deleteLater(); - - emit findPetsByStatusSignal(output); - -} -void -SWGPetApi::findPetsByTags(QList* tags) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet/findByTags"); - - - - - - - - - if(tags->size() > 0) { - if(QString("multi").indexOf("multi") == 0) { - foreach(QString* t, *tags) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("tags=").append(stringValue(t)); - } - } - else if (QString("multi").indexOf("ssv") == 0) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("tags="); - qint32 count = 0; - foreach(QString* t, *tags) { - if(count > 0) { - fullPath.append(" "); - } - fullPath.append(stringValue(t)); - } - } - else if (QString("multi").indexOf("tsv") == 0) { - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append("tags="); - qint32 count = 0; - foreach(QString* t, *tags) { - if(count > 0) { - fullPath.append("\t"); - } - fullPath.append(stringValue(t)); + SWGPetApi::SWGPetApi(QString host, QString basePath) { + this->host = host; + this->basePath = basePath; } - } - } - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::findPetsByTagsCallback); - - worker->execute(&input); -} - -void -SWGPetApi::findPetsByTagsCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - QList* output = new QList(); - QString json(worker->response); - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonArray jsonArray = doc.array(); - - foreach(QJsonValue obj, jsonArray) { - SWGPet* o = new SWGPet(); - QJsonObject jv = obj.toObject(); - QJsonObject * ptr = (QJsonObject*)&jv; - o->fromJsonObject(*ptr); - output->append(o); - } - - - - - worker->deleteLater(); - - emit findPetsByTagsSignal(output); - -} -void -SWGPetApi::getPetById(qint64 petId) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); - - - QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); - fullPath.replace(petIdPathParam, stringValue(petId)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::getPetByIdCallback); - - worker->execute(&input); -} - -void -SWGPetApi::getPetByIdCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - - - - QString json(worker->response); - SWGPet* output = static_cast(create(json, QString("SWGPet"))); - - - - - worker->deleteLater(); - - emit getPetByIdSignal(output); - -} -void -SWGPetApi::updatePetWithForm(QString* petId, QString* name, QString* status) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); - - - QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); - fullPath.replace(petIdPathParam, stringValue(petId)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); - - - if(name != NULL) { - input.add_var("name", *name); - } - - if(status != NULL) { - input.add_var("status", *status); - } - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::updatePetWithFormCallback); - - worker->execute(&input); -} - -void -SWGPetApi::updatePetWithFormCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit updatePetWithFormSignal(); -} -void -SWGPetApi::deletePet(QString* apiKey, qint64 petId) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); - - - QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); - fullPath.replace(petIdPathParam, stringValue(petId)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "DELETE"); - - - - - - - // TODO: add header support - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::deletePetCallback); - - worker->execute(&input); -} - -void -SWGPetApi::deletePetCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit deletePetSignal(); -} -void -SWGPetApi::uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage"); - - - QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); - fullPath.replace(petIdPathParam, stringValue(petId)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); - - - if(additionalMetadata != NULL) { - input.add_var("additionalMetadata", *additionalMetadata); - } - - + + + void + SWGPetApi::updatePet(SWGPet body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet"); - + - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGPetApi::uploadFileCallback); - - worker->execute(&input); -} - -void -SWGPetApi::uploadFileCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } + - + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "PUT"); - worker->deleteLater(); + - - emit uploadFileSignal(); -} -} /* namespace Swagger */ + + + + QString output = body.asJson(); + input.request_body.append(output); + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::updatePetCallback); + + worker->execute(&input); + } + + void + SWGPetApi::updatePetCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit updatePetSignal(); + } + + void + SWGPetApi::addPet(SWGPet body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet"); + + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); + + + + + + + QString output = body.asJson(); + input.request_body.append(output); + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::addPetCallback); + + worker->execute(&input); + } + + void + SWGPetApi::addPetCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit addPetSignal(); + } + + void + SWGPetApi::findPetsByStatus(QList* status) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet/findByStatus"); + + + + + + + + + if(status->size() > 0) { + if(QString("multi").indexOf("multi") == 0) { + foreach(QString* t, *status) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("status=").append(stringValue(t)); + } + } + else if (QString("multi").indexOf("ssv") == 0) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("status="); + qint32 count = 0; + foreach(QString* t, *status) { + if(count > 0) { + fullPath.append(" "); + } + fullPath.append(stringValue(t)); + } + } + else if (QString("multi").indexOf("tsv") == 0) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("status="); + qint32 count = 0; + foreach(QString* t, *status) { + if(count > 0) { + fullPath.append("\t"); + } + fullPath.append(stringValue(t)); + } + } + } + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::findPetsByStatusCallback); + + worker->execute(&input); + } + + void + SWGPetApi::findPetsByStatusCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + QList* output = new QList(); + QString json(worker->response); + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonArray jsonArray = doc.array(); + + foreach(QJsonValue obj, jsonArray) { + SWGPet* o = new SWGPet(); + QJsonObject jv = obj.toObject(); + QJsonObject * ptr = (QJsonObject*)&jv; + o->fromJsonObject(*ptr); + output->append(o); + } + + + + + worker->deleteLater(); + + emit findPetsByStatusSignal(output); + + } + + void + SWGPetApi::findPetsByTags(QList* tags) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet/findByTags"); + + + + + + + + + if(tags->size() > 0) { + if(QString("multi").indexOf("multi") == 0) { + foreach(QString* t, *tags) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("tags=").append(stringValue(t)); + } + } + else if (QString("multi").indexOf("ssv") == 0) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("tags="); + qint32 count = 0; + foreach(QString* t, *tags) { + if(count > 0) { + fullPath.append(" "); + } + fullPath.append(stringValue(t)); + } + } + else if (QString("multi").indexOf("tsv") == 0) { + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append("tags="); + qint32 count = 0; + foreach(QString* t, *tags) { + if(count > 0) { + fullPath.append("\t"); + } + fullPath.append(stringValue(t)); + } + } + } + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::findPetsByTagsCallback); + + worker->execute(&input); + } + + void + SWGPetApi::findPetsByTagsCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + QList* output = new QList(); + QString json(worker->response); + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonArray jsonArray = doc.array(); + + foreach(QJsonValue obj, jsonArray) { + SWGPet* o = new SWGPet(); + QJsonObject jv = obj.toObject(); + QJsonObject * ptr = (QJsonObject*)&jv; + o->fromJsonObject(*ptr); + output->append(o); + } + + + + + worker->deleteLater(); + + emit findPetsByTagsSignal(output); + + } + + void + SWGPetApi::getPetById(qint64 petId) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); + + + QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); + fullPath.replace(petIdPathParam, stringValue(petId)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::getPetByIdCallback); + + worker->execute(&input); + } + + void + SWGPetApi::getPetByIdCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + + + + QString json(worker->response); + SWGPet* output = static_cast(create(json, + QString("SWGPet"))); + + + + + worker->deleteLater(); + + emit getPetByIdSignal(output); + + } + + void + SWGPetApi::updatePetWithForm(QString* petId + , QString* name + , QString* status) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); + + + QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); + fullPath.replace(petIdPathParam, stringValue(petId)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); + + + if(name != NULL) { + input.add_var("name", *name); + } + + if(status != NULL) { + input.add_var("status", *status); + } + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::updatePetWithFormCallback); + + worker->execute(&input); + } + + void + SWGPetApi::updatePetWithFormCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit updatePetWithFormSignal(); + } + + void + SWGPetApi::deletePet(QString* apiKey + , qint64 petId) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); + + + QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); + fullPath.replace(petIdPathParam, stringValue(petId)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "DELETE"); + + + + + + + // TODO: add header support + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::deletePetCallback); + + worker->execute(&input); + } + + void + SWGPetApi::deletePetCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit deletePetSignal(); + } + + void + SWGPetApi::uploadFile(qint64 petId + , QString* additionalMetadata + , SWGHttpRequestInputFileElement* file) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage"); + + + QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); + fullPath.replace(petIdPathParam, stringValue(petId)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); + + + if(additionalMetadata != NULL) { + input.add_var("additionalMetadata", *additionalMetadata); + } + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGPetApi::uploadFileCallback); + + worker->execute(&input); + } + + void + SWGPetApi::uploadFileCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit uploadFileSignal(); + } + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.h b/samples/client/petstore/qt5cpp/client/SWGPetApi.h index 488865729b9..af70a469614 100644 --- a/samples/client/petstore/qt5cpp/client/SWGPetApi.h +++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.h @@ -7,14 +7,15 @@ #include #include "SWGHttpRequest.h" -#include +#include + -namespace Swagger { + namespace Swagger { -class SWGPetApi: public QObject { + class SWGPetApi: public QObject { Q_OBJECT -public: + public: SWGPetApi(); SWGPetApi(QString host, QString basePath); ~SWGPetApi(); @@ -27,11 +28,16 @@ class SWGPetApi: public QObject { void findPetsByStatus(QList* status); void findPetsByTags(QList* tags); void getPetById(qint64 petId); - void updatePetWithForm(QString* petId, QString* name, QString* status); - void deletePet(QString* apiKey, qint64 petId); - void uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file); + void updatePetWithForm(QString* petId + , QString* name + , QString* status); + void deletePet(QString* apiKey + , qint64 petId); + void uploadFile(qint64 petId + , QString* additionalMetadata + , SWGHttpRequestInputFileElement* file); -private: + private: void updatePetCallback (HttpRequestWorker * worker); void addPetCallback (HttpRequestWorker * worker); void findPetsByStatusCallback (HttpRequestWorker * worker); @@ -41,7 +47,7 @@ class SWGPetApi: public QObject { void deletePetCallback (HttpRequestWorker * worker); void uploadFileCallback (HttpRequestWorker * worker); -signals: + signals: void updatePetSignal(); void addPetSignal(); void findPetsByStatusSignal(QList* summary); @@ -51,6 +57,6 @@ class SWGPetApi: public QObject { void deletePetSignal(); void uploadFileSignal(); -}; -} -#endif \ No newline at end of file + }; + } + #endif \ No newline at end of file diff --git a/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp b/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp index be603573f62..888935e31b1 100644 --- a/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp @@ -2,238 +2,249 @@ #include "SWGHelpers.h" #include "SWGModelFactory.h" -#include -#include +#include + + #include + -namespace Swagger { -SWGStoreApi::SWGStoreApi() {} + namespace Swagger { + SWGStoreApi::SWGStoreApi() {} -SWGStoreApi::~SWGStoreApi() {} + SWGStoreApi::~SWGStoreApi() {} -SWGStoreApi::SWGStoreApi(QString host, QString basePath) { - this->host = host; - this->basePath = basePath; -} + SWGStoreApi::SWGStoreApi(QString host, QString basePath) { + this->host = host; + this->basePath = basePath; + } -void -SWGStoreApi::getInventory() { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/store/inventory"); + + + void + SWGStoreApi::getInventory() { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/store/inventory"); - + - + - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); - + - + + + - + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGStoreApi::getInventoryCallback); + + worker->execute(&input); + } + + void + SWGStoreApi::getInventoryCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGStoreApi::getInventoryCallback); + + + QMap* output = new QMap(); - worker->execute(&input); -} + QString json(worker->response); + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject obj = doc.object(); -void -SWGStoreApi::getInventoryCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } + foreach(QString key, obj.keys()) { + qint32* val; + setValue(&val, obj[key], "QMap", ""); + output->insert(key, *val); + } - - - - QMap* output = new QMap(); + + + - QString json(worker->response); - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject obj = doc.object(); + worker->deleteLater(); + + emit getInventorySignal(output); + + } + + void + SWGStoreApi::placeOrder(SWGOrder body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/store/order"); + + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); + + + + + + + QString output = body.asJson(); + input.request_body.append(output); + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGStoreApi::placeOrderCallback); + + worker->execute(&input); + } + + void + SWGStoreApi::placeOrderCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } - foreach(QString key, obj.keys()) { - qint32* val; - setValue(&val, obj[key], "QMap", ""); - output->insert(key, *val); - } + - - - - - - worker->deleteLater(); - - emit getInventorySignal(output); - -} -void -SWGStoreApi::placeOrder(SWGOrder body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/store/order"); - - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); - - - - - - - QString output = body.asJson(); - input.request_body.append(output); - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGStoreApi::placeOrderCallback); - - worker->execute(&input); -} - -void -SWGStoreApi::placeOrderCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - - - - QString json(worker->response); - SWGOrder* output = static_cast(create(json, QString("SWGOrder"))); - - - - - worker->deleteLater(); - - emit placeOrderSignal(output); - -} -void -SWGStoreApi::getOrderById(QString* orderId) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}"); - - - QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}"); - fullPath.replace(orderIdPathParam, stringValue(orderId)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGStoreApi::getOrderByIdCallback); - - worker->execute(&input); -} - -void -SWGStoreApi::getOrderByIdCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - - - - QString json(worker->response); - SWGOrder* output = static_cast(create(json, QString("SWGOrder"))); - - - - - worker->deleteLater(); - - emit getOrderByIdSignal(output); - -} -void -SWGStoreApi::deleteOrder(QString* orderId) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}"); - - - QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}"); - fullPath.replace(orderIdPathParam, stringValue(orderId)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "DELETE"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGStoreApi::deleteOrderCallback); - - worker->execute(&input); -} - -void -SWGStoreApi::deleteOrderCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit deleteOrderSignal(); -} -} /* namespace Swagger */ + + + + QString json(worker->response); + SWGOrder* output = static_cast(create(json, + QString("SWGOrder"))); + + + + + worker->deleteLater(); + + emit placeOrderSignal(output); + + } + + void + SWGStoreApi::getOrderById(QString* orderId) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}"); + + + QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}"); + fullPath.replace(orderIdPathParam, stringValue(orderId)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGStoreApi::getOrderByIdCallback); + + worker->execute(&input); + } + + void + SWGStoreApi::getOrderByIdCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + + + + QString json(worker->response); + SWGOrder* output = static_cast(create(json, + QString("SWGOrder"))); + + + + + worker->deleteLater(); + + emit getOrderByIdSignal(output); + + } + + void + SWGStoreApi::deleteOrder(QString* orderId) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}"); + + + QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}"); + fullPath.replace(orderIdPathParam, stringValue(orderId)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "DELETE"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGStoreApi::deleteOrderCallback); + + worker->execute(&input); + } + + void + SWGStoreApi::deleteOrderCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit deleteOrderSignal(); + } + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGStoreApi.h b/samples/client/petstore/qt5cpp/client/SWGStoreApi.h index 7bbe8e5f92a..cb801248863 100644 --- a/samples/client/petstore/qt5cpp/client/SWGStoreApi.h +++ b/samples/client/petstore/qt5cpp/client/SWGStoreApi.h @@ -7,14 +7,15 @@ #include "SWGOrder.h" #include -#include +#include + -namespace Swagger { + namespace Swagger { -class SWGStoreApi: public QObject { + class SWGStoreApi: public QObject { Q_OBJECT -public: + public: SWGStoreApi(); SWGStoreApi(QString host, QString basePath); ~SWGStoreApi(); @@ -27,18 +28,18 @@ class SWGStoreApi: public QObject { void getOrderById(QString* orderId); void deleteOrder(QString* orderId); -private: + private: void getInventoryCallback (HttpRequestWorker * worker); void placeOrderCallback (HttpRequestWorker * worker); void getOrderByIdCallback (HttpRequestWorker * worker); void deleteOrderCallback (HttpRequestWorker * worker); -signals: + signals: void getInventorySignal(QMap* summary); void placeOrderSignal(SWGOrder* summary); void getOrderByIdSignal(SWGOrder* summary); void deleteOrderSignal(); -}; -} -#endif \ No newline at end of file + }; + } + #endif \ No newline at end of file diff --git a/samples/client/petstore/qt5cpp/client/SWGTag.cpp b/samples/client/petstore/qt5cpp/client/SWGTag.cpp index bb4404de8df..da3406abc68 100644 --- a/samples/client/petstore/qt5cpp/client/SWGTag.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGTag.cpp @@ -1,105 +1,112 @@ -#include "SWGTag.h" + #include "SWGTag.h" -#include "SWGHelpers.h" + #include "SWGHelpers.h" -#include -#include -#include -#include + #include + + #include + + #include + + #include + -namespace Swagger { + namespace Swagger { -SWGTag::SWGTag(QString* json) { - init(); - this->fromJson(*json); -} + SWGTag::SWGTag(QString* json) { + init(); + this->fromJson(*json); + } -SWGTag::SWGTag() { - init(); -} + SWGTag::SWGTag() { + init(); + } -SWGTag::~SWGTag() { - this->cleanup(); -} + SWGTag::~SWGTag() { + this->cleanup(); + } -void -SWGTag::init() { + void + SWGTag::init() { id = 0L; name = new QString(""); -} + } -void -SWGTag::cleanup() { + void + SWGTag::cleanup() { if(name != NULL) { - delete name; - } + delete name; + } -} - -SWGTag* -SWGTag::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGTag::fromJsonObject(QJsonObject &pJson) { + } + + SWGTag* + SWGTag::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; + } + + void + SWGTag::fromJsonObject(QJsonObject &pJson) { setValue(&id, pJson["id"], "qint64", ""); setValue(&name, pJson["name"], "QString", "QString"); -} + } -QString -SWGTag::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - return QString(bytes); -} - -QJsonObject* -SWGTag::asJsonObject() { - QJsonObject* obj = new QJsonObject(); + QString + SWGTag::asJson () + { + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + return QString(bytes); + } + + QJsonObject* + SWGTag::asJsonObject() { + QJsonObject* obj = new QJsonObject(); obj->insert("id", QJsonValue(id)); - - toJsonValue(QString("name"), name, obj, QString("QString")); - - + + toJsonValue(QString("name"), name, obj, QString("QString")); + + - return obj; -} + return obj; + } -qint64 -SWGTag::getId() { - return id; -} -void -SWGTag::setId(qint64 id) { - this->id = id; -} + + qint64 + SWGTag::getId() { + return id; + } + void + SWGTag::setId(qint64 id) { + this->id = id; + } -QString* -SWGTag::getName() { - return name; -} -void -SWGTag::setName(QString* name) { - this->name = name; -} + + QString* + SWGTag::getName() { + return name; + } + void + SWGTag::setName(QString* name) { + this->name = name; + } + -} /* namespace Swagger */ + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGTag.h b/samples/client/petstore/qt5cpp/client/SWGTag.h index 067b200675b..f1d650fe1ea 100644 --- a/samples/client/petstore/qt5cpp/client/SWGTag.h +++ b/samples/client/petstore/qt5cpp/client/SWGTag.h @@ -1,47 +1,48 @@ /* - * SWGTag.h - * - * - */ +* SWGTag.h +* +* +*/ #ifndef SWGTag_H_ #define SWGTag_H_ -#include +#include + #include -#include "SWGObject.h" + #include "SWGObject.h" -namespace Swagger { + namespace Swagger { -class SWGTag: public SWGObject { -public: + class SWGTag: public SWGObject { + public: SWGTag(); SWGTag(QString* json); - virtual ~SWGTag(); - void init(); - void cleanup(); + virtual ~SWGTag(); + void init(); + void cleanup(); - QString asJson (); - QJsonObject* asJsonObject(); - void fromJsonObject(QJsonObject &json); + QString asJson (); + QJsonObject* asJsonObject(); + void fromJsonObject(QJsonObject &json); SWGTag* fromJson(QString &jsonString); qint64 getId(); - void setId(qint64 id); + void setId(qint64 id); QString* getName(); - void setName(QString* name); + void setName(QString* name); -private: + private: qint64 id; QString* name; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SWGTag_H_ */ + #endif /* SWGTag_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGUser.cpp b/samples/client/petstore/qt5cpp/client/SWGUser.cpp index f0d58c7e97b..58aa806e9a4 100644 --- a/samples/client/petstore/qt5cpp/client/SWGUser.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGUser.cpp @@ -1,31 +1,35 @@ -#include "SWGUser.h" + #include "SWGUser.h" -#include "SWGHelpers.h" + #include "SWGHelpers.h" -#include -#include -#include -#include + #include + + #include + + #include + + #include + -namespace Swagger { + namespace Swagger { -SWGUser::SWGUser(QString* json) { - init(); - this->fromJson(*json); -} + SWGUser::SWGUser(QString* json) { + init(); + this->fromJson(*json); + } -SWGUser::SWGUser() { - init(); -} + SWGUser::SWGUser() { + init(); + } -SWGUser::~SWGUser() { - this->cleanup(); -} + SWGUser::~SWGUser() { + this->cleanup(); + } -void -SWGUser::init() { + void + SWGUser::init() { id = 0L; username = new QString(""); firstName = new QString(""); @@ -35,44 +39,44 @@ SWGUser::init() { phone = new QString(""); userStatus = 0; -} + } -void -SWGUser::cleanup() { + void + SWGUser::cleanup() { if(username != NULL) { - delete username; - } + delete username; + } if(firstName != NULL) { - delete firstName; - } + delete firstName; + } if(lastName != NULL) { - delete lastName; - } + delete lastName; + } if(email != NULL) { - delete email; - } + delete email; + } if(password != NULL) { - delete password; - } + delete password; + } if(phone != NULL) { - delete phone; - } + delete phone; + } -} + } -SWGUser* -SWGUser::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} + SWGUser* + SWGUser::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; + } -void -SWGUser::fromJsonObject(QJsonObject &pJson) { + void + SWGUser::fromJsonObject(QJsonObject &pJson) { setValue(&id, pJson["id"], "qint64", ""); setValue(&username, pJson["username"], "QString", "QString"); setValue(&firstName, pJson["firstName"], "QString", "QString"); @@ -82,137 +86,146 @@ SWGUser::fromJsonObject(QJsonObject &pJson) { setValue(&phone, pJson["phone"], "QString", "QString"); setValue(&userStatus, pJson["userStatus"], "qint32", ""); -} + } -QString -SWGUser::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - return QString(bytes); -} + QString + SWGUser::asJson () + { + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + return QString(bytes); + } -QJsonObject* -SWGUser::asJsonObject() { - QJsonObject* obj = new QJsonObject(); + QJsonObject* + SWGUser::asJsonObject() { + QJsonObject* obj = new QJsonObject(); obj->insert("id", QJsonValue(id)); - - toJsonValue(QString("username"), username, obj, QString("QString")); - - - + + toJsonValue(QString("username"), username, obj, QString("QString")); + + - toJsonValue(QString("firstName"), firstName, obj, QString("QString")); + + toJsonValue(QString("firstName"), firstName, obj, QString("QString")); + + + + toJsonValue(QString("lastName"), lastName, obj, QString("QString")); + + + + toJsonValue(QString("email"), email, obj, QString("QString")); + + - toJsonValue(QString("lastName"), lastName, obj, QString("QString")); - - - - - - toJsonValue(QString("email"), email, obj, QString("QString")); + + toJsonValue(QString("password"), password, obj, QString("QString")); + + + + toJsonValue(QString("phone"), phone, obj, QString("QString")); + + + obj->insert("userStatus", QJsonValue(userStatus)); - toJsonValue(QString("password"), password, obj, QString("QString")); + + return obj; + } + + qint64 + SWGUser::getId() { + return id; + } + void + SWGUser::setId(qint64 id) { + this->id = id; + } + + QString* + SWGUser::getUsername() { + return username; + } + void + SWGUser::setUsername(QString* username) { + this->username = username; + } + + QString* + SWGUser::getFirstName() { + return firstName; + } + void + SWGUser::setFirstName(QString* firstName) { + this->firstName = firstName; + } + + QString* + SWGUser::getLastName() { + return lastName; + } + void + SWGUser::setLastName(QString* lastName) { + this->lastName = lastName; + } + - toJsonValue(QString("phone"), phone, obj, QString("QString")); + QString* + SWGUser::getEmail() { + return email; + } + void + SWGUser::setEmail(QString* email) { + this->email = email; + } + + QString* + SWGUser::getPassword() { + return password; + } + void + SWGUser::setPassword(QString* password) { + this->password = password; + } + + QString* + SWGUser::getPhone() { + return phone; + } + void + SWGUser::setPhone(QString* phone) { + this->phone = phone; + } + - obj->insert("userStatus", QJsonValue(userStatus)); + qint32 + SWGUser::getUserStatus() { + return userStatus; + } + void + SWGUser::setUserStatus(qint32 userStatus) { + this->userStatus = userStatus; + } + - return obj; -} - -qint64 -SWGUser::getId() { - return id; -} -void -SWGUser::setId(qint64 id) { - this->id = id; -} - -QString* -SWGUser::getUsername() { - return username; -} -void -SWGUser::setUsername(QString* username) { - this->username = username; -} - -QString* -SWGUser::getFirstName() { - return firstName; -} -void -SWGUser::setFirstName(QString* firstName) { - this->firstName = firstName; -} - -QString* -SWGUser::getLastName() { - return lastName; -} -void -SWGUser::setLastName(QString* lastName) { - this->lastName = lastName; -} - -QString* -SWGUser::getEmail() { - return email; -} -void -SWGUser::setEmail(QString* email) { - this->email = email; -} - -QString* -SWGUser::getPassword() { - return password; -} -void -SWGUser::setPassword(QString* password) { - this->password = password; -} - -QString* -SWGUser::getPhone() { - return phone; -} -void -SWGUser::setPhone(QString* phone) { - this->phone = phone; -} - -qint32 -SWGUser::getUserStatus() { - return userStatus; -} -void -SWGUser::setUserStatus(qint32 userStatus) { - this->userStatus = userStatus; -} - - - -} /* namespace Swagger */ + + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGUser.h b/samples/client/petstore/qt5cpp/client/SWGUser.h index eaa0e496c39..6484a2e67b2 100644 --- a/samples/client/petstore/qt5cpp/client/SWGUser.h +++ b/samples/client/petstore/qt5cpp/client/SWGUser.h @@ -1,54 +1,55 @@ /* - * SWGUser.h - * - * - */ +* SWGUser.h +* +* +*/ #ifndef SWGUser_H_ #define SWGUser_H_ -#include +#include + #include -#include "SWGObject.h" + #include "SWGObject.h" -namespace Swagger { + namespace Swagger { -class SWGUser: public SWGObject { -public: + class SWGUser: public SWGObject { + public: SWGUser(); SWGUser(QString* json); - virtual ~SWGUser(); - void init(); - void cleanup(); + virtual ~SWGUser(); + void init(); + void cleanup(); - QString asJson (); - QJsonObject* asJsonObject(); - void fromJsonObject(QJsonObject &json); + QString asJson (); + QJsonObject* asJsonObject(); + void fromJsonObject(QJsonObject &json); SWGUser* fromJson(QString &jsonString); qint64 getId(); - void setId(qint64 id); + void setId(qint64 id); QString* getUsername(); - void setUsername(QString* username); + void setUsername(QString* username); QString* getFirstName(); - void setFirstName(QString* firstName); + void setFirstName(QString* firstName); QString* getLastName(); - void setLastName(QString* lastName); + void setLastName(QString* lastName); QString* getEmail(); - void setEmail(QString* email); + void setEmail(QString* email); QString* getPassword(); - void setPassword(QString* password); + void setPassword(QString* password); QString* getPhone(); - void setPhone(QString* phone); + void setPhone(QString* phone); qint32 getUserStatus(); - void setUserStatus(qint32 userStatus); + void setUserStatus(qint32 userStatus); -private: + private: qint64 id; QString* username; QString* firstName; @@ -58,8 +59,8 @@ class SWGUser: public SWGObject { QString* phone; qint32 userStatus; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SWGUser_H_ */ + #endif /* SWGUser_H_ */ diff --git a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp index 6341231a884..4f90b151e29 100644 --- a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp +++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp @@ -2,442 +2,463 @@ #include "SWGHelpers.h" #include "SWGModelFactory.h" -#include -#include +#include + + #include + -namespace Swagger { -SWGUserApi::SWGUserApi() {} + namespace Swagger { + SWGUserApi::SWGUserApi() {} -SWGUserApi::~SWGUserApi() {} + SWGUserApi::~SWGUserApi() {} -SWGUserApi::SWGUserApi(QString host, QString basePath) { - this->host = host; - this->basePath = basePath; -} + SWGUserApi::SWGUserApi(QString host, QString basePath) { + this->host = host; + this->basePath = basePath; + } -void -SWGUserApi::createUser(SWGUser body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user"); + + + void + SWGUserApi::createUser(SWGUser body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user"); - + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); - + - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); + + + + QString output = body.asJson(); + input.request_body.append(output); + - + - - - - QString output = body.asJson(); - input.request_body.append(output); - + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::createUserCallback); - + worker->execute(&input); + } - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::createUserCallback); + void + SWGUserApi::createUserCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } - worker->execute(&input); -} + -void -SWGUserApi::createUserCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } + worker->deleteLater(); - + + emit createUserSignal(); + } + + void + SWGUserApi::createUsersWithArrayInput(QList* body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/createWithArray"); - worker->deleteLater(); + - - emit createUserSignal(); -} -void -SWGUserApi::createUsersWithArrayInput(QList* body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/createWithArray"); + - + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); - + + + + + QJsonArray* bodyArray = new QJsonArray(); + toJsonArray((QList + *)body, bodyArray, QString("body"), QString("SWGUser*")); - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); - - - - - - QJsonArray* bodyArray = new QJsonArray(); - toJsonArray((QList*)body, bodyArray, QString("body"), QString("SWGUser*")); - - QJsonDocument doc(*bodyArray); - QByteArray bytes = doc.toJson(); - - input.request_body.append(bytes); - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::createUsersWithArrayInputCallback); - - worker->execute(&input); -} - -void -SWGUserApi::createUsersWithArrayInputCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit createUsersWithArrayInputSignal(); -} -void -SWGUserApi::createUsersWithListInput(QList* body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/createWithList"); - - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "POST"); - - - - - - QJsonArray* bodyArray = new QJsonArray(); - toJsonArray((QList*)body, bodyArray, QString("body"), QString("SWGUser*")); - - QJsonDocument doc(*bodyArray); - QByteArray bytes = doc.toJson(); - - input.request_body.append(bytes); - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::createUsersWithListInputCallback); - - worker->execute(&input); -} - -void -SWGUserApi::createUsersWithListInputCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit createUsersWithListInputSignal(); -} -void -SWGUserApi::loginUser(QString* username, QString* password) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/login"); - - - - - - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append(QUrl::toPercentEncoding("username")) - .append("=") - .append(QUrl::toPercentEncoding(stringValue(username))); - - - - - - if(fullPath.indexOf("?") > 0) - fullPath.append("&"); - else - fullPath.append("?"); - fullPath.append(QUrl::toPercentEncoding("password")) - .append("=") - .append(QUrl::toPercentEncoding(stringValue(password))); - - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::loginUserCallback); - - worker->execute(&input); -} - -void -SWGUserApi::loginUserCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - - - - QString json(worker->response); - QString* output = static_cast(create(json, QString("QString"))); - - - - - worker->deleteLater(); - - emit loginUserSignal(output); - -} -void -SWGUserApi::logoutUser() { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/logout"); - - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::logoutUserCallback); - - worker->execute(&input); -} - -void -SWGUserApi::logoutUserCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit logoutUserSignal(); -} -void -SWGUserApi::getUserByName(QString* username) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/{username}"); - - - QString usernamePathParam("{"); usernamePathParam.append("username").append("}"); - fullPath.replace(usernamePathParam, stringValue(username)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "GET"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::getUserByNameCallback); - - worker->execute(&input); -} - -void -SWGUserApi::getUserByNameCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - - - - QString json(worker->response); - SWGUser* output = static_cast(create(json, QString("SWGUser"))); - - - - - worker->deleteLater(); - - emit getUserByNameSignal(output); - -} -void -SWGUserApi::updateUser(QString* username, SWGUser body) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/{username}"); - - - QString usernamePathParam("{"); usernamePathParam.append("username").append("}"); - fullPath.replace(usernamePathParam, stringValue(username)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "PUT"); - - - - - - - QString output = body.asJson(); - input.request_body.append(output); - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::updateUserCallback); - - worker->execute(&input); -} - -void -SWGUserApi::updateUserCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit updateUserSignal(); -} -void -SWGUserApi::deleteUser(QString* username) { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/user/{username}"); - - - QString usernamePathParam("{"); usernamePathParam.append("username").append("}"); - fullPath.replace(usernamePathParam, stringValue(username)); - - - - - HttpRequestWorker *worker = new HttpRequestWorker(); - HttpRequestInput input(fullPath, "DELETE"); - - - - - - - - connect(worker, - &HttpRequestWorker::on_execution_finished, - this, - &SWGUserApi::deleteUserCallback); - - worker->execute(&input); -} - -void -SWGUserApi::deleteUserCallback(HttpRequestWorker * worker) { - QString msg; - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - - worker->deleteLater(); - - - emit deleteUserSignal(); -} -} /* namespace Swagger */ + QJsonDocument doc(*bodyArray); + QByteArray bytes = doc.toJson(); + + input.request_body.append(bytes); + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::createUsersWithArrayInputCallback); + + worker->execute(&input); + } + + void + SWGUserApi::createUsersWithArrayInputCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit createUsersWithArrayInputSignal(); + } + + void + SWGUserApi::createUsersWithListInput(QList* body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/createWithList"); + + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "POST"); + + + + + + QJsonArray* bodyArray = new QJsonArray(); + toJsonArray((QList + *)body, bodyArray, QString("body"), QString("SWGUser*")); + + QJsonDocument doc(*bodyArray); + QByteArray bytes = doc.toJson(); + + input.request_body.append(bytes); + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::createUsersWithListInputCallback); + + worker->execute(&input); + } + + void + SWGUserApi::createUsersWithListInputCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit createUsersWithListInputSignal(); + } + + void + SWGUserApi::loginUser(QString* username + , QString* password) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/login"); + + + + + + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append(QUrl::toPercentEncoding("username")) + .append("=") + .append(QUrl::toPercentEncoding(stringValue(username))); + + + + + + if(fullPath.indexOf("?") > 0) + fullPath.append("&"); + else + fullPath.append("?"); + fullPath.append(QUrl::toPercentEncoding("password")) + .append("=") + .append(QUrl::toPercentEncoding(stringValue(password))); + + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::loginUserCallback); + + worker->execute(&input); + } + + void + SWGUserApi::loginUserCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + + + + QString json(worker->response); + QString* output = static_cast(create(json, + QString("QString"))); + + + + + worker->deleteLater(); + + emit loginUserSignal(output); + + } + + void + SWGUserApi::logoutUser() { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/logout"); + + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::logoutUserCallback); + + worker->execute(&input); + } + + void + SWGUserApi::logoutUserCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit logoutUserSignal(); + } + + void + SWGUserApi::getUserByName(QString* username) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/{username}"); + + + QString usernamePathParam("{"); usernamePathParam.append("username").append("}"); + fullPath.replace(usernamePathParam, stringValue(username)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "GET"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::getUserByNameCallback); + + worker->execute(&input); + } + + void + SWGUserApi::getUserByNameCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + + + + QString json(worker->response); + SWGUser* output = static_cast(create(json, + QString("SWGUser"))); + + + + + worker->deleteLater(); + + emit getUserByNameSignal(output); + + } + + void + SWGUserApi::updateUser(QString* username + , SWGUser body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/{username}"); + + + QString usernamePathParam("{"); usernamePathParam.append("username").append("}"); + fullPath.replace(usernamePathParam, stringValue(username)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "PUT"); + + + + + + + QString output = body.asJson(); + input.request_body.append(output); + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::updateUserCallback); + + worker->execute(&input); + } + + void + SWGUserApi::updateUserCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit updateUserSignal(); + } + + void + SWGUserApi::deleteUser(QString* username) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/user/{username}"); + + + QString usernamePathParam("{"); usernamePathParam.append("username").append("}"); + fullPath.replace(usernamePathParam, stringValue(username)); + + + + + HttpRequestWorker *worker = new HttpRequestWorker(); + HttpRequestInput input(fullPath, "DELETE"); + + + + + + + + connect(worker, + &HttpRequestWorker::on_execution_finished, + this, + &SWGUserApi::deleteUserCallback); + + worker->execute(&input); + } + + void + SWGUserApi::deleteUserCallback(HttpRequestWorker * worker) { + QString msg; + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + + worker->deleteLater(); + + + emit deleteUserSignal(); + } + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/qt5cpp/client/SWGUserApi.h b/samples/client/petstore/qt5cpp/client/SWGUserApi.h index 2e3e119dc78..62bd43e9a4e 100644 --- a/samples/client/petstore/qt5cpp/client/SWGUserApi.h +++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.h @@ -7,14 +7,15 @@ #include #include -#include +#include + -namespace Swagger { + namespace Swagger { -class SWGUserApi: public QObject { + class SWGUserApi: public QObject { Q_OBJECT -public: + public: SWGUserApi(); SWGUserApi(QString host, QString basePath); ~SWGUserApi(); @@ -25,13 +26,15 @@ class SWGUserApi: public QObject { void createUser(SWGUser body); void createUsersWithArrayInput(QList* body); void createUsersWithListInput(QList* body); - void loginUser(QString* username, QString* password); + void loginUser(QString* username + , QString* password); void logoutUser(); void getUserByName(QString* username); - void updateUser(QString* username, SWGUser body); + void updateUser(QString* username + , SWGUser body); void deleteUser(QString* username); -private: + private: void createUserCallback (HttpRequestWorker * worker); void createUsersWithArrayInputCallback (HttpRequestWorker * worker); void createUsersWithListInputCallback (HttpRequestWorker * worker); @@ -41,7 +44,7 @@ class SWGUserApi: public QObject { void updateUserCallback (HttpRequestWorker * worker); void deleteUserCallback (HttpRequestWorker * worker); -signals: + signals: void createUserSignal(); void createUsersWithArrayInputSignal(); void createUsersWithListInputSignal(); @@ -51,6 +54,6 @@ class SWGUserApi: public QObject { void updateUserSignal(); void deleteUserSignal(); -}; -} -#endif \ No newline at end of file + }; + } + #endif \ No newline at end of file diff --git a/samples/client/petstore/retrofit/pom.xml b/samples/client/petstore/retrofit/pom.xml index 4a95855cac9..8895c7719fb 100644 --- a/samples/client/petstore/retrofit/pom.xml +++ b/samples/client/petstore/retrofit/pom.xml @@ -1,143 +1,146 @@ - 4.0.0 - io.swagger - swagger-java-client - jar - swagger-java-client - 1.0.0 - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + io.swagger + swagger-java-client + 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 + - - - - 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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.google.code.gson - gson - ${gson-version} - compile - - - com.squareup.retrofit - retrofit - ${retrofit-version} - compile - + + 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.google.code.gson + gson + ${gson-version} + compile + + + com.squareup.retrofit + retrofit + ${retrofit-version} + compile + - - - junit - junit - ${junit-version} - test - - - - 1.5.3-M1 - 2.3.1 - 1.9.0 - 1.0.0 - 4.12 - + + + junit + junit + ${junit-version} + test + + + + 1.5.0 + 2.3.1 + 1.9.0 + 1.0.0 + 4.12 + diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java index e443c984fd0..81751b50cd1 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java @@ -6,18 +6,18 @@ import retrofit.converter.GsonConverter; public class ServiceGenerator { - // No need to instantiate this class. - private ServiceGenerator() { } +// No need to instantiate this class. +private ServiceGenerator() { } - public static S createService(Class serviceClass) { +public static S createService(Class serviceClass) { Gson gson = new GsonBuilder() - .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") - .create(); + .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") + .create(); RestAdapter adapter = new RestAdapter.Builder() - .setEndpoint("http://petstore.swagger.io/v2") - .setConverter(new GsonConverter(gson)) - .build(); + .setEndpoint("http://petstore.swagger.io/v2") + .setConverter(new GsonConverter(gson)) + .build(); return adapter.create(serviceClass); - } -} + } + } diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java index 3d1b0893b61..e92a43fbae4 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java @@ -9,109 +9,109 @@ import io.swagger.client.model.Pet; import java.io.File; -public interface PetApi { - - /** - * Update an existing pet - * - * @param body Pet object that needs to be added to the store - * @return Void - */ - - @PUT("/pet") - Void updatePet( - @Body Pet body - ); - - /** - * Add a new pet to the store - * - * @param body Pet object that needs to be added to the store - * @return Void - */ - - @POST("/pet") - Void 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 List - */ - - @GET("/pet/findByStatus") - List 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 List - */ - - @GET("/pet/findByTags") - List 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 Pet - */ - - @GET("/pet/{petId}") - Pet 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 Void - */ - - @FormUrlEncoded - @POST("/pet/{petId}") - Void updatePetWithForm( - @Path("petId") String petId,@Field("name") String name,@Field("status") String status - ); - - /** - * Deletes a pet - * - * @param apiKey - * @param petId Pet id to delete - * @return Void - */ - - @DELETE("/pet/{petId}") - Void deletePet( - @Header("api_key") String apiKey,@Path("petId") Long petId - ); - - /** - * 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 - */ - - @Multipart - @POST("/pet/{petId}/uploadImage") - Void uploadFile( - @Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file - ); - -} + public interface PetApi { + + /** + * Update an existing pet + * + * @param body Pet object that needs to be added to the store + * @return Void + */ + + @PUT("/pet") + Void updatePet( + @Body Pet body + ); + + /** + * Add a new pet to the store + * + * @param body Pet object that needs to be added to the store + * @return Void + */ + + @POST("/pet") + Void 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 List + */ + + @GET("/pet/findByStatus") + List 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 List + */ + + @GET("/pet/findByTags") + List 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 Pet + */ + + @GET("/pet/{petId}") + Pet 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 Void + */ + + @FormUrlEncoded + @POST("/pet/{petId}") + Void updatePetWithForm( + @Path("petId") String petId,@Field("name") String name,@Field("status") String status + ); + + /** + * Deletes a pet + * + * @param apiKey + * @param petId Pet id to delete + * @return Void + */ + + @DELETE("/pet/{petId}") + Void deletePet( + @Header("api_key") String apiKey,@Path("petId") Long petId + ); + + /** + * 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 + */ + + @Multipart + @POST("/pet/{petId}/uploadImage") + Void uploadFile( + @Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file + ); + + } diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java index fcd47b4b735..ead55d0e2c0 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java @@ -9,52 +9,52 @@ import java.util.Map; import io.swagger.client.model.Order; -public interface StoreApi { - - /** - * Returns pet inventories by status - * Returns a map of status codes to quantities - * @return Map - */ - - @GET("/store/inventory") - Map getInventory(); - - - /** - * Place an order for a pet - * - * @param body order placed for purchasing the pet - * @return Order - */ - - @POST("/store/order") - Order 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 Order - */ - - @GET("/store/order/{orderId}") - Order 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 Void - */ - - @DELETE("/store/order/{orderId}") - Void deleteOrder( - @Path("orderId") String orderId - ); - -} + public interface StoreApi { + + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + * @return Map + */ + + @GET("/store/inventory") + Map getInventory(); + + + /** + * Place an order for a pet + * + * @param body order placed for purchasing the pet + * @return Order + */ + + @POST("/store/order") + Order 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 Order + */ + + @GET("/store/order/{orderId}") + Order 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 Void + */ + + @DELETE("/store/order/{orderId}") + Void deleteOrder( + @Path("orderId") String orderId + ); + + } diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java index 4aa39c52e2c..824e244526f 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java @@ -9,102 +9,102 @@ import io.swagger.client.model.User; import java.util.*; -public interface UserApi { - - /** - * Create user - * This can only be done by the logged in user. - * @param body Created user object - * @return Void - */ - - @POST("/user") - Void createUser( - @Body User body - ); - - /** - * Creates list of users with given input array - * - * @param body List of user object - * @return Void - */ - - @POST("/user/createWithArray") - Void createUsersWithArrayInput( - @Body List body - ); - - /** - * Creates list of users with given input array - * - * @param body List of user object - * @return Void - */ - - @POST("/user/createWithList") - Void 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 String - */ - - @GET("/user/login") - String loginUser( - @Query("username") String username,@Query("password") String password - ); - - /** - * Logs out current logged in user session - * - * @return Void - */ - - @GET("/user/logout") - Void logoutUser(); - - - /** - * Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. - * @return User - */ - - @GET("/user/{username}") - User 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 Void - */ - - @PUT("/user/{username}") - Void 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 Void - */ - - @DELETE("/user/{username}") - Void deleteUser( - @Path("username") String username - ); - -} + public interface UserApi { + + /** + * Create user + * This can only be done by the logged in user. + * @param body Created user object + * @return Void + */ + + @POST("/user") + Void createUser( + @Body User body + ); + + /** + * Creates list of users with given input array + * + * @param body List of user object + * @return Void + */ + + @POST("/user/createWithArray") + Void createUsersWithArrayInput( + @Body List body + ); + + /** + * Creates list of users with given input array + * + * @param body List of user object + * @return Void + */ + + @POST("/user/createWithList") + Void 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 String + */ + + @GET("/user/login") + String loginUser( + @Query("username") String username,@Query("password") String password + ); + + /** + * Logs out current logged in user session + * + * @return Void + */ + + @GET("/user/logout") + Void logoutUser(); + + + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. + * @return User + */ + + @GET("/user/{username}") + User 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 Void + */ + + @PUT("/user/{username}") + Void 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 Void + */ + + @DELETE("/user/{username}") + Void deleteUser( + @Path("username") String username + ); + + } diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java index 8ba10d629dc..1a964573856 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java @@ -1,49 +1,50 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - -@ApiModel(description = "") -public class Category { + + @ApiModel(description = "") + public class Category { /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("id") - private Long id = null; + private Long id = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("name") - private String name = null; + private String name = null; - - public Long getId() { + + public Long getId() { return id; - } - public void setId(Long id) { + } + public void setId(Long id) { this.id = id; - } - - public String getName() { + } + + public String getName() { return name; - } - public void setName(String 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(); + 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/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java index d7d0b2d9282..1f1fe1f7df4 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java @@ -2,109 +2,110 @@ import java.util.Date; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - -@ApiModel(description = "") -public class Order { + + @ApiModel(description = "") + public class Order { /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("id") - private Long id = null; + private Long id = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("petId") - private Long petId = null; + private Long petId = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("quantity") - private Integer quantity = null; + private Integer quantity = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("shipDate") - private Date shipDate = null; - public enum StatusEnum { + private Date shipDate = null; + public enum StatusEnum { placed, approved, delivered, - }; + }; /** - * Order Status - **/ - @ApiModelProperty(value = "Order Status") - @SerializedName("status") - private StatusEnum status = null; + * Order Status + **/ + @ApiModelProperty(value = "Order Status") + @SerializedName("status") + private StatusEnum status = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("complete") - private Boolean complete = null; + private Boolean complete = null; - - public Long getId() { + + public Long getId() { return id; - } - public void setId(Long id) { + } + public void setId(Long id) { this.id = id; - } - - public Long getPetId() { + } + + public Long getPetId() { return petId; - } - public void setPetId(Long petId) { + } + public void setPetId(Long petId) { this.petId = petId; - } - - public Integer getQuantity() { + } + + public Integer getQuantity() { return quantity; - } - public void setQuantity(Integer quantity) { + } + public void setQuantity(Integer quantity) { this.quantity = quantity; - } - - public Date getShipDate() { + } + + public Date getShipDate() { return shipDate; - } - public void setShipDate(Date shipDate) { + } + public void setShipDate(Date shipDate) { this.shipDate = shipDate; - } - - public StatusEnum getStatus() { + } + + public StatusEnum getStatus() { return status; - } - public void setStatus(StatusEnum status) { + } + public void setStatus(StatusEnum status) { this.status = status; - } - - public Boolean getComplete() { + } + + public Boolean getComplete() { return complete; - } - public void setComplete(Boolean 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(); + 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/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java index 66a02367c90..e311a11be48 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java @@ -1,112 +1,113 @@ package io.swagger.client.model; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; +import java.util.*; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - -@ApiModel(description = "") -public class Pet { + + @ApiModel(description = "") + public class Pet { /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("id") - private Long id = null; + private Long id = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("category") - private Category category = null; + private Category category = null; /** - **/ - @ApiModelProperty(required = true, value = "") + **/ + @ApiModelProperty(required = true, value = "") @SerializedName("name") - private String name = null; + private String name = null; /** - **/ - @ApiModelProperty(required = true, value = "") + **/ + @ApiModelProperty(required = true, value = "") @SerializedName("photoUrls") - private List photoUrls = new ArrayList() ; + private List photoUrls = new ArrayList() ; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("tags") - private List tags = new ArrayList() ; - public enum StatusEnum { + private List tags = new ArrayList() ; + public enum StatusEnum { available, pending, sold, - }; + }; /** - * pet status in the store - **/ - @ApiModelProperty(value = "pet status in the store") - @SerializedName("status") - private StatusEnum status = null; + * pet status in the store + **/ + @ApiModelProperty(value = "pet status in the store") + @SerializedName("status") + private StatusEnum status = null; - - public Long getId() { + + public Long getId() { return id; - } - public void setId(Long id) { + } + public void setId(Long id) { this.id = id; - } - - public Category getCategory() { + } + + public Category getCategory() { return category; - } - public void setCategory(Category category) { + } + public void setCategory(Category category) { this.category = category; - } - - public String getName() { + } + + public String getName() { return name; - } - public void setName(String name) { + } + public void setName(String name) { this.name = name; - } - - public List getPhotoUrls() { + } + + public List getPhotoUrls() { return photoUrls; - } - public void setPhotoUrls(List photoUrls) { + } + public void setPhotoUrls(List photoUrls) { this.photoUrls = photoUrls; - } - - public List getTags() { + } + + public List getTags() { return tags; - } - public void setTags(List tags) { + } + public void setTags(List tags) { this.tags = tags; - } - - public StatusEnum getStatus() { + } + + public StatusEnum getStatus() { return status; - } - public void setStatus(StatusEnum 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(); + 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/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java index e6ddd4c92cd..0135992c7c6 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java @@ -1,49 +1,50 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - -@ApiModel(description = "") -public class Tag { + + @ApiModel(description = "") + public class Tag { /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("id") - private Long id = null; + private Long id = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("name") - private String name = null; + private String name = null; - - public Long getId() { + + public Long getId() { return id; - } - public void setId(Long id) { + } + public void setId(Long id) { this.id = id; - } - - public String getName() { + } + + public String getName() { return name; - } - public void setName(String 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(); + 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/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java index f42f77b9773..10fae2f8318 100644 --- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java @@ -1,134 +1,135 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; +import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - -@ApiModel(description = "") -public class User { + + @ApiModel(description = "") + public class User { /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("id") - private Long id = null; + private Long id = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("username") - private String username = null; + private String username = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("firstName") - private String firstName = null; + private String firstName = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("lastName") - private String lastName = null; + private String lastName = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("email") - private String email = null; + private String email = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("password") - private String password = null; + private String password = null; /** - **/ - @ApiModelProperty(value = "") + **/ + @ApiModelProperty(value = "") @SerializedName("phone") - private String phone = null; + private String phone = null; /** - * User Status - **/ - @ApiModelProperty(value = "User Status") + * User Status + **/ + @ApiModelProperty(value = "User Status") @SerializedName("userStatus") - private Integer userStatus = null; + private Integer userStatus = null; - - public Long getId() { + + public Long getId() { return id; - } - public void setId(Long id) { + } + public void setId(Long id) { this.id = id; - } - - public String getUsername() { + } + + public String getUsername() { return username; - } - public void setUsername(String username) { + } + public void setUsername(String username) { this.username = username; - } - - public String getFirstName() { + } + + public String getFirstName() { return firstName; - } - public void setFirstName(String firstName) { + } + public void setFirstName(String firstName) { this.firstName = firstName; - } - - public String getLastName() { + } + + public String getLastName() { return lastName; - } - public void setLastName(String lastName) { + } + public void setLastName(String lastName) { this.lastName = lastName; - } - - public String getEmail() { + } + + public String getEmail() { return email; - } - public void setEmail(String email) { + } + public void setEmail(String email) { this.email = email; - } - - public String getPassword() { + } + + public String getPassword() { return password; - } - public void setPassword(String password) { + } + public void setPassword(String password) { this.password = password; - } - - public String getPhone() { + } + + public String getPhone() { return phone; - } - public void setPhone(String phone) { + } + public void setPhone(String phone) { this.phone = phone; - } - - public Integer getUserStatus() { + } + + public Integer getUserStatus() { return userStatus; - } - public void setUserStatus(Integer 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(); + 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/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java index c588a04adcc..5151c941cd4 100644 --- a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java +++ b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java @@ -7,152 +7,155 @@ import retrofit.RetrofitError; import retrofit.mime.TypedFile; -import java.util.*; -import java.io.*; +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 static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class PetApiTest { - PetApi api = null; - - @Before - public void setup() { - api = ServiceGenerator.createService(PetApi.class); - } - - @Test - public void testCreateAndGetPet() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - 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); - - Pet fetched = api.getPetById(pet.getId()); - 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); - - List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})); - assertNotNull(pets); - - boolean found = false; - for(Pet fetched : pets) { - if(fetched.getId().equals(pet.getId())) { - found = true; - break; - } + PetApi api = null; + + @Before + public void setup() { + api = ServiceGenerator.createService(PetApi.class); + } + + @Test + public void testCreateAndGetPet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + 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); + + Pet fetched = api.getPetById(pet.getId()); + assertNotNull(fetched); + assertEquals(pet.getId(), fetched.getId()); + assertNotNull(fetched.getCategory()); + assertEquals(fetched.getCategory().getName(), pet.getCategory().getName()); } - assertTrue(found); - } + @Test + public void testFindPetsByStatus() throws Exception { + Pet pet = createRandomPet(); + pet.setName("programmer"); + pet.setStatus(Pet.StatusEnum.available); - @Test - public void testFindPetsByTags() throws Exception { - Pet pet = createRandomPet(); - pet.setName("monster"); - pet.setStatus(Pet.StatusEnum.available); + api.updatePet(pet); - List tags = new ArrayList(); - Tag tag1 = new Tag(); - tag1.setName("friendly"); - tags.add(tag1); - pet.setTags(tags); + List pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})); + assertNotNull(pets); - api.updatePet(pet); + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } - List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})); - assertNotNull(pets); + assertTrue(found); + } - boolean found = false; - for(Pet fetched : pets) { - if(fetched.getId().equals(pet.getId())) { - found = true; - break; - } + @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); + + List pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})); + assertNotNull(pets); + + boolean found = false; + for (Pet fetched : pets) { + if (fetched.getId().equals(pet.getId())) { + found = true; + break; + } + } + assertTrue(found); } - assertTrue(found); - } - - @Test - public void testUpdatePetWithForm() throws Exception { - Pet pet = createRandomPet(); - pet.setName("frank"); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - - api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null); - Pet updated = api.getPetById(fetched.getId()); - - assertEquals(updated.getName(), fetched.getName()); - } - - @Test - public void testDeletePet() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); - - Pet fetched = api.getPetById(pet.getId()); - api.deletePet(null, fetched.getId()); - - try { - fetched = api.getPetById(fetched.getId()); - fail("expected an error"); + + @Test + public void testUpdatePetWithForm() throws Exception { + Pet pet = createRandomPet(); + pet.setName("frank"); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + + api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null); + Pet updated = api.getPetById(fetched.getId()); + + assertEquals(updated.getName(), "furt"); } - catch (RetrofitError e) { - assertEquals(404, e.getResponse().getStatus()); + + @Test + public void testDeletePet() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); + + Pet fetched = api.getPetById(pet.getId()); + api.deletePet(null, fetched.getId()); + + try { + fetched = api.getPetById(fetched.getId()); + fail("expected an error"); + } catch (RetrofitError e) { + assertEquals(404, e.getResponse().getStatus()); + } } - } - @Test - public void testUploadFile() throws Exception { - Pet pet = createRandomPet(); - api.addPet(pet); + @Test + public void testUploadFile() throws Exception { + Pet pet = createRandomPet(); + api.addPet(pet); - File file = new File("hello.txt"); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - writer.write("Hello world!"); - writer.close(); + 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", new TypedFile("text/plain", file)); - } + api.uploadFile(pet.getId(), "a test file", new TypedFile("text/plain", file)); + } - private Pet createRandomPet() { - Pet pet = new Pet(); - pet.setId(System.currentTimeMillis()); - pet.setName("gorilla"); + private Pet createRandomPet() { + Pet pet = new Pet(); + pet.setId(System.currentTimeMillis()); + pet.setName("gorilla"); - Category category = new Category(); - category.setName("really-happy"); + 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); + 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; - } + return pet; + } } \ No newline at end of file diff --git a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java index 733b597fefc..3b406cac0b5 100644 --- a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java +++ b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java @@ -6,65 +6,63 @@ import retrofit.RetrofitError; -import java.util.*; -import java.io.*; +import java.util.Map; -import static org.junit.Assert.*; import org.junit.*; +import static org.junit.Assert.*; public class StoreApiTest { - StoreApi api = null; + StoreApi api = null; - @Before - public void setup() { - api = ServiceGenerator.createService(StoreApi.class); - } + @Before + public void setup() { + api = ServiceGenerator.createService(StoreApi.class); + } - @Test - public void testGetInventory() throws Exception { - Map inventory = api.getInventory(); - assertTrue(inventory.keySet().size() > 0); - } + @Test + public void testGetInventory() throws Exception { + Map inventory = api.getInventory(); + assertTrue(inventory.keySet().size() > 0); + } - @Test - public void testPlaceOrder() throws Exception { - Order order = createOrder(); - api.placeOrder(order); + @Test + public void testPlaceOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order); - Order fetched = api.getOrderById(String.valueOf(order.getId())); - assertEquals(order.getId(), fetched.getId()); - assertEquals(order.getPetId(), fetched.getPetId()); - assertEquals(order.getQuantity(), fetched.getQuantity()); - } + Order fetched = api.getOrderById(String.valueOf(order.getId())); + assertEquals(order.getId(), fetched.getId()); + assertEquals(order.getPetId(), fetched.getPetId()); + assertEquals(order.getQuantity(), fetched.getQuantity()); + } - @Test - public void testDeleteOrder() throws Exception { - Order order = createOrder(); - api.placeOrder(order); + @Test + public void testDeleteOrder() throws Exception { + Order order = createOrder(); + api.placeOrder(order); - Order fetched = api.getOrderById(String.valueOf(order.getId())); - assertEquals(fetched.getId(), order.getId()); + Order fetched = api.getOrderById(String.valueOf(order.getId())); + assertEquals(fetched.getId(), order.getId()); - api.deleteOrder(String.valueOf(order.getId())); + api.deleteOrder(String.valueOf(order.getId())); - try { - api.getOrderById(String.valueOf(order.getId())); - // fail("expected an error"); - } - catch (RetrofitError e) { - // ok + try { + api.getOrderById(String.valueOf(order.getId())); + // fail("expected an error"); + } catch (RetrofitError e) { + // ok + } } - } - 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); + 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; - } + return order; + } } \ No newline at end of file diff --git a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java index c7748bc492d..6613f0c03ad 100644 --- a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java +++ b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java @@ -4,81 +4,81 @@ import io.swagger.client.api.*; import io.swagger.client.model.*; -import java.util.*; -import java.io.*; -import static org.junit.Assert.*; +import java.util.Arrays; + import org.junit.*; +import static org.junit.Assert.*; public class UserApiTest { - UserApi api = null; - - @Before - public void setup() { - api = ServiceGenerator.createService(UserApi.class); - } - - @Test - public void testCreateUser() throws Exception { - User user = createUser(); - - api.createUser(user); - - User fetched = api.getUserByName(user.getUsername()); - 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})); - - User fetched = api.getUserByName(user1.getUsername()); - 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})); - - User fetched = api.getUserByName(user1.getUsername()); - assertEquals(user1.getId(), fetched.getId()); - } - - @Test - public void testLoginUser() throws Exception { - User user = createUser(); - api.createUser(user); - - String token = api.loginUser(user.getUsername(), user.getPassword()); - assertTrue(token.startsWith("logged in user session:")); - } - - @Test - public void logoutUser() throws Exception { - api.logoutUser(); - } - - 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; - } + UserApi api = null; + + @Before + public void setup() { + api = ServiceGenerator.createService(UserApi.class); + } + + @Test + public void testCreateUser() throws Exception { + User user = createUser(); + + api.createUser(user); + + User fetched = api.getUserByName(user.getUsername()); + 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})); + + User fetched = api.getUserByName(user1.getUsername()); + 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})); + + User fetched = api.getUserByName(user1.getUsername()); + assertEquals(user1.getId(), fetched.getId()); + } + + @Test + public void testLoginUser() throws Exception { + User user = createUser(); + api.createUser(user); + + String token = api.loginUser(user.getUsername(), user.getPassword()); + assertTrue(token.startsWith("logged in user session:")); + } + + @Test + public void logoutUser() throws Exception { + api.logoutUser(); + } + + 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 diff --git a/samples/client/petstore/ruby/lib/swagger_client.rb b/samples/client/petstore/ruby/lib/swagger_client.rb index 6d239185005..6b2f591df88 100644 --- a/samples/client/petstore/ruby/lib/swagger_client.rb +++ b/samples/client/petstore/ruby/lib/swagger_client.rb @@ -8,18 +8,22 @@ # Models require 'swagger_client/models/base_object' -require 'swagger_client/models/user' -require 'swagger_client/models/category' -require 'swagger_client/models/pet' -require 'swagger_client/models/tag' -require 'swagger_client/models/order' + require 'swagger_client/models/user' + require 'swagger_client/models/category' + require 'swagger_client/models/pet' + require 'swagger_client/models/tag' + require 'swagger_client/models/order' # APIs -require 'swagger_client/api/user_api' -require 'swagger_client/api/pet_api' -require 'swagger_client/api/store_api' + + require 'swagger_client/api/user_api' + + require 'swagger_client/api/pet_api' + + require 'swagger_client/api/store_api' + module SwaggerClient - # Initialize the default configuration - Swagger.configuration ||= Swagger::Configuration.new +# Initialize the default configuration +Swagger.configuration ||= Swagger::Configuration.new end diff --git a/samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb b/samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb index 7bed9b47780..5e0d4539867 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb @@ -1,328 +1,337 @@ require "uri" module SwaggerClient - class PetApi + class PetApi basePath = "http://petstore.swagger.io/v2" # apiInvoker = APIInvoker - - # Update an existing pet - # - # @param [Hash] opts the optional parameters - # @option opts [Pet] :body Pet object that needs to be added to the store - # @return [nil] - def self.update_pet(opts = {}) - - - # resource path - path = "/pet".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = ['application/json', 'application/xml'] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = ['petstore_auth'] - Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Add a new pet to the store - # - # @param [Hash] opts the optional parameters - # @option opts [Pet] :body Pet object that needs to be added to the store - # @return [nil] - def self.add_pet(opts = {}) - - - # resource path - path = "/pet".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = ['application/json', 'application/xml'] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = ['petstore_auth'] - Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Finds Pets by status - # Multiple status values can be provided with comma seperated strings - # @param [Hash] opts the optional parameters - # @option opts [array[string]] :status Status values that need to be considered for filter - # @return [array[Pet]] - def self.find_pets_by_status(opts = {}) - - - # resource path - path = "/pet/findByStatus".sub('{format}','json') - - # query parameters - query_params = {} - query_params[:'status'] = opts[:'status'] if opts[:'status'] - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = ['petstore_auth'] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - response.map {|response| obj = Pet.new() and obj.build_from_hash(response) } - end - - # Finds Pets by tags - # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. - # @param [Hash] opts the optional parameters - # @option opts [array[string]] :tags Tags to filter by - # @return [array[Pet]] - def self.find_pets_by_tags(opts = {}) - - - # resource path - path = "/pet/findByTags".sub('{format}','json') - - # query parameters - query_params = {} - query_params[:'tags'] = opts[:'tags'] if opts[:'tags'] - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = ['petstore_auth'] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - response.map {|response| obj = Pet.new() and obj.build_from_hash(response) } - end - - # Find pet by ID - # Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions - # @param pet_id ID of pet that needs to be fetched - # @param [Hash] opts the optional parameters - # @return [Pet] - def self.get_pet_by_id(pet_id, opts = {}) - - # verify the required parameter 'pet_id' is set - raise "Missing the required parameter 'pet_id' when calling get_pet_by_id" if pet_id.nil? - - - # resource path - path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = ['api_key', 'petstore_auth'] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - obj = Pet.new() and obj.build_from_hash(response) - end - - # Updates a pet in the store with form data - # - # @param pet_id ID of pet that needs to be updated - # @param [Hash] opts the optional parameters - # @option opts [string] :name Updated name of the pet - # @option opts [string] :status Updated status of the pet - # @return [nil] - def self.update_pet_with_form(pet_id, opts = {}) - - # verify the required parameter 'pet_id' is set - raise "Missing the required parameter 'pet_id' when calling update_pet_with_form" if pet_id.nil? - - - # resource path - path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = ['application/x-www-form-urlencoded'] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - form_params["name"] = opts[:'name'] if opts[:'name'] - form_params["status"] = opts[:'status'] if opts[:'status'] - - # http body (model) - post_body = nil - - - auth_names = ['petstore_auth'] - Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Deletes a pet - # - # @param pet_id Pet id to delete - # @param [Hash] opts the optional parameters - # @option opts [string] :api_key - # @return [nil] - def self.delete_pet(pet_id, opts = {}) - - # verify the required parameter 'pet_id' is set - raise "Missing the required parameter 'pet_id' when calling delete_pet" if pet_id.nil? - - - # resource path - path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - header_params[:'api_key'] = opts[:'api_key'] if opts[:'api_key'] - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = ['petstore_auth'] - Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # uploads an image - # - # @param pet_id ID of pet to update - # @param [Hash] opts the optional parameters - # @option opts [string] :additional_metadata Additional data to pass to server - # @option opts [file] :file file to upload - # @return [nil] - def self.upload_file(pet_id, opts = {}) - - # verify the required parameter 'pet_id' is set - raise "Missing the required parameter 'pet_id' when calling upload_file" if pet_id.nil? - - - # resource path - path = "/pet/{petId}/uploadImage".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = ['multipart/form-data'] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - form_params["additionalMetadata"] = opts[:'additional_metadata'] if opts[:'additional_metadata'] - form_params["file"] = opts[:'file'] if opts[:'file'] - - # http body (model) - post_body = nil - - - auth_names = ['petstore_auth'] - Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil + + + # Update an existing pet + # + # @param [Hash] opts the optional parameters + # @option opts [Pet] :body Pet object that needs to be added to the store + # @return [nil] + def self.update_pet(opts = {}) + + + # resource path + path = "/pet".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = ['application/json', 'application/xml'] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = ['petstore_auth'] + Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Add a new pet to the store + # + # @param [Hash] opts the optional parameters + # @option opts [Pet] :body Pet object that needs to be added to the store + # @return [nil] + def self.add_pet(opts = {}) + + + # resource path + path = "/pet".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = ['application/json', 'application/xml'] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = ['petstore_auth'] + Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Finds Pets by status + # Multiple status values can be provided with comma seperated strings + # @param [Hash] opts the optional parameters + # @option opts [array[string]] :status Status values that need to be considered for filter + # @return [array[Pet]] + def self.find_pets_by_status(opts = {}) + + + # resource path + path = "/pet/findByStatus".sub('{format}','json') + + # query parameters + query_params = {} + query_params[:'status'] = opts[:'status'] if opts[:'status'] + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = ['petstore_auth'] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + response.map {|response| obj = Pet.new() and obj.build_from_hash(response) } + end + + + # Finds Pets by tags + # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. + # @param [Hash] opts the optional parameters + # @option opts [array[string]] :tags Tags to filter by + # @return [array[Pet]] + def self.find_pets_by_tags(opts = {}) + + + # resource path + path = "/pet/findByTags".sub('{format}','json') + + # query parameters + query_params = {} + query_params[:'tags'] = opts[:'tags'] if opts[:'tags'] + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = ['petstore_auth'] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + response.map {|response| obj = Pet.new() and obj.build_from_hash(response) } + end + + + # Find pet by ID + # Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + # @param pet_id ID of pet that needs to be fetched + # @param [Hash] opts the optional parameters + # @return [Pet] + def self.get_pet_by_id(pet_id, opts = {}) + + # verify the required parameter 'pet_id' is set + raise "Missing the required parameter 'pet_id' when calling get_pet_by_id" if pet_id.nil? + + + # resource path + path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = ['api_key', 'petstore_auth'] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + obj = Pet.new() and obj.build_from_hash(response) + end + + + # Updates a pet in the store with form data + # + # @param pet_id ID of pet that needs to be updated + # @param [Hash] opts the optional parameters + # @option opts [string] :name Updated name of the pet + # @option opts [string] :status Updated status of the pet + # @return [nil] + def self.update_pet_with_form(pet_id, opts = {}) + + # verify the required parameter 'pet_id' is set + raise "Missing the required parameter 'pet_id' when calling update_pet_with_form" if pet_id.nil? + + + # resource path + path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = ['application/x-www-form-urlencoded'] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + form_params["name"] = opts[:'name'] if opts[:'name'] + form_params["status"] = opts[:'status'] if opts[:'status'] + + # http body (model) + post_body = nil + + + auth_names = ['petstore_auth'] + Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Deletes a pet + # + # @param pet_id Pet id to delete + # @param [Hash] opts the optional parameters + # @option opts [string] :api_key + # @return [nil] + def self.delete_pet(pet_id, opts = {}) + + # verify the required parameter 'pet_id' is set + raise "Missing the required parameter 'pet_id' when calling delete_pet" if pet_id.nil? + + + # resource path + path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + header_params[:'api_key'] = opts[:'api_key'] if opts[:'api_key'] + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = ['petstore_auth'] + Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # uploads an image + # + # @param pet_id ID of pet to update + # @param [Hash] opts the optional parameters + # @option opts [string] :additional_metadata Additional data to pass to server + # @option opts [file] :file file to upload + # @return [nil] + def self.upload_file(pet_id, opts = {}) + + # verify the required parameter 'pet_id' is set + raise "Missing the required parameter 'pet_id' when calling upload_file" if pet_id.nil? + + + # resource path + path = "/pet/{petId}/uploadImage".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = ['multipart/form-data'] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + form_params["additionalMetadata"] = opts[:'additional_metadata'] if opts[:'additional_metadata'] + form_params["file"] = opts[:'file'] if opts[:'file'] + + # http body (model) + post_body = nil + + + auth_names = ['petstore_auth'] + Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + end - end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb b/samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb index 010d170945b..ab468e94669 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb @@ -1,161 +1,166 @@ require "uri" module SwaggerClient - class StoreApi + class StoreApi basePath = "http://petstore.swagger.io/v2" # apiInvoker = APIInvoker - - # Returns pet inventories by status - # Returns a map of status codes to quantities - # @param [Hash] opts the optional parameters - # @return [map[string,int]] - def self.get_inventory(opts = {}) - - - # resource path - path = "/store/inventory".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = ['api_key'] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - response.map {|response| obj = map.new() and obj.build_from_hash(response) } - end - - # Place an order for a pet - # - # @param [Hash] opts the optional parameters - # @option opts [Order] :body order placed for purchasing the pet - # @return [Order] - def self.place_order(opts = {}) - - - # resource path - path = "/store/order".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = [] - response = Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - obj = Order.new() and obj.build_from_hash(response) - end - - # Find purchase order by ID - # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - # @param order_id ID of pet that needs to be fetched - # @param [Hash] opts the optional parameters - # @return [Order] - def self.get_order_by_id(order_id, opts = {}) - - # verify the required parameter 'order_id' is set - raise "Missing the required parameter 'order_id' when calling get_order_by_id" if order_id.nil? - - - # resource path - path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = [] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - obj = Order.new() and obj.build_from_hash(response) - end - - # Delete purchase order by ID - # For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - # @param order_id ID of the order that needs to be deleted - # @param [Hash] opts the optional parameters - # @return [nil] - def self.delete_order(order_id, opts = {}) - - # verify the required parameter 'order_id' is set - raise "Missing the required parameter 'order_id' when calling delete_order" if order_id.nil? - - - # resource path - path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = [] - Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil + + + # Returns pet inventories by status + # Returns a map of status codes to quantities + # @param [Hash] opts the optional parameters + # @return [map[string,int]] + def self.get_inventory(opts = {}) + + + # resource path + path = "/store/inventory".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = ['api_key'] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + response.map {|response| obj = map.new() and obj.build_from_hash(response) } + end + + + # Place an order for a pet + # + # @param [Hash] opts the optional parameters + # @option opts [Order] :body order placed for purchasing the pet + # @return [Order] + def self.place_order(opts = {}) + + + # resource path + path = "/store/order".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = [] + response = Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + obj = Order.new() and obj.build_from_hash(response) + end + + + # Find purchase order by ID + # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + # @param order_id ID of pet that needs to be fetched + # @param [Hash] opts the optional parameters + # @return [Order] + def self.get_order_by_id(order_id, opts = {}) + + # verify the required parameter 'order_id' is set + raise "Missing the required parameter 'order_id' when calling get_order_by_id" if order_id.nil? + + + # resource path + path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = [] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + obj = Order.new() and obj.build_from_hash(response) + end + + + # Delete purchase order by ID + # For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + # @param order_id ID of the order that needs to be deleted + # @param [Hash] opts the optional parameters + # @return [nil] + def self.delete_order(order_id, opts = {}) + + # verify the required parameter 'order_id' is set + raise "Missing the required parameter 'order_id' when calling delete_order" if order_id.nil? + + + # resource path + path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = [] + Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + end - end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb b/samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb index a3a57503b01..72ecae9f26b 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb @@ -1,316 +1,325 @@ require "uri" module SwaggerClient - class UserApi + class UserApi basePath = "http://petstore.swagger.io/v2" # apiInvoker = APIInvoker - - # Create user - # This can only be done by the logged in user. - # @param [Hash] opts the optional parameters - # @option opts [User] :body Created user object - # @return [nil] - def self.create_user(opts = {}) - - - # resource path - path = "/user".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = [] - Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Creates list of users with given input array - # - # @param [Hash] opts the optional parameters - # @option opts [array[User]] :body List of user object - # @return [nil] - def self.create_users_with_array_input(opts = {}) - - - # resource path - path = "/user/createWithArray".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = [] - Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Creates list of users with given input array - # - # @param [Hash] opts the optional parameters - # @option opts [array[User]] :body List of user object - # @return [nil] - def self.create_users_with_list_input(opts = {}) - - - # resource path - path = "/user/createWithList".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = [] - Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Logs user into the system - # - # @param [Hash] opts the optional parameters - # @option opts [string] :username The user name for login - # @option opts [string] :password The password for login in clear text - # @return [string] - def self.login_user(opts = {}) - - - # resource path - path = "/user/login".sub('{format}','json') - - # query parameters - query_params = {} - query_params[:'username'] = opts[:'username'] if opts[:'username'] - query_params[:'password'] = opts[:'password'] if opts[:'password'] - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = [] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - obj = string.new() and obj.build_from_hash(response) - end - - # Logs out current logged in user session - # - # @param [Hash] opts the optional parameters - # @return [nil] - def self.logout_user(opts = {}) - - - # resource path - path = "/user/logout".sub('{format}','json') - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = [] - Swagger::Request.new(:GET, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Get user by user name - # - # @param username The name that needs to be fetched. Use user1 for testing. - # @param [Hash] opts the optional parameters - # @return [User] - def self.get_user_by_name(username, opts = {}) - - # verify the required parameter 'username' is set - raise "Missing the required parameter 'username' when calling get_user_by_name" if username.nil? - - - # resource path - path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = [] - response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body - obj = User.new() and obj.build_from_hash(response) - end - - # Updated user - # This can only be done by the logged in user. - # @param username name that need to be deleted - # @param [Hash] opts the optional parameters - # @option opts [User] :body Updated user object - # @return [nil] - def self.update_user(username, opts = {}) - - # verify the required parameter 'username' is set - raise "Missing the required parameter 'username' when calling update_user" if username.nil? - - - # resource path - path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = Swagger::Request.object_to_http_body(opts[:'body']) - - - auth_names = [] - Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil - end - - # Delete user - # This can only be done by the logged in user. - # @param username The name that needs to be deleted - # @param [Hash] opts the optional parameters - # @return [nil] - def self.delete_user(username, opts = {}) - - # verify the required parameter 'username' is set - raise "Missing the required parameter 'username' when calling delete_user" if username.nil? - - - # resource path - path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s) - - # query parameters - query_params = {} - - # header parameters - header_params = {} - - # HTTP header 'Accept' (if needed) - _header_accept = ['application/json', 'application/xml'] - _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result - - # HTTP header 'Content-Type' - _header_content_type = [] - header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) - - # form parameters - form_params = {} - - # http body (model) - post_body = nil - - - auth_names = [] - Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make - nil + + + # Create user + # This can only be done by the logged in user. + # @param [Hash] opts the optional parameters + # @option opts [User] :body Created user object + # @return [nil] + def self.create_user(opts = {}) + + + # resource path + path = "/user".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = [] + Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Creates list of users with given input array + # + # @param [Hash] opts the optional parameters + # @option opts [array[User]] :body List of user object + # @return [nil] + def self.create_users_with_array_input(opts = {}) + + + # resource path + path = "/user/createWithArray".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = [] + Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Creates list of users with given input array + # + # @param [Hash] opts the optional parameters + # @option opts [array[User]] :body List of user object + # @return [nil] + def self.create_users_with_list_input(opts = {}) + + + # resource path + path = "/user/createWithList".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = [] + Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Logs user into the system + # + # @param [Hash] opts the optional parameters + # @option opts [string] :username The user name for login + # @option opts [string] :password The password for login in clear text + # @return [string] + def self.login_user(opts = {}) + + + # resource path + path = "/user/login".sub('{format}','json') + + # query parameters + query_params = {} + query_params[:'username'] = opts[:'username'] if opts[:'username'] + query_params[:'password'] = opts[:'password'] if opts[:'password'] + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = [] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + obj = string.new() and obj.build_from_hash(response) + end + + + # Logs out current logged in user session + # + # @param [Hash] opts the optional parameters + # @return [nil] + def self.logout_user(opts = {}) + + + # resource path + path = "/user/logout".sub('{format}','json') + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = [] + Swagger::Request.new(:GET, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Get user by user name + # + # @param username The name that needs to be fetched. Use user1 for testing. + # @param [Hash] opts the optional parameters + # @return [User] + def self.get_user_by_name(username, opts = {}) + + # verify the required parameter 'username' is set + raise "Missing the required parameter 'username' when calling get_user_by_name" if username.nil? + + + # resource path + path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = [] + response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body + obj = User.new() and obj.build_from_hash(response) + end + + + # Updated user + # This can only be done by the logged in user. + # @param username name that need to be deleted + # @param [Hash] opts the optional parameters + # @option opts [User] :body Updated user object + # @return [nil] + def self.update_user(username, opts = {}) + + # verify the required parameter 'username' is set + raise "Missing the required parameter 'username' when calling update_user" if username.nil? + + + # resource path + path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = Swagger::Request.object_to_http_body(opts[:'body']) + + + auth_names = [] + Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + + + # Delete user + # This can only be done by the logged in user. + # @param username The name that needs to be deleted + # @param [Hash] opts the optional parameters + # @return [nil] + def self.delete_user(username, opts = {}) + + # verify the required parameter 'username' is set + raise "Missing the required parameter 'username' when calling delete_user" if username.nil? + + + # resource path + path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s) + + # query parameters + query_params = {} + + # header parameters + header_params = {} + + # HTTP header 'Accept' (if needed) + _header_accept = ['application/json', 'application/xml'] + _header_accept_result = Swagger::Request.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result + + # HTTP header 'Content-Type' + _header_content_type = [] + header_params['Content-Type'] = Swagger::Request.select_header_content_type(_header_content_type) + + # form parameters + form_params = {} + + # http body (model) + post_body = nil + + + auth_names = [] + Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make + nil + end + end - end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb b/samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb index 642e4769e55..93354b7f1dc 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb @@ -1,83 +1,83 @@ module SwaggerClient - # base class containing fundamental method such as to_hash, build_from_hash and more - class BaseObject +# base class containing fundamental method such as to_hash, build_from_hash and more +class BaseObject - # return the object in the form of hash - def to_body - body = {} - self.class.attribute_map.each_pair do |key, value| - body[value] = self.send(key) unless self.send(key).nil? - end - body - end +# return the object in the form of hash +def to_body +body = {} +self.class.attribute_map.each_pair do |key, value| +body[value] = self.send(key) unless self.send(key).nil? +end +body +end - # build the object from hash - def build_from_hash(attributes) - return nil unless attributes.is_a?(Hash) - self.class.swagger_types.each_pair do |key, type| - if type =~ /^array\[(.*)\]/i - if attributes[self.class.attribute_map[key]].is_a?(Array) - self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } ) - else - #TODO show warning in debug mode - end - elsif !attributes[self.class.attribute_map[key]].nil? - self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) - else - # data not found in attributes(hash), not an issue as the data can be optional - end - end +# build the object from hash +def build_from_hash(attributes) +return nil unless attributes.is_a?(Hash) +self.class.swagger_types.each_pair do |key, type| +if type =~ /^array\[(.*)\]/i +if attributes[self.class.attribute_map[key]].is_a?(Array) +self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } ) +else +#TODO show warning in debug mode +end +elsif !attributes[self.class.attribute_map[key]].nil? +self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) +else +# data not found in attributes(hash), not an issue as the data can be optional +end +end - self - end +self +end - def _deserialize(type, value) - case type.to_sym - when :DateTime - DateTime.parse(value) - when :string - value.to_s - when :int - value.to_i - when :double - value.to_f - when :boolean - if value =~ /^(true|t|yes|y|1)$/i - true - else - false - end - else # model - _model = SwaggerClient.const_get(type).new - _model.build_from_hash(value) - end - end +def _deserialize(type, value) +case type.to_sym +when :DateTime +DateTime.parse(value) +when :string +value.to_s +when :int +value.to_i +when :double +value.to_f +when :boolean +if value =~ /^(true|t|yes|y|1)$/i +true +else +false +end +else # model +_model = SwaggerClient.const_get(type).new +_model.build_from_hash(value) +end +end - # to_body is an alias to to_body (backward compatibility) - def to_hash - hash = {} - self.class.attribute_map.each_pair do |key, value| - if self.send(key).is_a?(Array) - next if self.send(key).empty? - hash[value] = self.send(key).select{|v| !v.nil?}.map{ |v| _to_hash v} unless self.send(key).nil? - else - unless (_tmp_value = _to_hash self.send(key)).nil? - hash[value] = _tmp_value - end - end - end - hash - end +# to_body is an alias to to_body (backward compatibility) +def to_hash +hash = {} +self.class.attribute_map.each_pair do |key, value| +if self.send(key).is_a?(Array) +next if self.send(key).empty? +hash[value] = self.send(key).select{|v| !v.nil?}.map{ |v| _to_hash v} unless self.send(key).nil? +else +unless (_tmp_value = _to_hash self.send(key)).nil? +hash[value] = _tmp_value +end +end +end +hash +end - # 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 - value.to_hash - else - value - end - end +# 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 +value.to_hash +else +value +end +end - end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/category.rb b/samples/client/petstore/ruby/lib/swagger_client/models/category.rb index fe195c7ac87..08b3b9e8d46 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/models/category.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/models/category.rb @@ -1,44 +1,37 @@ module SwaggerClient # class Category < BaseObject - attr_accessor :id, :name - # attribute mapping from ruby-style variable name to JSON key - def self.attribute_map - { - - # - :'id' => :'id', - - # - :'name' => :'name' - - } - end +attr_accessor :id, :name +# attribute mapping from ruby-style variable name to JSON key +def self.attribute_map +{ + # + :'id' => :'id', + # + :'name' => :'name' +} +end - # attribute type - def self.swagger_types - { - :'id' => :'int', - :'name' => :'string' - - } - end +# attribute type +def self.swagger_types +{ +:'id' => :'int', +:'name' => :'string' +} +end - def initialize(attributes = {}) - return if !attributes.is_a?(Hash) || attributes.empty? +def initialize(attributes = {}) +return if !attributes.is_a?(Hash) || attributes.empty? - # convert string to symbol for hash key - attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} +# convert string to symbol for hash key +attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} - - if attributes[:'id'] - @id = attributes[:'id'] - end - - if attributes[:'name'] - @name = attributes[:'name'] - end - + if attributes[:'id'] + @id = attributes[:'id'] end - end + if attributes[:'name'] + @name = attributes[:'name'] + end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/order.rb b/samples/client/petstore/ruby/lib/swagger_client/models/order.rb index 3fe0282ed9b..faf62fb6a2f 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/models/order.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/models/order.rb @@ -1,76 +1,61 @@ module SwaggerClient # class Order < BaseObject - attr_accessor :id, :pet_id, :quantity, :ship_date, :status, :complete - # attribute mapping from ruby-style variable name to JSON key - def self.attribute_map - { - - # - :'id' => :'id', - - # - :'pet_id' => :'petId', - - # - :'quantity' => :'quantity', - - # - :'ship_date' => :'shipDate', - - # Order Status - :'status' => :'status', - - # - :'complete' => :'complete' - - } - end +attr_accessor :id, :pet_id, :quantity, :ship_date, :status, :complete +# attribute mapping from ruby-style variable name to JSON key +def self.attribute_map +{ + # + :'id' => :'id', + # + :'pet_id' => :'petId', + # + :'quantity' => :'quantity', + # + :'ship_date' => :'shipDate', + # Order Status + :'status' => :'status', + # + :'complete' => :'complete' +} +end - # attribute type - def self.swagger_types - { - :'id' => :'int', - :'pet_id' => :'int', - :'quantity' => :'int', - :'ship_date' => :'DateTime', - :'status' => :'string', - :'complete' => :'boolean' - - } - end +# attribute type +def self.swagger_types +{ +:'id' => :'int', +:'pet_id' => :'int', +:'quantity' => :'int', +:'ship_date' => :'DateTime', +:'status' => :'string', +:'complete' => :'boolean' +} +end - def initialize(attributes = {}) - return if !attributes.is_a?(Hash) || attributes.empty? +def initialize(attributes = {}) +return if !attributes.is_a?(Hash) || attributes.empty? - # convert string to symbol for hash key - attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} +# convert string to symbol for hash key +attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} - - if attributes[:'id'] - @id = attributes[:'id'] - end - - if attributes[:'petId'] - @pet_id = attributes[:'petId'] - end - - if attributes[:'quantity'] - @quantity = attributes[:'quantity'] - end - - if attributes[:'shipDate'] - @ship_date = attributes[:'shipDate'] - end - - if attributes[:'status'] - @status = attributes[:'status'] - end - - if attributes[:'complete'] - @complete = attributes[:'complete'] - end - + if attributes[:'id'] + @id = attributes[:'id'] + end + if attributes[:'petId'] + @pet_id = attributes[:'petId'] + end + if attributes[:'quantity'] + @quantity = attributes[:'quantity'] end - end + if attributes[:'shipDate'] + @ship_date = attributes[:'shipDate'] + end + if attributes[:'status'] + @status = attributes[:'status'] + end + if attributes[:'complete'] + @complete = attributes[:'complete'] + end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/pet.rb b/samples/client/petstore/ruby/lib/swagger_client/models/pet.rb index 32f95646c72..561f4a9ed7a 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/models/pet.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/models/pet.rb @@ -1,80 +1,65 @@ module SwaggerClient # class Pet < BaseObject - attr_accessor :id, :category, :name, :photo_urls, :tags, :status - # attribute mapping from ruby-style variable name to JSON key - def self.attribute_map - { - - # - :'id' => :'id', - - # - :'category' => :'category', - - # - :'name' => :'name', - - # - :'photo_urls' => :'photoUrls', - - # - :'tags' => :'tags', - - # pet status in the store - :'status' => :'status' - - } - end +attr_accessor :id, :category, :name, :photo_urls, :tags, :status +# attribute mapping from ruby-style variable name to JSON key +def self.attribute_map +{ + # + :'id' => :'id', + # + :'category' => :'category', + # + :'name' => :'name', + # + :'photo_urls' => :'photoUrls', + # + :'tags' => :'tags', + # pet status in the store + :'status' => :'status' +} +end - # attribute type - def self.swagger_types - { - :'id' => :'int', - :'category' => :'Category', - :'name' => :'string', - :'photo_urls' => :'array[string]', - :'tags' => :'array[Tag]', - :'status' => :'string' - - } - end +# attribute type +def self.swagger_types +{ +:'id' => :'int', +:'category' => :'Category', +:'name' => :'string', +:'photo_urls' => :'array[string]', +:'tags' => :'array[Tag]', +:'status' => :'string' +} +end - def initialize(attributes = {}) - return if !attributes.is_a?(Hash) || attributes.empty? +def initialize(attributes = {}) +return if !attributes.is_a?(Hash) || attributes.empty? - # convert string to symbol for hash key - attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} +# convert string to symbol for hash key +attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} - - if attributes[:'id'] - @id = attributes[:'id'] - end - - if attributes[:'category'] - @category = attributes[:'category'] - end - - if attributes[:'name'] - @name = attributes[:'name'] - end - - if attributes[:'photoUrls'] - if (value = attributes[:'photoUrls']).is_a?(Array) - @photo_urls = value - end - end - - if attributes[:'tags'] - if (value = attributes[:'tags']).is_a?(Array) - @tags = value - end - end - - if attributes[:'status'] - @status = attributes[:'status'] - end - + if attributes[:'id'] + @id = attributes[:'id'] + end + if attributes[:'category'] + @category = attributes[:'category'] + end + if attributes[:'name'] + @name = attributes[:'name'] + end + if attributes[:'photoUrls'] + if (value = attributes[:'photoUrls']).is_a?(Array) + @photo_urls = value end - end + end + if attributes[:'tags'] + if (value = attributes[:'tags']).is_a?(Array) + @tags = value + end + end + if attributes[:'status'] + @status = attributes[:'status'] + end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/tag.rb b/samples/client/petstore/ruby/lib/swagger_client/models/tag.rb index 9c5cdde1af6..6c66fbe4dc5 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/models/tag.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/models/tag.rb @@ -1,44 +1,37 @@ module SwaggerClient # class Tag < BaseObject - attr_accessor :id, :name - # attribute mapping from ruby-style variable name to JSON key - def self.attribute_map - { - - # - :'id' => :'id', - - # - :'name' => :'name' - - } - end +attr_accessor :id, :name +# attribute mapping from ruby-style variable name to JSON key +def self.attribute_map +{ + # + :'id' => :'id', + # + :'name' => :'name' +} +end - # attribute type - def self.swagger_types - { - :'id' => :'int', - :'name' => :'string' - - } - end +# attribute type +def self.swagger_types +{ +:'id' => :'int', +:'name' => :'string' +} +end - def initialize(attributes = {}) - return if !attributes.is_a?(Hash) || attributes.empty? +def initialize(attributes = {}) +return if !attributes.is_a?(Hash) || attributes.empty? - # convert string to symbol for hash key - attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} +# convert string to symbol for hash key +attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} - - if attributes[:'id'] - @id = attributes[:'id'] - end - - if attributes[:'name'] - @name = attributes[:'name'] - end - + if attributes[:'id'] + @id = attributes[:'id'] end - end + if attributes[:'name'] + @name = attributes[:'name'] + end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/user.rb b/samples/client/petstore/ruby/lib/swagger_client/models/user.rb index 2d723da54c4..910bd70d726 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/models/user.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/models/user.rb @@ -1,92 +1,73 @@ module SwaggerClient # class User < BaseObject - attr_accessor :id, :username, :first_name, :last_name, :email, :password, :phone, :user_status - # attribute mapping from ruby-style variable name to JSON key - def self.attribute_map - { - - # - :'id' => :'id', - - # - :'username' => :'username', - - # - :'first_name' => :'firstName', - - # - :'last_name' => :'lastName', - - # - :'email' => :'email', - - # - :'password' => :'password', - - # - :'phone' => :'phone', - - # User Status - :'user_status' => :'userStatus' - - } - end +attr_accessor :id, :username, :first_name, :last_name, :email, :password, :phone, :user_status +# attribute mapping from ruby-style variable name to JSON key +def self.attribute_map +{ + # + :'id' => :'id', + # + :'username' => :'username', + # + :'first_name' => :'firstName', + # + :'last_name' => :'lastName', + # + :'email' => :'email', + # + :'password' => :'password', + # + :'phone' => :'phone', + # User Status + :'user_status' => :'userStatus' +} +end - # attribute type - def self.swagger_types - { - :'id' => :'int', - :'username' => :'string', - :'first_name' => :'string', - :'last_name' => :'string', - :'email' => :'string', - :'password' => :'string', - :'phone' => :'string', - :'user_status' => :'int' - - } - end +# attribute type +def self.swagger_types +{ +:'id' => :'int', +:'username' => :'string', +:'first_name' => :'string', +:'last_name' => :'string', +:'email' => :'string', +:'password' => :'string', +:'phone' => :'string', +:'user_status' => :'int' +} +end - def initialize(attributes = {}) - return if !attributes.is_a?(Hash) || attributes.empty? +def initialize(attributes = {}) +return if !attributes.is_a?(Hash) || attributes.empty? - # convert string to symbol for hash key - attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} +# convert string to symbol for hash key +attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} - - if attributes[:'id'] - @id = attributes[:'id'] - end - - if attributes[:'username'] - @username = attributes[:'username'] - end - - if attributes[:'firstName'] - @first_name = attributes[:'firstName'] - end - - if attributes[:'lastName'] - @last_name = attributes[:'lastName'] - end - - if attributes[:'email'] - @email = attributes[:'email'] - end - - if attributes[:'password'] - @password = attributes[:'password'] - end - - if attributes[:'phone'] - @phone = attributes[:'phone'] - end - - if attributes[:'userStatus'] - @user_status = attributes[:'userStatus'] - end - + if attributes[:'id'] + @id = attributes[:'id'] + end + if attributes[:'username'] + @username = attributes[:'username'] + end + if attributes[:'firstName'] + @first_name = attributes[:'firstName'] + end + if attributes[:'lastName'] + @last_name = attributes[:'lastName'] end - end + if attributes[:'email'] + @email = attributes[:'email'] + end + if attributes[:'password'] + @password = attributes[:'password'] + end + if attributes[:'phone'] + @phone = attributes[:'phone'] + end + if attributes[:'userStatus'] + @user_status = attributes[:'userStatus'] + end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/monkey.rb b/samples/client/petstore/ruby/lib/swagger_client/monkey.rb index 28932890af9..f400813974f 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/monkey.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/monkey.rb @@ -1,90 +1,90 @@ # module Swagger - class Object - - unless Object.method_defined? :blank? - def blank? - respond_to?(:empty?) ? empty? : !self - end - end - - unless Object.method_defined? :present? - def present? - !blank? - end - end +class Object - end +unless Object.method_defined? :blank? +def blank? +respond_to?(:empty?) ? empty? : !self +end +end - class String +unless Object.method_defined? :present? +def present? +!blank? +end +end - unless String.method_defined? :underscore - def underscore - self.gsub(/::/, '/'). - gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). - gsub(/([a-z\d])([A-Z])/,'\1_\2'). - tr("-", "_"). - downcase - end - end - - unless String.method_defined? :camelize - def camelize(first_letter_in_uppercase = true) - if first_letter_in_uppercase != :lower - self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } - else - self.to_s[0].chr.downcase + camelize(self)[1..-1] - end - end - end +end - end +class String - class Hash +unless String.method_defined? :underscore +def underscore +self.gsub(/::/, '/'). +gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). +gsub(/([a-z\d])([A-Z])/,'\1_\2'). +tr("-", "_"). +downcase +end +end - unless Hash.method_defined? :stringify_keys - def stringify_keys - inject({}) do |options, (key, value)| - options[key.to_s] = value - options - end - end - end - - unless Hash.method_defined? :stringify_keys! - def stringify_keys! - self.replace(self.stringify_keys) - end - end +unless String.method_defined? :camelize +def camelize(first_letter_in_uppercase = true) +if first_letter_in_uppercase != :lower +self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } +else +self.to_s[0].chr.downcase + camelize(self)[1..-1] +end +end +end - unless Hash.method_defined? :symbolize_keys - def symbolize_keys - inject({}) do |options, (key, value)| - options[(key.to_sym rescue key) || key] = value - options - end - end - end - - unless Hash.method_defined? :symbolize_keys! - def symbolize_keys! - self.replace(self.symbolize_keys) - end - end +end - unless Hash.method_defined? :symbolize_and_underscore_keys - def symbolize_and_underscore_keys - inject({}) do |options, (key, value)| - options[(key.to_s.underscore.to_sym rescue key) || key] = value - options - end - end - end +class Hash - unless Hash.method_defined? :symbolize_and_underscore_keys! - def symbolize_and_underscore_keys! - self.replace(self.symbolize_and_underscore_keys) - end - end - - end +unless Hash.method_defined? :stringify_keys +def stringify_keys +inject({}) do |options, (key, value)| +options[key.to_s] = value +options +end +end +end + +unless Hash.method_defined? :stringify_keys! +def stringify_keys! +self.replace(self.stringify_keys) +end +end + +unless Hash.method_defined? :symbolize_keys +def symbolize_keys +inject({}) do |options, (key, value)| +options[(key.to_sym rescue key) || key] = value +options +end +end +end + +unless Hash.method_defined? :symbolize_keys! +def symbolize_keys! +self.replace(self.symbolize_keys) +end +end + +unless Hash.method_defined? :symbolize_and_underscore_keys +def symbolize_and_underscore_keys +inject({}) do |options, (key, value)| +options[(key.to_s.underscore.to_sym rescue key) || key] = value +options +end +end +end + +unless Hash.method_defined? :symbolize_and_underscore_keys! +def symbolize_and_underscore_keys! +self.replace(self.symbolize_and_underscore_keys) +end +end + +end # end \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger.rb index 2e2632c169d..1820bbfcc9e 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/swagger.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/swagger.rb @@ -2,77 +2,77 @@ require 'json' module SwaggerClient - module Swagger - class << self - attr_accessor :logger - - # A Swagger configuration object. Must act like a hash and return sensible - # values for all Swagger configuration options. See Swagger::Configuration. - attr_accessor :configuration - - attr_accessor :resources - - # Call this method to modify defaults in your initializers. - # - # @example - # Swagger.configure do |config| - # config.api_key['api_key'] = '1234567890abcdef' # api key authentication - # config.username = 'wordlover' # http basic authentication - # config.password = 'i<3words' # http basic authentication - # config.format = 'json' # optional, defaults to 'json' - # end - # - def configure - yield(configuration) if block_given? - - # Configure logger. Default to use Rails - self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT)) - - # remove :// from scheme - configuration.scheme.sub!(/:\/\//, '') - - # remove http(s):// and anything after a slash - configuration.host.sub!(/https?:\/\//, '') - configuration.host = configuration.host.split('/').first - - # Add leading and trailing slashes to base_path - configuration.base_path = "/#{configuration.base_path}".gsub(/\/+/, '/') - configuration.base_path = "" if configuration.base_path == "/" - end - - def authenticated? - Swagger.configuration.auth_token.present? - end - - def de_authenticate - Swagger.configuration.auth_token = nil - end - - def authenticate - return if Swagger.authenticated? - - if Swagger.configuration.username.blank? || Swagger.configuration.password.blank? - raise ClientError, "Username and password are required to authenticate." - end - - request = Swagger::Request.new( - :get, - "account/authenticate/{username}", - :params => { - :username => Swagger.configuration.username, - :password => Swagger.configuration.password - } - ) - - response_body = request.response.body - Swagger.configuration.auth_token = response_body['token'] - end - end - end - - class ServerError < StandardError - end - - class ClientError < StandardError - end +module Swagger +class << self +attr_accessor :logger + +# A Swagger configuration object. Must act like a hash and return sensible +# values for all Swagger configuration options. See Swagger::Configuration. +attr_accessor :configuration + +attr_accessor :resources + +# Call this method to modify defaults in your initializers. +# +# @example +# Swagger.configure do |config| +# config.api_key['api_key'] = '1234567890abcdef' # api key authentication +# config.username = 'wordlover' # http basic authentication +# config.password = 'i<3words' # http basic authentication +# config.format = 'json' # optional, defaults to 'json' +# end +# +def configure +yield(configuration) if block_given? + +# Configure logger. Default to use Rails +self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT)) + +# remove :// from scheme +configuration.scheme.sub!(/:\/\//, '') + +# remove http(s):// and anything after a slash +configuration.host.sub!(/https?:\/\//, '') +configuration.host = configuration.host.split('/').first + +# Add leading and trailing slashes to base_path +configuration.base_path = "/#{configuration.base_path}".gsub(/\/+/, '/') +configuration.base_path = "" if configuration.base_path == "/" +end + +def authenticated? +Swagger.configuration.auth_token.present? +end + +def de_authenticate +Swagger.configuration.auth_token = nil +end + +def authenticate +return if Swagger.authenticated? + +if Swagger.configuration.username.blank? || Swagger.configuration.password.blank? +raise ClientError, "Username and password are required to authenticate." +end + +request = Swagger::Request.new( +:get, +"account/authenticate/{username}", +:params => { +:username => Swagger.configuration.username, +:password => Swagger.configuration.password +} +) + +response_body = request.response.body +Swagger.configuration.auth_token = response_body['token'] +end +end +end + +class ServerError < StandardError +end + +class ClientError < StandardError +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb index a2d4fe0e291..023242c9cd5 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb @@ -1,29 +1,29 @@ module SwaggerClient - module Swagger - class Configuration - attr_accessor :format, :api_key, :api_key_prefix, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params, :user_agent, :verify_ssl +module Swagger +class Configuration +attr_accessor :format, :api_key, :api_key_prefix, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params, :user_agent, :verify_ssl - # Defaults go in here.. - def initialize - @format = 'json' - @scheme = 'http' - @host = 'petstore.swagger.io' - @base_path = '/v2' - @user_agent = "ruby-swagger-#{Swagger::VERSION}" - @inject_format = false - @force_ending_format = false - @camelize_params = true +# Defaults go in here.. +def initialize +@format = 'json' +@scheme = 'http' +@host = 'petstore.swagger.io' +@base_path = '/v2' +@user_agent = "ruby-swagger-#{Swagger::VERSION}" +@inject_format = false +@force_ending_format = false +@camelize_params = true - # keys for API key authentication (param-name => api-key) - @api_key = {} - # api-key prefix for API key authentication, e.g. "Bearer" (param-name => api-key-prefix) - @api_key_prefix = {} +# keys for API key authentication (param-name => api-key) +@api_key = {} +# api-key prefix for API key authentication, e.g. "Bearer" (param-name => api-key-prefix) +@api_key_prefix = {} - # whether to verify SSL certificate, default to true - # Note: do NOT set it to false in production code, otherwise you would - # face multiple types of cryptographic attacks - @verify_ssl = true - end - end - end +# whether to verify SSL certificate, default to true +# Note: do NOT set it to false in production code, otherwise you would +# face multiple types of cryptographic attacks +@verify_ssl = true +end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb index 4cd5d84b0b9..f3a15971682 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb @@ -1,271 +1,270 @@ module SwaggerClient - module Swagger - class Request - require 'uri' - require 'addressable/uri' - require 'typhoeus' - - attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names - - # All requests must have an HTTP method and a path - # Optionals parameters are :params, :headers, :body, :format, :host - def initialize(http_method, path, attributes={}) - attributes[:format] ||= Swagger.configuration.format - attributes[:params] ||= {} - - # Set default headers - default_headers = { - 'Content-Type' => "application/#{attributes[:format].downcase}", - 'User-Agent' => Swagger.configuration.user_agent - } - - # Merge argument headers into defaults - attributes[:headers] = default_headers.merge(attributes[:headers] || {}) - - # Stick in the auth token if there is one - if Swagger.authenticated? - attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token}) - end - - self.http_method = http_method.to_sym - self.path = path - attributes.each do |name, value| - send("#{name.to_s.underscore.to_sym}=", value) - end - - update_params_for_auth! - end - - # Update hearder and query params based on authentication settings. - def update_params_for_auth! - (@auth_names || []).each do |auth_name| - case auth_name - when 'api_key' - @headers ||= {} - @headers['api_key'] = get_api_key_with_prefix('api_key') - when 'petstore_auth' - # TODO: support oauth - - end - end - end - - # Get API key (with prefix if set). - # @param [String] param_name the parameter name of API key auth - def get_api_key_with_prefix(param_name) - if Swagger.configuration.api_key_prefix[param_name].present? - "#{Swagger.configuration.api_key_prefix[param_name]} #{Swagger.configuration.api_key[param_name]}" - else - Swagger.configuration.api_key[param_name] - end - end - - # Construct a base URL - def url(options = {}) - u = Addressable::URI.new( - :scheme => Swagger.configuration.scheme, - :host => Swagger.configuration.host, - :path => self.interpreted_path, - :query => self.query_string.sub(/\?/, '') - ).to_s - - # Drop trailing question mark, if present - u.sub! /\?$/, '' - - u - end - - # Iterate over the params hash, injecting any path values into the path string - # e.g. /word.{format}/{word}/entries => /word.json/cat/entries - def interpreted_path - p = self.path.dup - - # Stick a .{format} placeholder into the path if there isn't - # one already or an actual format like json or xml - # e.g. /words/blah => /words.{format}/blah - if Swagger.configuration.inject_format - unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } - p = p.sub(/^(\/?\w+)/, "\\1.#{format}") - end - end - - # Stick a .{format} placeholder on the end of the path if there isn't - # one already or an actual format like json or xml - # e.g. /words/blah => /words/blah.{format} - if Swagger.configuration.force_ending_format - unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } - p = "#{p}.#{format}" - end - end - - p = p.sub("{format}", self.format.to_s) - - URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/') - end - - # Massage the request body into a state of readiness - # If body is a hash, camelize all keys then convert to a json string - def body=(value) - if value.is_a?(Hash) - value = value.inject({}) do |memo, (k,v)| - memo[k.to_s.camelize(:lower).to_sym] = v - memo - end - end - @body = value - end - - # If body is an object, JSONify it before making the actual request. - # For form parameters, remove empty value - def outgoing_body - # http form - if headers['Content-Type'] == 'application/x-www-form-urlencoded' - data = form_params.dup - data.each do |key, value| - data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter - end - data - elsif @body # http body is JSON - @body.is_a?(String) ? @body : @body.to_json - else - nil - end - end - - # Construct a query string from the query-string-type params - def query_string - # Iterate over all params, - # .. removing the ones that are part of the path itself. - # .. stringifying values so Addressable doesn't blow up. - query_values = {} - self.params.each_pair do |key, value| - next if self.path.include? "{#{key}}" # skip path params - next if value.blank? && value.class != FalseClass # skip empties - if Swagger.configuration.camelize_params - key = key.to_s.camelize(:lower).to_sym - end - query_values[key] = value.to_s - end - - # We don't want to end up with '?' as our query string - # if there aren't really any params - return "" if query_values.blank? - - # Addressable requires query_values to be set after initialization.. - qs = Addressable::URI.new - qs.query_values = query_values - qs.to_s - end - - def make - #TODO use configuration setting to determine if debugging - #logger = Logger.new STDOUT - #logger.debug self.url - - request_options = { - :ssl_verifypeer => Swagger.configuration.verify_ssl, - :headers => self.headers.stringify_keys - } - response = case self.http_method.to_sym - when :get,:GET - Typhoeus::Request.get( - self.url, - request_options - ) - - when :post,:POST - Typhoeus::Request.post( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - - when :patch,:PATCH - Typhoeus::Request.patch( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - - when :put,:PUT - Typhoeus::Request.put( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - - when :delete,:DELETE - Typhoeus::Request.delete( - self.url, - request_options.merge(:body => self.outgoing_body) - ) - end - Response.new(response) - end - - def response - self.make - end - - def response_code_pretty - return unless @response.present? - @response.code.to_s - end - - def response_headers_pretty - return unless @response.present? - # JSON.pretty_generate(@response.headers).gsub(/\n/, '
      ') # <- This was for RestClient - @response.headers.gsub(/\n/, '
      ') # <- This is for Typhoeus - end - - # return 'Accept' based on an array of accept provided - # @param [Array] header_accept_array Array fo 'Accept' - # @return String Accept (e.g. application/json) - def self.select_header_accept header_accept_array - if header_accept_array.empty? - return - elsif header_accept_array.any?{ |s| s.casecmp('application/json')==0 } - 'application/json' # look for json data by default - else - header_accept_array.join(',') - end - end - - # return the content type based on an array of content-type provided - # @param [Array] content_type_array Array fo content-type - # @return String Content-Type (e.g. application/json) - def self.select_header_content_type content_type_array - if content_type_array.empty? - 'application/json' # use application/json by default - elsif content_type_array.any?{ |s| s.casecmp('application/json')==0 } - 'application/json' # use application/json if it's included - else - content_type_array[0]; # otherwise, use the first one - end - end - - # static method to convert object (array, hash, object, etc) to JSON string - # @param model object to be converted into JSON string - # @return string JSON string representation of the object - def self.object_to_http_body model - return if model.nil? - _body = nil - if model.is_a?(Array) - _body = model.map{|m| object_to_hash(m) } - else - _body = object_to_hash(model) - end - _body.to_json - end - - # static method to convert object(non-array) to hash - # @param obj object to be converted into JSON string - # @return string JSON string representation of the object - def self.object_to_hash obj - if obj.respond_to?(:to_hash) - obj.to_hash - else - obj - end - end - - end - end +module Swagger +class Request +require 'uri' +require 'addressable/uri' +require 'typhoeus' + +attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names + +# All requests must have an HTTP method and a path +# Optionals parameters are :params, :headers, :body, :format, :host +def initialize(http_method, path, attributes={}) +attributes[:format] ||= Swagger.configuration.format +attributes[:params] ||= {} + +# Set default headers +default_headers = { +'Content-Type' => "application/#{attributes[:format].downcase}", +'User-Agent' => Swagger.configuration.user_agent +} + +# Merge argument headers into defaults +attributes[:headers] = default_headers.merge(attributes[:headers] || {}) + +# Stick in the auth token if there is one +if Swagger.authenticated? +attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token}) +end + +self.http_method = http_method.to_sym +self.path = path +attributes.each do |name, value| +send("#{name.to_s.underscore.to_sym}=", value) +end + +update_params_for_auth! +end + +# Update hearder and query params based on authentication settings. +def update_params_for_auth! +(@auth_names || []).each do |auth_name| +case auth_name +when 'api_key' +@headers ||= {} +@headers['api_key'] = get_api_key_with_prefix('api_key') +when 'petstore_auth' +# TODO: support oauth +end +end +end + +# Get API key (with prefix if set). +# @param [String] param_name the parameter name of API key auth +def get_api_key_with_prefix(param_name) +if Swagger.configuration.api_key_prefix[param_name].present? +"#{Swagger.configuration.api_key_prefix[param_name]} #{Swagger.configuration.api_key[param_name]}" +else +Swagger.configuration.api_key[param_name] +end +end + +# Construct a base URL +def url(options = {}) +u = Addressable::URI.new( +:scheme => Swagger.configuration.scheme, +:host => Swagger.configuration.host, +:path => self.interpreted_path, +:query => self.query_string.sub(/\?/, '') +).to_s + +# Drop trailing question mark, if present +u.sub! /\?$/, '' + +u +end + +# Iterate over the params hash, injecting any path values into the path string +# e.g. /word.{format}/{word}/entries => /word.json/cat/entries +def interpreted_path +p = self.path.dup + +# Stick a .{format} placeholder into the path if there isn't +# one already or an actual format like json or xml +# e.g. /words/blah => /words.{format}/blah +if Swagger.configuration.inject_format +unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } +p = p.sub(/^(\/?\w+)/, "\\1.#{format}") +end +end + +# Stick a .{format} placeholder on the end of the path if there isn't +# one already or an actual format like json or xml +# e.g. /words/blah => /words/blah.{format} +if Swagger.configuration.force_ending_format +unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s } +p = "#{p}.#{format}" +end +end + +p = p.sub("{format}", self.format.to_s) + +URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/') +end + +# Massage the request body into a state of readiness +# If body is a hash, camelize all keys then convert to a json string +def body=(value) +if value.is_a?(Hash) +value = value.inject({}) do |memo, (k,v)| +memo[k.to_s.camelize(:lower).to_sym] = v +memo +end +end +@body = value +end + +# If body is an object, JSONify it before making the actual request. +# For form parameters, remove empty value +def outgoing_body +# http form +if headers['Content-Type'] == 'application/x-www-form-urlencoded' +data = form_params.dup +data.each do |key, value| +data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter +end +data +elsif @body # http body is JSON +@body.is_a?(String) ? @body : @body.to_json +else +nil +end +end + +# Construct a query string from the query-string-type params +def query_string +# Iterate over all params, +# .. removing the ones that are part of the path itself. +# .. stringifying values so Addressable doesn't blow up. +query_values = {} +self.params.each_pair do |key, value| +next if self.path.include? "{#{key}}" # skip path params +next if value.blank? && value.class != FalseClass # skip empties +if Swagger.configuration.camelize_params +key = key.to_s.camelize(:lower).to_sym +end +query_values[key] = value.to_s +end + +# We don't want to end up with '?' as our query string +# if there aren't really any params +return "" if query_values.blank? + +# Addressable requires query_values to be set after initialization.. +qs = Addressable::URI.new +qs.query_values = query_values +qs.to_s +end + +def make +#TODO use configuration setting to determine if debugging +#logger = Logger.new STDOUT +#logger.debug self.url + +request_options = { +:ssl_verifypeer => Swagger.configuration.verify_ssl, +:headers => self.headers.stringify_keys +} +response = case self.http_method.to_sym +when :get,:GET +Typhoeus::Request.get( +self.url, +request_options +) + +when :post,:POST +Typhoeus::Request.post( +self.url, +request_options.merge(:body => self.outgoing_body) +) + +when :patch,:PATCH +Typhoeus::Request.patch( +self.url, +request_options.merge(:body => self.outgoing_body) +) + +when :put,:PUT +Typhoeus::Request.put( +self.url, +request_options.merge(:body => self.outgoing_body) +) + +when :delete,:DELETE +Typhoeus::Request.delete( +self.url, +request_options.merge(:body => self.outgoing_body) +) +end +Response.new(response) +end + +def response +self.make +end + +def response_code_pretty +return unless @response.present? +@response.code.to_s +end + +def response_headers_pretty +return unless @response.present? +# JSON.pretty_generate(@response.headers).gsub(/\n/, '
      ') # <- This was for RestClient +@response.headers.gsub(/\n/, '
      ') # <- This is for Typhoeus +end + +# return 'Accept' based on an array of accept provided +# @param [Array] header_accept_array Array fo 'Accept' +# @return String Accept (e.g. application/json) +def self.select_header_accept header_accept_array +if header_accept_array.empty? +return +elsif header_accept_array.any?{ |s| s.casecmp('application/json')==0 } +'application/json' # look for json data by default +else +header_accept_array.join(',') +end +end + +# return the content type based on an array of content-type provided +# @param [Array] content_type_array Array fo content-type +# @return String Content-Type (e.g. application/json) +def self.select_header_content_type content_type_array +if content_type_array.empty? +'application/json' # use application/json by default +elsif content_type_array.any?{ |s| s.casecmp('application/json')==0 } +'application/json' # use application/json if it's included +else +content_type_array[0]; # otherwise, use the first one +end +end + +# static method to convert object (array, hash, object, etc) to JSON string +# @param model object to be converted into JSON string +# @return string JSON string representation of the object +def self.object_to_http_body model +return if model.nil? +_body = nil +if model.is_a?(Array) +_body = model.map{|m| object_to_hash(m) } +else +_body = object_to_hash(model) +end +_body.to_json +end + +# static method to convert object(non-array) to hash +# @param obj object to be converted into JSON string +# @return string JSON string representation of the object +def self.object_to_hash obj +if obj.respond_to?(:to_hash) +obj.to_hash +else +obj +end +end + +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb index 538821bea69..d5eaf2edac0 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb @@ -1,70 +1,70 @@ module SwaggerClient - module Swagger - class Response - require 'json' +module Swagger +class Response +require 'json' - attr_accessor :raw +attr_accessor :raw - def initialize(raw) - self.raw = raw +def initialize(raw) +self.raw = raw - case self.code - when 500..510 then raise(ServerError, self.error_message) - when 299..426 then raise(ClientError, self.error_message) - end - end +case self.code +when 500..510 then raise(ServerError, self.error_message) +when 299..426 then raise(ClientError, self.error_message) +end +end - def code - raw.code - end +def code +raw.code +end - # Account for error messages that take different forms... - def error_message - body['message'] - rescue - body - end +# Account for error messages that take different forms... +def error_message +body['message'] +rescue +body +end - # If body is JSON, parse it - # Otherwise return raw string - def body - JSON.parse(raw.body, :symbolize_names => true) - rescue - raw.body - end +# If body is JSON, parse it +# Otherwise return raw string +def body +JSON.parse(raw.body, :symbolize_names => true) +rescue +raw.body +end - # `headers_hash` is a Typhoeus-specific extension of Hash, - # so simplify it back into a regular old Hash. - def headers - h = {} - raw.headers_hash.each {|k,v| h[k] = v } - h - end +# `headers_hash` is a Typhoeus-specific extension of Hash, +# so simplify it back into a regular old Hash. +def headers +h = {} +raw.headers_hash.each {|k,v| h[k] = v } +h +end - # Extract the response format from the header hash - # e.g. {'Content-Type' => 'application/json'} - def format - headers['Content-Type'].split("/").last.downcase - end +# Extract the response format from the header hash +# e.g. {'Content-Type' => 'application/json'} +def format +headers['Content-Type'].split("/").last.downcase +end - def json? - format == 'json' - end +def json? +format == 'json' +end - def xml? - format == 'xml' - end +def xml? +format == 'xml' +end - def pretty_body - return unless body.present? - case format - when 'json' then JSON.pretty_generate(body).gsub(/\n/, '
      ') - end - end +def pretty_body +return unless body.present? +case format +when 'json' then JSON.pretty_generate(body).gsub(/\n/, '
      ') +end +end - def pretty_headers - JSON.pretty_generate(headers).gsub(/\n/, '
      ') - end - end - end +def pretty_headers +JSON.pretty_generate(headers).gsub(/\n/, '
      ') +end +end +end end diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb index c6e8d5aee53..e869b16a807 100644 --- a/samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb +++ b/samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb @@ -1,5 +1,5 @@ module SwaggerClient - module Swagger - VERSION = "1.0.0" - end +module Swagger +VERSION = "1.0.0" +end end diff --git a/samples/client/petstore/ruby/pom.xml b/samples/client/petstore/ruby/pom.xml index 1d613f0a9c5..85b6268cc9e 100644 --- a/samples/client/petstore/ruby/pom.xml +++ b/samples/client/petstore/ruby/pom.xml @@ -1,60 +1,60 @@ - 4.0.0 - com.wordnik - RubyPetstoreClientTests - pom - 1.0-SNAPSHOT - Ruby Swagger Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - bundle-install - pre-integration-test - - exec - - - bundle - - install - - - - - bundle-test - integration-test - - exec - - - bundle - - exec - rspec - - - - - - - + 4.0.0 + com.wordnik + RubyPetstoreClientTests + pom + 1.0-SNAPSHOT + Ruby Swagger Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + bundle-install + pre-integration-test + + exec + + + bundle + + install + + + + + bundle-test + integration-test + + exec + + + bundle + + exec + rspec + + + + + + + diff --git a/samples/client/petstore/ruby/swagger_client.gemspec b/samples/client/petstore/ruby/swagger_client.gemspec index 6ec2484e05c..0b58b597765 100644 --- a/samples/client/petstore/ruby/swagger_client.gemspec +++ b/samples/client/petstore/ruby/swagger_client.gemspec @@ -3,30 +3,30 @@ $:.push File.expand_path("../lib", __FILE__) require "swagger_client/swagger/version" Gem::Specification.new do |s| - s.name = "swagger_client" - s.version = SwaggerClient::Swagger::VERSION - s.platform = Gem::Platform::RUBY - s.authors = ["Zeke Sikelianos", "Tony Tam"] - s.email = ["zeke@wordnik.com", "tony@wordnik.com"] - s.homepage = "http://developer.wordnik.com" - s.summary = %q{A ruby wrapper for the swagger APIs} - s.description = %q{This gem maps to a swagger API} - s.license = "Apache-2.0" +s.name = "swagger_client" +s.version = SwaggerClient::Swagger::VERSION +s.platform = Gem::Platform::RUBY +s.authors = ["Zeke Sikelianos", "Tony Tam"] +s.email = ["zeke@wordnik.com", "fehguy@gmail.com"] +s.homepage = "http://swagger.io" +s.summary = %q{A ruby wrapper for the swagger APIs} +s.description = %q{This gem maps to a swagger API} +s.license = "Apache-2.0" - s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1' - s.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.4' - s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6' +s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1' +s.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.4' +s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6' - s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0' - s.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.3' - s.add_development_dependency 'webmock', '~> 1.6', '>= 1.6.2' - s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6' - s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2' - s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16' - s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.10' +s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0' +s.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.3' +s.add_development_dependency 'webmock', '~> 1.6', '>= 1.6.2' +s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6' +s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2' +s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16' +s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.10' - s.files = `find *`.split("\n").uniq.sort.select{|f| !f.empty? } - s.test_files = `find spec/*`.split("\n") - s.executables = [] - s.require_paths = ["lib"] +s.files = `find *`.split("\n").uniq.sort.select{|f| !f.empty? } +s.test_files = `find spec/*`.split("\n") +s.executables = [] +s.require_paths = ["lib"] end diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index b6dd4493a0b..75b711d3ee5 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -1,221 +1,224 @@ - 4.0.0 - com.wordnik - swagger-scala-client - jar - swagger-scala-client - 1.0.0 - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + io.swagger + swagger-scala-client + jar + swagger-scala-client + 1.0.0 + + 2.2.0 + - - - maven-mongodb-plugin-repo - maven mongodb plugin repository - http://maven-mongodb-plugin.googlecode.com/svn/maven/repo - default - - + + + maven-mongodb-plugin-repo + maven mongodb plugin repository + http://maven-mongodb-plugin.googlecode.com/svn/maven/repo + default + + - - - - 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-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.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 - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - -Xms128m - -Xmx1500m - - - - - - - - - org.scala-tools - maven-scala-plugin - - ${scala-version} - - - - - - - com.fasterxml.jackson.module - jackson-module-scala_2.10 - ${jackson-version} - - - com.sun.jersey - jersey-client - ${jersey-version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey-version} - - - org.jfarcand - jersey-ahc-client - ${jersey-async-version} - compile - - - org.scala-lang - scala-library - ${scala-version} - - - com.wordnik - swagger-core - ${swagger-core-version} - - - org.scalatest - scalatest_2.10 - ${scala-test-version} - test - - - junit - junit - ${junit-version} - test - - - joda-time - joda-time - ${joda-time-version} - - - org.joda - joda-convert - ${joda-version} - - - - 2.10.4 - 1.2 - 2.2 - 1.7 - 1.5.0-M1 - 1.0.5 - 1.0.0 - 2.4.2 + + 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 + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin-version} + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + -Xms128m + -Xmx1500m + + + + + + + + + org.scala-tools + maven-scala-plugin + + ${scala-version} + + + + + + + com.fasterxml.jackson.module + jackson-module-scala_2.10 + ${jackson-version} + + + com.sun.jersey + jersey-client + ${jersey-version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey-version} + + + org.jfarcand + jersey-ahc-client + ${jersey-async-version} + compile + + + org.scala-lang + scala-library + ${scala-version} + + + io.swagger + swagger-core + ${swagger-core-version} + + + org.scalatest + scalatest_2.10 + ${scala-test-version} + test + + + junit + junit + ${junit-version} + test + + + joda-time + joda-time + ${joda-time-version} + + + org.joda + joda-convert + ${joda-version} + + + + 2.10.4 + 1.2 + 2.2 + 1.7 + 1.5.0 + 1.0.5 + 1.0.0 + 2.4.2 - 4.8.1 - 3.1.5 - 2.1.3 - + 4.8.1 + 3.1.5 + 2.1.3 + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala index 91ab98471e9..516e545b19f 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala @@ -25,179 +25,179 @@ import com.fasterxml.jackson.annotation._ import com.fasterxml.jackson.databind.annotation.JsonSerialize object ScalaJsonUtil { - def getJsonMapper = { - val mapper = new ObjectMapper() - mapper.registerModule(new DefaultScalaModule()) - mapper.registerModule(new JodaModule()); - mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT) - mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY) - mapper - } +def getJsonMapper = { +val mapper = new ObjectMapper() +mapper.registerModule(new DefaultScalaModule()) +mapper.registerModule(new JodaModule()); +mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); +mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT) +mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) +mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) +mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY) +mapper +} } class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper, - httpHeaders: HashMap[String, String] = HashMap(), - hostMap: HashMap[String, Client] = HashMap(), - asyncHttpClient: Boolean = false, - authScheme: String = "", - authPreemptive: Boolean = false) { - - var defaultHeaders: HashMap[String, String] = httpHeaders - - def escape(value: String): String = { - URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20") - } - - def escape(value: Long): String = value.toString - def escape(value: Double): String = value.toString - def escape(value: Float): String = value.toString - - def deserialize(json: String, containerType: String, cls: Class[_]) = { - if (cls == classOf[String]) { - json match { - case s: String => { - if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2) - else s - } - case _ => null - } - } else { - containerType.toLowerCase match { - case "array" => { - val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) - val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] - response.asScala.toList - } - case "list" => { - val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) - val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] - response.asScala.toList - } - case _ => { - json match { - case e: String if ("\"\"" == e) => null - case _ => mapper.readValue(json, cls) - } - } - } - } - } - - def serialize(obj: AnyRef): String = { - if (obj != null) { - obj match { - case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava) - case _ => mapper.writeValueAsString(obj) - } - } else null - } - - def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], formParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = { - val client = getClient(host) - - val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "") - val builder = client.resource(host + path + querystring).accept(contentType) - headerParams.map(p => builder.header(p._1, p._2)) - defaultHeaders.map(p => { - headerParams.contains(p._1) match { - case true => // override default with supplied header - case false => if (p._2 != null) builder.header(p._1, p._2) - } - }) - var formData: MultivaluedMapImpl = null - if(contentType == "application/x-www-form-urlencoded") { - formData = new MultivaluedMapImpl() - formParams.map(p => formData.add(p._1, p._2)) - } - - val response: ClientResponse = method match { - case "GET" => { - builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse] - } - case "POST" => { - if(formData != null) builder.post(classOf[ClientResponse], formData) - else if(body != null && body.isInstanceOf[File]) { - val file = body.asInstanceOf[File] - val form = new FormDataMultiPart() - form.field("filename", file.getName()) - form.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)) - builder.post(classOf[ClientResponse], form) - } - else { - if(body == null) builder.post(classOf[ClientResponse], serialize(body)) - else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body)) - } - } - case "PUT" => { - if(formData != null) builder.post(classOf[ClientResponse], formData) - else if(body == null) builder.put(classOf[ClientResponse], null) - else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body)) - } - case "DELETE" => { - builder.delete(classOf[ClientResponse]) - } - case _ => null - } - response.getClientResponseStatus().getStatusCode() match { - case 204 => "" - case code: Int if (Range(200, 299).contains(code)) => { - response.hasEntity() match { - case true => response.getEntity(classOf[String]) - case false => "" - } - } - case _ => { - val entity = response.hasEntity() match { - case true => response.getEntity(classOf[String]) - case false => "no data" - } - throw new ApiException( - response.getClientResponseStatus().getStatusCode(), - entity) - } - } - } - - def getClient(host: String): Client = { - hostMap.contains(host) match { - case true => hostMap(host) - case false => { - val client = newClient(host) - // client.addFilter(new LoggingFilter()) - hostMap += host -> client - client - } - } - } - - def newClient(host: String): Client = asyncHttpClient match { - case true => { - import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig - import org.sonatype.spice.jersey.client.ahc.AhcHttpClient - import com.ning.http.client.Realm - - val config: DefaultAhcConfig = new DefaultAhcConfig() - if (!authScheme.isEmpty) { - val authSchemeEnum = Realm.AuthScheme.valueOf(authScheme) - config.getAsyncHttpClientConfigBuilder - .setRealm(new Realm.RealmBuilder().setScheme(authSchemeEnum) - .setUsePreemptiveAuth(authPreemptive).build) - } - AhcHttpClient.create(config) - } - case _ => Client.create() - } +httpHeaders: HashMap[String, String] = HashMap(), +hostMap: HashMap[String, Client] = HashMap(), +asyncHttpClient: Boolean = false, +authScheme: String = "", +authPreemptive: Boolean = false) { + +var defaultHeaders: HashMap[String, String] = httpHeaders + +def escape(value: String): String = { +URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20") +} + +def escape(value: Long): String = value.toString +def escape(value: Double): String = value.toString +def escape(value: Float): String = value.toString + +def deserialize(json: String, containerType: String, cls: Class[_]) = { +if (cls == classOf[String]) { +json match { +case s: String => { +if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2) +else s +} +case _ => null +} +} else { +containerType.toLowerCase match { +case "array" => { +val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) +val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] +response.asScala.toList +} +case "list" => { +val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls) +val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]] +response.asScala.toList +} +case _ => { +json match { +case e: String if ("\"\"" == e) => null +case _ => mapper.readValue(json, cls) +} +} +} +} +} + +def serialize(obj: AnyRef): String = { +if (obj != null) { +obj match { +case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava) +case _ => mapper.writeValueAsString(obj) +} +} else null +} + +def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], formParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = { +val client = getClient(host) + +val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "") +val builder = client.resource(host + path + querystring).accept(contentType) +headerParams.map(p => builder.header(p._1, p._2)) +defaultHeaders.map(p => { +headerParams.contains(p._1) match { +case true => // override default with supplied header +case false => if (p._2 != null) builder.header(p._1, p._2) +} +}) +var formData: MultivaluedMapImpl = null +if(contentType == "application/x-www-form-urlencoded") { +formData = new MultivaluedMapImpl() +formParams.map(p => formData.add(p._1, p._2)) +} + +val response: ClientResponse = method match { +case "GET" => { +builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse] +} +case "POST" => { +if(formData != null) builder.post(classOf[ClientResponse], formData) +else if(body != null && body.isInstanceOf[File]) { +val file = body.asInstanceOf[File] +val form = new FormDataMultiPart() +form.field("filename", file.getName()) +form.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)) +builder.post(classOf[ClientResponse], form) +} +else { +if(body == null) builder.post(classOf[ClientResponse], serialize(body)) +else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body)) +} +} +case "PUT" => { +if(formData != null) builder.post(classOf[ClientResponse], formData) +else if(body == null) builder.put(classOf[ClientResponse], null) +else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body)) +} +case "DELETE" => { +builder.delete(classOf[ClientResponse]) +} +case _ => null +} +response.getClientResponseStatus().getStatusCode() match { +case 204 => "" +case code: Int if (Range(200, 299).contains(code)) => { +response.hasEntity() match { +case true => response.getEntity(classOf[String]) +case false => "" +} +} +case _ => { +val entity = response.hasEntity() match { +case true => response.getEntity(classOf[String]) +case false => "no data" +} +throw new ApiException( +response.getClientResponseStatus().getStatusCode(), +entity) +} +} +} + +def getClient(host: String): Client = { +hostMap.contains(host) match { +case true => hostMap(host) +case false => { +val client = newClient(host) +// client.addFilter(new LoggingFilter()) +hostMap += host -> client +client +} +} +} + +def newClient(host: String): Client = asyncHttpClient match { +case true => { +import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig +import org.sonatype.spice.jersey.client.ahc.AhcHttpClient +import com.ning.http.client.Realm + +val config: DefaultAhcConfig = new DefaultAhcConfig() +if (!authScheme.isEmpty) { +val authSchemeEnum = Realm.AuthScheme.valueOf(authScheme) +config.getAsyncHttpClientConfigBuilder +.setRealm(new Realm.RealmBuilder().setScheme(authSchemeEnum) +.setUsePreemptiveAuth(authPreemptive).build) +} +AhcHttpClient.create(config) +} +case _ => Client.create() +} } object ApiInvoker extends ApiInvoker(mapper = ScalaJsonUtil.getJsonMapper, - httpHeaders = HashMap(), - hostMap = HashMap(), - asyncHttpClient = false, - authScheme = "", - authPreemptive = false) +httpHeaders = HashMap(), +hostMap = HashMap(), +asyncHttpClient = false, +authScheme = "", +authPreemptive = false) class ApiException(val code: Int, msg: String) extends RuntimeException(msg) diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala index 0d0b3c83ed2..305a16c282e 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala @@ -15,420 +15,420 @@ import java.util.Date import scala.collection.mutable.HashMap -class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2", - defApiInvoker: ApiInvoker = ApiInvoker) { - var basePath = defBasePath - var apiInvoker = defApiInvoker - - def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - - /** - * Update an existing pet - * - * @param body Pet object that needs to be added to the store - * @return void - */ - def updatePet (body: Pet) = { - // create path and map variables - val path = "/pet".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json", "application/xml", "application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] + class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2", + defApiInvoker: ApiInvoker = ApiInvoker) { + var basePath = defBasePath + var apiInvoker = defApiInvoker - + def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - + /** + * Update an existing pet + * + * @param body Pet object that needs to be added to the store + * @return void + */ + def updatePet (body: Pet) = { + // create path and map variables + val path = "/pet".replaceAll("\\{format\\}","json") - var postBody: AnyRef = body + val contentTypes = List("application/json", "application/xml", "application/json") + val contentType = contentTypes(0) - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] - try { - apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { - case s: String => - - case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Add a new pet to the store - * - * @param body Pet object that needs to be added to the store - * @return void - */ - def addPet (body: Pet) = { - // create path and map variables - val path = "/pet".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json", "application/xml", "application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] + - + - - - + - var postBody: AnyRef = body + var postBody: AnyRef = body - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + try { + apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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[Pet] - */ - def findPetsByStatus (status: List[String] /* = available */) : Option[List[Pet]] = { - // create path and map variables - val path = "/pet/findByStatus".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - if(String.valueOf(status) != "null") queryParams += "status" -> status.toString - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Add a new pet to the store + * + * @param body Pet object that needs to be added to the store + * @return void + */ + def addPet (body: Pet) = { + // create path and map variables + val path = "/pet".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json", "application/xml", "application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = body + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "array", classOf[Pet]).asInstanceOf[List[Pet]]) - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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[Pet] - */ - def findPetsByTags (tags: List[String]) : Option[List[Pet]] = { - // create path and map variables - val path = "/pet/findByTags".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - if(String.valueOf(tags) != "null") queryParams += "tags" -> tags.toString - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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[Pet] + */ + def findPetsByStatus (status: List[String] /* = available */) : Option[List[Pet]] = { + // create path and map variables + val path = "/pet/findByStatus".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + if(String.valueOf(status) != "null") queryParams += "status" -> status.toString + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "array", classOf[Pet]).asInstanceOf[List[Pet]]) - + Some(ApiInvoker.deserialize(s, "array", classOf[Pet]).asInstanceOf[List[Pet]]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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 - */ - def getPetById (petId: Long) : Option[Pet] = { - // create path and map variables - val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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[Pet] + */ + def findPetsByTags (tags: List[String]) : Option[List[Pet]] = { + // create path and map variables + val path = "/pet/findByTags".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + if(String.valueOf(tags) != "null") queryParams += "tags" -> tags.toString + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "", classOf[Pet]).asInstanceOf[Pet]) - + Some(ApiInvoker.deserialize(s, "array", classOf[Pet]).asInstanceOf[List[Pet]]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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 - */ - def updatePetWithForm (petId: String, name: String, status: String) = { - // create path and map variables - val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) - - - - val contentTypes = List("application/x-www-form-urlencoded", "application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - mp.field("name", name.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) - - mp.field("status", status.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) - - postBody = mp - } - else { - formParams += "name" -> name.toString() - formParams += "status" -> status.toString() - - } - - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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 + */ + def getPetById (petId: Long) : Option[Pet] = { + // create path and map variables + val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + Some(ApiInvoker.deserialize(s, "", classOf[Pet]).asInstanceOf[Pet]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Deletes a pet - * - * @param apiKey - * @param petId Pet id to delete - * @return void - */ - def deletePet (apiKey: String, petId: Long) = { - // create path and map variables - val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - headerParams += "api_key" -> apiKey - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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 + */ + def updatePetWithForm (petId: String, name: String, status: String) = { + // create path and map variables + val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) + + + + val contentTypes = List("application/x-www-form-urlencoded", "application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + mp.field("name", name.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) + + mp.field("status", status.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) + + postBody = mp + } + else { + formParams += "name" -> name.toString() + formParams += "status" -> status.toString() + + } + + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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 - */ - def uploadFile (petId: Long, additionalMetadata: String, file: File) = { - // create path and map variables - val path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) - - - - val contentTypes = List("multipart/form-data", "application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - mp.field("additionalMetadata", additionalMetadata.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) - - mp.field("file", file.getName) - mp.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)) - - postBody = mp - } - else { - formParams += "additionalMetadata" -> additionalMetadata.toString() - - - } - - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Deletes a pet + * + * @param apiKey + * @param petId Pet id to delete + * @return void + */ + def deletePet (apiKey: String, petId: Long) = { + // create path and map variables + val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + headerParams += "api_key" -> apiKey + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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 + */ + def uploadFile (petId: Long, additionalMetadata: String, file: File) = { + // create path and map variables + val path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId)) + + + + val contentTypes = List("multipart/form-data", "application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + mp.field("additionalMetadata", additionalMetadata.toString(), MediaType.MULTIPART_FORM_DATA_TYPE) + + mp.field("file", file.getName) + mp.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE)) + + postBody = mp + } + else { + formParams += "additionalMetadata" -> additionalMetadata.toString() + + + } + + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + case s: String => + + case _ => None + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + } - } - -} diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala index 9b3cc91d788..084794af60d 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala @@ -14,206 +14,206 @@ import java.util.Date import scala.collection.mutable.HashMap -class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2", - defApiInvoker: ApiInvoker = ApiInvoker) { - var basePath = defBasePath - var apiInvoker = defApiInvoker - - def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - - /** - * Returns pet inventories by status - * Returns a map of status codes to quantities - * @return Map[String, Integer] - */ - def getInventory () : Option[Map[String, Integer]] = { - // create path and map variables - val path = "/store/inventory".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] + class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2", + defApiInvoker: ApiInvoker = ApiInvoker) { + var basePath = defBasePath + var apiInvoker = defApiInvoker - + def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + * @return Map[String, Integer] + */ + def getInventory () : Option[Map[String, Integer]] = { + // create path and map variables + val path = "/store/inventory".replaceAll("\\{format\\}","json") - var postBody: AnyRef = null + val contentTypes = List("application/json") + val contentType = contentTypes(0) - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { - case s: String => - Some(ApiInvoker.deserialize(s, "map", classOf[Integer]).asInstanceOf[Map[String, Integer]]) - - case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Place an order for a pet - * - * @param body order placed for purchasing the pet - * @return Order - */ - def placeOrder (body: Order) : Option[Order] = { - // create path and map variables - val path = "/store/order".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] + - + - - - + - var postBody: AnyRef = body + var postBody: AnyRef = null - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order]) - + Some(ApiInvoker.deserialize(s, "map", classOf[Integer]).asInstanceOf[Map[String, Integer]]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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 - */ - def getOrderById (orderId: String) : Option[Order] = { - // create path and map variables - val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Place an order for a pet + * + * @param body order placed for purchasing the pet + * @return Order + */ + def placeOrder (body: Order) : Option[Order] = { + // create path and map variables + val path = "/store/order".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = body + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order]) - + Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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 - */ - def deleteOrder (orderId: String) = { - // create path and map variables - val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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 + */ + def getOrderById (orderId: String) : Option[Order] = { + // create path and map variables + val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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 + */ + def deleteOrder (orderId: String) = { + // create path and map variables + val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + case s: String => + + case _ => None + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + } - } - -} diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala index 5a7b38f620a..98375741bbe 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala @@ -14,399 +14,399 @@ import java.util.Date import scala.collection.mutable.HashMap -class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2", - defApiInvoker: ApiInvoker = ApiInvoker) { - var basePath = defBasePath - var apiInvoker = defApiInvoker - - def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - - /** - * Create user - * This can only be done by the logged in user. - * @param body Created user object - * @return void - */ - def createUser (body: User) = { - // create path and map variables - val path = "/user".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] + class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2", + defApiInvoker: ApiInvoker = ApiInvoker) { + var basePath = defBasePath + var apiInvoker = defApiInvoker - + def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value - - + /** + * Create user + * This can only be done by the logged in user. + * @param body Created user object + * @return void + */ + def createUser (body: User) = { + // create path and map variables + val path = "/user".replaceAll("\\{format\\}","json") - var postBody: AnyRef = body + val contentTypes = List("application/json") + val contentType = contentTypes(0) - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { - case s: String => - - case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Creates list of users with given input array - * - * @param body List of user object - * @return void - */ - def createUsersWithArrayInput (body: List[User]) = { - // create path and map variables - val path = "/user/createWithArray".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] + - + - - - + - var postBody: AnyRef = body + var postBody: AnyRef = body - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Creates list of users with given input array - * - * @param body List of user object - * @return void - */ - def createUsersWithListInput (body: List[User]) = { - // create path and map variables - val path = "/user/createWithList".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = body - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Creates list of users with given input array + * + * @param body List of user object + * @return void + */ + def createUsersWithArrayInput (body: List[User]) = { + // create path and map variables + val path = "/user/createWithArray".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = body + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Logs user into the system - * - * @param username The user name for login - * @param password The password for login in clear text - * @return String - */ - def loginUser (username: String, password: String) : Option[String] = { - // create path and map variables - val path = "/user/login".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - if(String.valueOf(username) != "null") queryParams += "username" -> username.toString - if(String.valueOf(password) != "null") queryParams += "password" -> password.toString - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Creates list of users with given input array + * + * @param body List of user object + * @return void + */ + def createUsersWithListInput (body: List[User]) = { + // create path and map variables + val path = "/user/createWithList".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = body + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "", classOf[String]).asInstanceOf[String]) - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Logs out current logged in user session - * - * @return void - */ - def logoutUser () = { - // create path and map variables - val path = "/user/logout".replaceAll("\\{format\\}","json") - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Logs user into the system + * + * @param username The user name for login + * @param password The password for login in clear text + * @return String + */ + def loginUser (username: String, password: String) : Option[String] = { + // create path and map variables + val path = "/user/login".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + if(String.valueOf(username) != "null") queryParams += "username" -> username.toString + if(String.valueOf(password) != "null") queryParams += "password" -> password.toString + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + Some(ApiInvoker.deserialize(s, "", classOf[String]).asInstanceOf[String]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. - * @return User - */ - def getUserByName (username: String) : Option[User] = { - // create path and map variables - val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Logs out current logged in user session + * + * @return void + */ + def logoutUser () = { + // create path and map variables + val path = "/user/logout".replaceAll("\\{format\\}","json") + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User]) - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * 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 - */ - def updateUser (username: String, body: User) = { - // create path and map variables - val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = body - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. + * @return User + */ + def getUserByName (username: String) : Option[User] = { + // create path and map variables + val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User]) + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex - } - } - - /** - * Delete user - * This can only be done by the logged in user. - * @param username The name that needs to be deleted - * @return void - */ - def deleteUser (username: String) = { - // create path and map variables - val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username)) - - - - val contentTypes = List("application/json") - val contentType = contentTypes(0) - - // query params - val queryParams = new HashMap[String, String] - val headerParams = new HashMap[String, String] - val formParams = new HashMap[String, String] - - - - - - - - var postBody: AnyRef = null - - if(contentType.startsWith("multipart/form-data")) { - val mp = new FormDataMultiPart() - - postBody = mp - } - else { - - } - - try { - apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * 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 + */ + def updateUser (username: String, body: User) = { + // create path and map variables + val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = body + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { case s: String => - + case _ => None - } - } catch { - case ex: ApiException if ex.code == 404 => None - case ex: ApiException => throw ex + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + + /** + * Delete user + * This can only be done by the logged in user. + * @param username The name that needs to be deleted + * @return void + */ + def deleteUser (username: String) = { + // create path and map variables + val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username)) + + + + val contentTypes = List("application/json") + val contentType = contentTypes(0) + + // query params + val queryParams = new HashMap[String, String] + val headerParams = new HashMap[String, String] + val formParams = new HashMap[String, String] + + + + + + + + var postBody: AnyRef = null + + if(contentType.startsWith("multipart/form-data")) { + val mp = new FormDataMultiPart() + + postBody = mp + } + else { + + } + + try { + apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match { + case s: String => + + case _ => None + } + } catch { + case ex: ApiException if ex.code == 404 => None + case ex: ApiException => throw ex + } + } + } - } - -} diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala index 122411e3ff7..0b4fdab4132 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala @@ -2,8 +2,10 @@ package io.swagger.client.model + -case class Category ( - id: Long, - name: String) - + case class Category ( + id: Long, + name: String) + + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala index 845fe32c973..d2e4b77f90a 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala @@ -3,13 +3,15 @@ package io.swagger.client.model import org.joda.time.DateTime + -case class Order ( - id: Long, - petId: Long, - quantity: Integer, - shipDate: DateTime, - /* Order Status */ - status: String, - complete: Boolean) - + case class Order ( + id: Long, + petId: Long, + quantity: Integer, + shipDate: DateTime, + /* Order Status */ + status: String, + complete: Boolean) + + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala index 430f6a3659c..e51a5f25a41 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala @@ -4,13 +4,15 @@ import io.swagger.client.model.Category import io.swagger.client.model.Tag + -case class Pet ( - id: Long, - category: Category, - name: String, - photoUrls: List[String], - tags: List[Tag], - /* pet status in the store */ - status: String) - + case class Pet ( + id: Long, + category: Category, + name: String, + photoUrls: List[String], + tags: List[Tag], + /* pet status in the store */ + status: String) + + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala index b0b75d4a96c..d541ca315a0 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala @@ -2,8 +2,10 @@ package io.swagger.client.model + -case class Tag ( - id: Long, - name: String) - + case class Tag ( + id: Long, + name: String) + + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala index 125147c0ae0..f7b826ec0f2 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala @@ -2,15 +2,17 @@ package io.swagger.client.model + -case class User ( - id: Long, - username: String, - firstName: String, - lastName: String, - email: String, - password: String, - phone: String, - /* User Status */ - userStatus: Integer) - + case class User ( + id: Long, + username: String, + firstName: String, + lastName: String, + email: String, + password: String, + phone: String, + /* User Status */ + userStatus: Integer) + + diff --git a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala index f14a89c1f63..dc0fca27b28 100644 --- a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala @@ -1,7 +1,7 @@ import io.swagger.client._ import io.swagger.client.api._ import io.swagger.client.model._ - + import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest._ @@ -59,7 +59,7 @@ class PetApiTest extends FlatSpec with Matchers { } case None => fail("didn't find pet created") } - val updatedPet = pet.copy(status="fulfilled") + val updatedPet = pet.copy(status = "fulfilled") api.updatePet(updatedPet) api.getPetById(1000) match { case Some(pet) => { @@ -85,7 +85,7 @@ class PetApiTest extends FlatSpec with Matchers { case Some(pets) => { pets.foreach(pet => { val tags = (for (tag <- pet.tags) yield tag.name).toSet - if ((tags & Set("tag1", "tag2")).size == 0) + if ((tags & Set("tag1", "tag2")).size == 0) fail("unexpected tags in " + tags) }) } diff --git a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala index 68c5daf8f42..5a1d641c12b 100644 --- a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala @@ -1,13 +1,13 @@ import io.swagger.client._ import io.swagger.client.api._ import io.swagger.client.model._ - + import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest._ import scala.collection.mutable.{ ListBuffer, HashMap } -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ import scala.beans.BeanProperty @RunWith(classOf[JUnitRunner]) @@ -19,7 +19,7 @@ class StoreApiTest extends FlatSpec with Matchers { it should "place and fetch an order" in { val now = new org.joda.time.DateTime - val order = Order ( + val order = Order( petId = 10, id = 1000, quantity = 101, @@ -35,7 +35,7 @@ class StoreApiTest extends FlatSpec with Matchers { order.petId should be(10) order.quantity should be(101) // use `getMillis` to compare across timezones - order.shipDate.getMillis.equals(now.getMillis) should be (true) + order.shipDate.getMillis.equals(now.getMillis) should be(true) } case None => fail("didn't find order created") } diff --git a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala index 37b80815c87..ea0fda03d9a 100644 --- a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala @@ -1,13 +1,13 @@ import io.swagger.client._ import io.swagger.client.api._ import io.swagger.client.model._ - + import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest._ import scala.collection.mutable.{ ListBuffer, HashMap } -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ import scala.beans.BeanProperty @RunWith(classOf[JUnitRunner]) @@ -31,7 +31,7 @@ class UserApiTest extends FlatSpec with Matchers { case None => } } - + it should "authenticate a user" in { api.loginUser("user1", "XXXXXXXXXXX") match { case Some(status) => status.startsWith("logged in user session") match { @@ -61,8 +61,8 @@ class UserApiTest extends FlatSpec with Matchers { api.getUserByName("johnny") match { case Some(user) => { - user.id should be (1002) - user.username should be ("johnny") + user.id should be(1002) + user.username should be("johnny") } case None => } @@ -81,18 +81,18 @@ class UserApiTest extends FlatSpec with Matchers { 1) }).toList api.createUsersWithArrayInput(userArray) - + for (i <- (1 to 2)) { api.getUserByName("johnny-" + i) match { case Some(user) => { - user.id should be (2000 + i) - user.email should be ("johnny-" + i + "@fail.com") + user.id should be(2000 + i) + user.email should be("johnny-" + i + "@fail.com") } case None => fail("didn't find user " + i) } } } - + it should "create 3 users" in { val userList = (for (i <- (1 to 3)) yield { User( @@ -110,8 +110,8 @@ class UserApiTest extends FlatSpec with Matchers { for (i <- (1 to 3)) { api.getUserByName("fred-" + i) match { case Some(user) => { - user.id should be (3000 + i) - user.email should be ("fred-" + i + "@fail.com") + user.id should be(3000 + i) + user.email should be("fred-" + i + "@fail.com") } case None => fail("didn't find user " + i) } @@ -133,18 +133,18 @@ class UserApiTest extends FlatSpec with Matchers { api.getUserByName("tony") match { case Some(user) => { - user.id should be (4000) - user.username should be ("tony") + user.id should be(4000) + user.username should be("tony") } case None => } - val updatedUser = user.copy(email="tony@succeed.com") + val updatedUser = user.copy(email = "tony@succeed.com") api.updateUser("tony", updatedUser) api.getUserByName("tony") match { case Some(user) => { - user.email should be ("tony@succeed.com") + user.email should be("tony@succeed.com") } case None => } diff --git a/samples/client/petstore/tizen/client/SamiApiClient.cpp b/samples/client/petstore/tizen/client/SamiApiClient.cpp index 35779307fa2..f3c988dea5a 100644 --- a/samples/client/petstore/tizen/client/SamiApiClient.cpp +++ b/samples/client/petstore/tizen/client/SamiApiClient.cpp @@ -5,120 +5,120 @@ using namespace Tizen::Base::Utility; namespace Swagger { SamiApiClient::SamiApiClient() { - enc = new Utf8Encoding(); +enc = new Utf8Encoding(); } void SamiApiClient::success(void (*success) (HttpResponse*, void (*cb)(void*, SamiError*)), void (*cb)(void*, SamiError*)) { - this->successFunction = success; - this->cb = cb; +this->successFunction = success; +this->cb = cb; } SamiApiClient::~SamiApiClient() { - if(enc) - delete enc; +if(enc) +delete enc; } result SamiApiClient::execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* formParams, String contentType) { - NetHttpMethod httpMethod; - if(method.Equals(L"GET", false)) { - httpMethod = NET_HTTP_METHOD_GET; - } - else if(method.Equals(L"PUT", false)) { - httpMethod = NET_HTTP_METHOD_PUT; - } - else if(method.Equals(L"POST", false)) { - httpMethod = NET_HTTP_METHOD_POST; - } - else if(method.Equals(L"DELETE", false)) { - httpMethod = NET_HTTP_METHOD_DELETE; - } - else if(method.Equals(L"OPTIONS", false)) { - httpMethod = NET_HTTP_METHOD_OPTIONS; - } - else if(method.Equals(L"HEAD", false)) { - httpMethod = NET_HTTP_METHOD_HEAD; - } - else if(method.Equals(L"TRACE", false)) { - httpMethod = NET_HTTP_METHOD_TRACE; - } - - String uri = String(host); - uri.Append(path); - - HttpSession* __pHttpSession = null; - HttpTransaction* pHttpTransaction = null; - HttpRequest* pHttpRequest = null; - - if (__pHttpSession == null) { - __pHttpSession = new (std::nothrow) HttpSession(); - __pHttpSession->Construct(NET_HTTP_SESSION_MODE_NORMAL, null, uri, null); - __pHttpSession->SetAutoRedirectionEnabled(true); - } - pHttpTransaction = __pHttpSession->OpenTransactionN(); - pHttpTransaction->AddHttpTransactionListener(*this); - - pHttpRequest = const_cast< HttpRequest* >(pHttpTransaction->GetRequest()); - - HttpHeader *pHeader = pHttpRequest->GetHeader(); - if(contentType != null && !contentType.Equals(L"", true)) { - pHeader->AddField(L"Accept", contentType); - } - if(queryParams != null) { - IMapEnumerator* pMapEnum = queryParams->GetMapEnumeratorN(); - String queryParam = L""; - while (pMapEnum->MoveNext() == E_SUCCESS) { - if(queryParam.GetLength() == 0) - queryParam.Append(L"?"); - else - queryParam.Append(L"&"); - - String* pKey = static_cast< String* > (pMapEnum->GetKey()); - String* pValue = static_cast< String* > (pMapEnum->GetValue()); - String encoded; - UrlEncoder::Encode(*pKey, L"UTF-8", encoded); - - queryParam.Append(encoded); - queryParam.Append("="); - UrlEncoder::Encode(*pValue, L"UTF-8", encoded); - queryParam.Append(encoded); - } - uri.Append(queryParam); - delete queryParams; - } - if(headerParams != null) { - IMapEnumerator* pMapEnum = headerParams->GetMapEnumeratorN(); - while (pMapEnum->MoveNext() == E_SUCCESS) { - String* pKey = static_cast< String* > (pMapEnum->GetKey()); - String* pValue = static_cast< String* > (pMapEnum->GetValue()); - pHeader->AddField(*pKey, *pValue); - } - delete headerParams; - } - if(body != null) { - HttpStringEntity * pEntity = new HttpStringEntity(); - String* cp = new String(*body); - result res = pEntity->Construct(*body, L"application/json", "utf-8", *enc); - res = pHttpRequest->SetEntity(*pEntity); - } - - pHttpRequest->SetUri(uri); - pHttpRequest->SetMethod(httpMethod); - - AppLog("%ls", uri.GetPointer()); - return pHttpTransaction->Submit(); +NetHttpMethod httpMethod; +if(method.Equals(L"GET", false)) { +httpMethod = NET_HTTP_METHOD_GET; +} +else if(method.Equals(L"PUT", false)) { +httpMethod = NET_HTTP_METHOD_PUT; +} +else if(method.Equals(L"POST", false)) { +httpMethod = NET_HTTP_METHOD_POST; +} +else if(method.Equals(L"DELETE", false)) { +httpMethod = NET_HTTP_METHOD_DELETE; +} +else if(method.Equals(L"OPTIONS", false)) { +httpMethod = NET_HTTP_METHOD_OPTIONS; +} +else if(method.Equals(L"HEAD", false)) { +httpMethod = NET_HTTP_METHOD_HEAD; +} +else if(method.Equals(L"TRACE", false)) { +httpMethod = NET_HTTP_METHOD_TRACE; +} + +String uri = String(host); +uri.Append(path); + +HttpSession* __pHttpSession = null; +HttpTransaction* pHttpTransaction = null; +HttpRequest* pHttpRequest = null; + +if (__pHttpSession == null) { +__pHttpSession = new (std::nothrow) HttpSession(); +__pHttpSession->Construct(NET_HTTP_SESSION_MODE_NORMAL, null, uri, null); +__pHttpSession->SetAutoRedirectionEnabled(true); +} +pHttpTransaction = __pHttpSession->OpenTransactionN(); +pHttpTransaction->AddHttpTransactionListener(*this); + +pHttpRequest = const_cast< HttpRequest* >(pHttpTransaction->GetRequest()); + +HttpHeader *pHeader = pHttpRequest->GetHeader(); +if(contentType != null && !contentType.Equals(L"", true)) { +pHeader->AddField(L"Accept", contentType); +} +if(queryParams != null) { +IMapEnumerator* pMapEnum = queryParams->GetMapEnumeratorN(); +String queryParam = L""; +while (pMapEnum->MoveNext() == E_SUCCESS) { +if(queryParam.GetLength() == 0) +queryParam.Append(L"?"); +else +queryParam.Append(L"&"); + +String* pKey = static_cast< String* > (pMapEnum->GetKey()); +String* pValue = static_cast< String* > (pMapEnum->GetValue()); +String encoded; +UrlEncoder::Encode(*pKey, L"UTF-8", encoded); + +queryParam.Append(encoded); +queryParam.Append("="); +UrlEncoder::Encode(*pValue, L"UTF-8", encoded); +queryParam.Append(encoded); +} +uri.Append(queryParam); +delete queryParams; +} +if(headerParams != null) { +IMapEnumerator* pMapEnum = headerParams->GetMapEnumeratorN(); +while (pMapEnum->MoveNext() == E_SUCCESS) { +String* pKey = static_cast< String* > (pMapEnum->GetKey()); +String* pValue = static_cast< String* > (pMapEnum->GetValue()); +pHeader->AddField(*pKey, *pValue); +} +delete headerParams; +} +if(body != null) { +HttpStringEntity * pEntity = new HttpStringEntity(); +String* cp = new String(*body); +result res = pEntity->Construct(*body, L"application/json", "utf-8", *enc); +res = pHttpRequest->SetEntity(*pEntity); +} + +pHttpRequest->SetUri(uri); +pHttpRequest->SetMethod(httpMethod); + +AppLog("%ls", uri.GetPointer()); +return pHttpTransaction->Submit(); } void SamiApiClient::OnTransactionCompleted(HttpSession& httpSession, HttpTransaction& pHttpTransaction) { - HttpResponse* pHttpResponse = pHttpTransaction.GetResponse(); +HttpResponse* pHttpResponse = pHttpTransaction.GetResponse(); - if(successFunction != null) { - successFunction(pHttpResponse, cb); - } - delete &httpSession; - delete &pHttpTransaction; +if(successFunction != null) { +successFunction(pHttpResponse, cb); +} +delete &httpSession; +delete &pHttpTransaction; } } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiApiClient.h b/samples/client/petstore/tizen/client/SamiApiClient.h index f20eb6e158b..d152af8b838 100644 --- a/samples/client/petstore/tizen/client/SamiApiClient.h +++ b/samples/client/petstore/tizen/client/SamiApiClient.h @@ -1,73 +1,75 @@ -#include +#include + -#include "SamiHelpers.h" -#include "SamiError.h" + #include "SamiHelpers.h" + #include "SamiError.h" -using namespace Tizen::Net::Http; -using namespace Tizen::Base; -using namespace Tizen::Base::Collection; -using namespace Tizen::Text; + using namespace Tizen::Net::Http; + using namespace Tizen::Base; + using namespace Tizen::Base::Collection; + using namespace Tizen::Text; -#ifndef APICLIENT_H_ -#define APICLIENT_H_ + #ifndef APICLIENT_H_ + #define APICLIENT_H_ -namespace Swagger { + namespace Swagger { -class SamiApiClient: public IHttpTransactionEventListener { -public: - SamiApiClient(); - virtual ~SamiApiClient(); + class SamiApiClient: public IHttpTransactionEventListener { + public: + SamiApiClient(); + virtual ~SamiApiClient(); - result - execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* formParams, String contentType); + result + execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* + formParams, String contentType); - void success(void (*res) (HttpResponse*, void (*cb)(void*, SamiError*)), void (*cb)(void*, SamiError*)); + void success(void (*res) (HttpResponse*, void (*cb)(void*, SamiError*)), void (*cb)(void*, SamiError*)); - virtual void - OnTransactionCompleted(HttpSession& httpSession, HttpTransaction& pHttpTransaction); + virtual void + OnTransactionCompleted(HttpSession& httpSession, HttpTransaction& pHttpTransaction); - virtual void - OnAudioInAudioFocusChanged(void) { + virtual void + OnAudioInAudioFocusChanged(void) { AppLog("OnAudioInAudioFocusChanged"); - } + } - virtual void - OnTransactionCertVerificationRequiredN(HttpSession& httpSession, HttpTransaction& httpTransaction, - Tizen::Base::String* pCert) { + virtual void + OnTransactionCertVerificationRequiredN(HttpSession& httpSession, HttpTransaction& httpTransaction, + Tizen::Base::String* pCert) { AppLog("OnTransactionCertVerificationRequiredN"); httpTransaction.Resume(); delete pCert; - } - - virtual void - OnTransactionReadyToWrite(HttpSession& httpSession, HttpTransaction& httpTransaction, int recommendedChunkSize) { + } + + virtual void + OnTransactionReadyToWrite(HttpSession& httpSession, HttpTransaction& httpTransaction, int recommendedChunkSize) { AppLog("OnTransactionReadyToWrite"); - } + } - virtual void - OnTransactionReadyToRead(HttpSession& httpSession, HttpTransaction& httpTransaction, int availableBodyLen) { + virtual void + OnTransactionReadyToRead(HttpSession& httpSession, HttpTransaction& httpTransaction, int availableBodyLen) { AppLog("OnTransactionReadyToRead"); - } - - virtual void - OnTransactionAborted(HttpSession& httpSession, HttpTransaction& httpTransaction, result r) { + } + + virtual void + OnTransactionAborted(HttpSession& httpSession, HttpTransaction& httpTransaction, result r) { AppLog("OnTransactionAborted: %ls", GetErrorMessage(r)); delete &httpTransaction; - } - - virtual void - OnTransactionHeaderCompleted(HttpSession& httpSession, HttpTransaction& httpTransaction, int headerLen, bool - bAuthRequired) { + } + + virtual void + OnTransactionHeaderCompleted(HttpSession& httpSession, HttpTransaction& httpTransaction, int headerLen, bool + bAuthRequired) { AppLog("OnTransactionHeaderCompleted"); -} + } -private: - void (*successFunction) (HttpResponse*, void (*success)(void*, SamiError*)); - void (*cb)(void*, SamiError*); - Utf8Encoding* enc; -}; + private: + void (*successFunction) (HttpResponse*, void (*success)(void*, SamiError*)); + void (*cb)(void*, SamiError*); + Utf8Encoding* enc; + }; -} /* namespace Swagger */ -#endif /* APICLIENT_H_ */ + } /* namespace Swagger */ + #endif /* APICLIENT_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiCategory.cpp b/samples/client/petstore/tizen/client/SamiCategory.cpp index 185b1f9d895..6b92fe64809 100644 --- a/samples/client/petstore/tizen/client/SamiCategory.cpp +++ b/samples/client/petstore/tizen/client/SamiCategory.cpp @@ -1,182 +1,186 @@ -#include "SamiCategory.h" -#include + #include "SamiCategory.h" + #include + -using namespace Tizen::Base; -using namespace Tizen::System; -using namespace Tizen::Base::Utility; -using namespace Tizen::Base::Collection; -using namespace Tizen::Web::Json; -using namespace Tizen::Locales; + using namespace Tizen::Base; + using namespace Tizen::System; + using namespace Tizen::Base::Utility; + using namespace Tizen::Base::Collection; + using namespace Tizen::Web::Json; + using namespace Tizen::Locales; -namespace Swagger { + namespace Swagger { -SamiCategory::SamiCategory() { - init(); -} + SamiCategory::SamiCategory() { + init(); + } -SamiCategory::~SamiCategory() { - this->cleanup(); -} + SamiCategory::~SamiCategory() { + this->cleanup(); + } -void -SamiCategory::init() { + void + SamiCategory::init() { pId = null; pName = null; -} + } -void -SamiCategory::cleanup() { + void + SamiCategory::cleanup() { if(pId != null) { - + delete pId; - pId = null; - } + pId = null; + } if(pName != null) { - + delete pName; - pName = null; - } + pName = null; + } -} - - -SamiCategory* -SamiCategory::fromJson(String* json) { - this->cleanup(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; - return this; -} - - -void -SamiCategory::fromJsonObject(IJsonValue* pJson) { - JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); - - if(pJsonObject != null) { - JsonString* pIdKey = new JsonString(L"id"); + } + + + SamiCategory* + SamiCategory::fromJson(String* json) { + this->cleanup(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + return this; + } + + + void + SamiCategory::fromJsonObject(IJsonValue* pJson) { + JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); + + if(pJsonObject != null) { + JsonString* pIdKey = new JsonString(L"id"); IJsonValue* pIdVal = null; pJsonObject->GetValue(pIdKey, pIdVal); if(pIdVal != null) { - - pId = new Long(); - jsonToValue(pId, pIdVal, L"Long", L"Long"); + + pId = new Long(); + jsonToValue(pId, pIdVal, L"Long", L"Long"); } delete pIdKey; - JsonString* pNameKey = new JsonString(L"name"); + JsonString* pNameKey = new JsonString(L"name"); IJsonValue* pNameVal = null; pJsonObject->GetValue(pNameKey, pNameVal); if(pNameVal != null) { - - pName = new String(); - jsonToValue(pName, pNameVal, L"String", L"String"); + + pName = new String(); + jsonToValue(pName, pNameVal, L"String", L"String"); } delete pNameKey; - - } -} - -SamiCategory::SamiCategory(String* json) { - init(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; -} - -String -SamiCategory::asJson () -{ - JsonObject* pJsonObject = asJsonObject(); - - char *pComposeBuf = new char[256]; - JsonWriter::Compose(pJsonObject, pComposeBuf, 256); - String s = String(pComposeBuf); - - delete pComposeBuf; - pJsonObject->RemoveAll(true); - delete pJsonObject; - - return s; -} - -JsonObject* -SamiCategory::asJsonObject() { - JsonObject *pJsonObject = new JsonObject(); - pJsonObject->Construct(); + + } + } + + SamiCategory::SamiCategory(String* json) { + init(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + } + + String + SamiCategory::asJson () + { + JsonObject* pJsonObject = asJsonObject(); + + char *pComposeBuf = new char[256]; + JsonWriter::Compose(pJsonObject, pComposeBuf, 256); + String s = String(pComposeBuf); + + delete pComposeBuf; + pJsonObject->RemoveAll(true); + delete pJsonObject; + + return s; + } + + JsonObject* + SamiCategory::asJsonObject() { + JsonObject *pJsonObject = new JsonObject(); + pJsonObject->Construct(); + + + JsonString *pIdKey = new JsonString(L"id"); + pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + + + JsonString *pNameKey = new JsonString(L"name"); + pJsonObject->Add(pNameKey, toJson(getPName(), "String", "")); + + + return pJsonObject; + } - JsonString *pIdKey = new JsonString(L"id"); - pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + Long* + SamiCategory::getPId() { + return pId; + } + void + SamiCategory::setPId(Long* pId) { + this->pId = pId; + } - JsonString *pNameKey = new JsonString(L"name"); - pJsonObject->Add(pNameKey, toJson(getPName(), "String", "")); + String* + SamiCategory::getPName() { + return pName; + } + void + SamiCategory::setPName(String* pName) { + this->pName = pName; + } - return pJsonObject; -} - -Long* -SamiCategory::getPId() { - return pId; -} -void -SamiCategory::setPId(Long* pId) { - this->pId = pId; -} - -String* -SamiCategory::getPName() { - return pName; -} -void -SamiCategory::setPName(String* pName) { - this->pName = pName; -} - - - -} /* namespace Swagger */ + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiCategory.h b/samples/client/petstore/tizen/client/SamiCategory.h index a361ea047fa..0b35b7ac929 100644 --- a/samples/client/petstore/tizen/client/SamiCategory.h +++ b/samples/client/petstore/tizen/client/SamiCategory.h @@ -1,60 +1,64 @@ /* - * SamiCategory.h - * - * - */ +* SamiCategory.h +* +* +*/ #ifndef SamiCategory_H_ #define SamiCategory_H_ -#include -#include -#include -#include -#include "SamiHelpers.h" -#include "SamiObject.h" +#include + + #include + + #include + + #include + + #include "SamiHelpers.h" + #include "SamiObject.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; using Tizen::Base::Long; using Tizen::Base::String; -namespace Swagger { + namespace Swagger { -class SamiCategory: public SamiObject { -public: + class SamiCategory: public SamiObject { + public: SamiCategory(); SamiCategory(String* json); - virtual ~SamiCategory(); + virtual ~SamiCategory(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); SamiCategory* fromJson(String* obj); - Long* getPId(); - void setPId(Long* pId); + Long* getPId(); + void setPId(Long* pId); - String* getPName(); - void setPName(String* pName); + String* getPName(); + void setPName(String* pName); -private: + private: Long* pId; String* pName; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SamiCategory_H_ */ + #endif /* SamiCategory_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiError.cpp b/samples/client/petstore/tizen/client/SamiError.cpp index 1aaaa9e726b..9f0a82bf1a5 100644 --- a/samples/client/petstore/tizen/client/SamiError.cpp +++ b/samples/client/petstore/tizen/client/SamiError.cpp @@ -6,49 +6,49 @@ using namespace Tizen::System; namespace Swagger { SamiError::SamiError() { - init(); +init(); } SamiError::SamiError(int code, String* message) { - init(); - this->setCode(code); - this->setMessage(message); +init(); +this->setCode(code); +this->setMessage(message); } SamiError::~SamiError() { - this->cleanup(); +this->cleanup(); } void SamiError::init() { - pCode = 0; - pMessage = null; +pCode = 0; +pMessage = null; } void SamiError::cleanup() { - if(pMessage != null) { - delete pMessage; - pMessage = null; - } +if(pMessage != null) { +delete pMessage; +pMessage = null; +} } int SamiError::getCode() { - return pCode; +return pCode; } void SamiError::setCode(int pCode) { - this->pCode = pCode; +this->pCode = pCode; } String* SamiError::getMessage() { - return pMessage; +return pMessage; } void SamiError::setMessage(String* pMessage) { - this->pMessage = pMessage; +this->pMessage = pMessage; } } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiError.h b/samples/client/petstore/tizen/client/SamiError.h index d3afe4596b2..7afaf929bcb 100644 --- a/samples/client/petstore/tizen/client/SamiError.h +++ b/samples/client/petstore/tizen/client/SamiError.h @@ -1,14 +1,15 @@ #ifndef SamiError_H_ #define SamiError_H_ -#include +#include + -using namespace Tizen::Base; + using namespace Tizen::Base; -namespace Swagger { + namespace Swagger { -class SamiError { -public: + class SamiError { + public: SamiError(); SamiError(int code, String* message); virtual ~SamiError(); @@ -20,16 +21,16 @@ class SamiError { int getCode(); void setCode(int pCode); - + String* getMessage(); void setMessage(String* pMessage); - -private: + + private: int pCode; String* pMessage; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SamiError_H_ */ + #endif /* SamiError_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiHelpers.cpp b/samples/client/petstore/tizen/client/SamiHelpers.cpp index 484be3246f7..32dbd5cc810 100644 --- a/samples/client/petstore/tizen/client/SamiHelpers.cpp +++ b/samples/client/petstore/tizen/client/SamiHelpers.cpp @@ -9,265 +9,265 @@ using namespace Tizen::Locales; using namespace Tizen::System; namespace Swagger { - JsonObject* - toJson(void* ptr, String type, String containerType) { - if(ptr == null) - return null; - if(containerType != null && !type.Equals(L"", false)) { - if(containerType.Equals(L"array", false)) { - if(type != null) { - IList* list = static_cast< IList* >(ptr); - JsonArray* array = new JsonArray(); - int sz = list->GetCount(); - for(int i = 0; i < sz; i++) { - void* itemAt = list->GetAt(i); - JsonObject* item = toJson(itemAt, type, null); - if(item != null) - array->Add(item); - } - return (JsonObject*)array; - } - return null; - } - } - else if(type.Equals(L"Boolean", false)) { - Boolean* v = static_cast< Boolean* >(ptr); - return (JsonObject*) new JsonBool(*v); - } - else if(type.Equals(L"String", false)) { - String* v = static_cast< String* >(ptr); - return (JsonObject*) new JsonString(*v); - } - else if(type.Equals(L"Integer", false)) { - Integer* v = static_cast< Integer* >(ptr); - return (JsonObject*) new JsonNumber(v->ToInt()); - } - else if(type.Equals(L"Long", false)) { - Long* v = static_cast< Long* >(ptr); - return (JsonObject*) new JsonNumber(v->ToInt()); - } - else if(type.Equals(L"Float", false)) { - Float* v = static_cast< Float* >(ptr); - return (JsonObject*) new JsonNumber(v->ToFloat()); - } - else if(type.Equals(L"Double", false)) { - Double* v = static_cast< Double* >(ptr); - return (JsonObject*) new JsonNumber(v->ToDouble()); - } - else if(type.Equals(L"DateTime", false)) { - DateTime* v = static_cast< DateTime* >(ptr); - DateTimeFormatter* pFormatter = DateTimeFormatter::CreateDateTimeFormatterN(); - String date; - pFormatter->ApplyPattern(L"yyyy-MM-dd"); - pFormatter->Format(*v, date); +JsonObject* +toJson(void* ptr, String type, String containerType) { +if(ptr == null) +return null; +if(containerType != null && !type.Equals(L"", false)) { +if(containerType.Equals(L"array", false)) { +if(type != null) { +IList* list = static_cast< IList* >(ptr); +JsonArray* array = new JsonArray(); +int sz = list->GetCount(); +for(int i = 0; i < sz; i++) { +void* itemAt = list->GetAt(i); +JsonObject* item = toJson(itemAt, type, null); +if(item != null) +array->Add(item); +} +return (JsonObject*)array; +} +return null; +} +} +else if(type.Equals(L"Boolean", false)) { +Boolean* v = static_cast< Boolean* >(ptr); +return (JsonObject*) new JsonBool(*v); +} +else if(type.Equals(L"String", false)) { +String* v = static_cast< String* >(ptr); +return (JsonObject*) new JsonString(*v); +} +else if(type.Equals(L"Integer", false)) { +Integer* v = static_cast< Integer* >(ptr); +return (JsonObject*) new JsonNumber(v->ToInt()); +} +else if(type.Equals(L"Long", false)) { +Long* v = static_cast< Long* >(ptr); +return (JsonObject*) new JsonNumber(v->ToInt()); +} +else if(type.Equals(L"Float", false)) { +Float* v = static_cast< Float* >(ptr); +return (JsonObject*) new JsonNumber(v->ToFloat()); +} +else if(type.Equals(L"Double", false)) { +Double* v = static_cast< Double* >(ptr); +return (JsonObject*) new JsonNumber(v->ToDouble()); +} +else if(type.Equals(L"DateTime", false)) { +DateTime* v = static_cast< DateTime* >(ptr); +DateTimeFormatter* pFormatter = DateTimeFormatter::CreateDateTimeFormatterN(); +String date; +pFormatter->ApplyPattern(L"yyyy-MM-dd"); +pFormatter->Format(*v, date); - String time; - pFormatter->ApplyPattern(L"hh:mm:ss"); - pFormatter->Format(*v, time); - String formattedString = date + "T" + time; - delete pFormatter; - return (JsonObject*)new JsonString(formattedString); - } - else if(type.StartsWith(L"Sami", 0)) { - SamiObject* obj = static_cast< SamiObject* >(ptr); - return obj->asJsonObject(); - } - return null; - } +String time; +pFormatter->ApplyPattern(L"hh:mm:ss"); +pFormatter->Format(*v, time); +String formattedString = date + "T" + time; +delete pFormatter; +return (JsonObject*)new JsonString(formattedString); +} +else if(type.StartsWith(L"Sami", 0)) { +SamiObject* obj = static_cast< SamiObject* >(ptr); +return obj->asJsonObject(); +} +return null; +} - void - toISO8601(String str, DateTime* dt) { - int idx, start; - int year, month, day, hour, minute, second; +void +toISO8601(String str, DateTime* dt) { +int idx, start; +int year, month, day, hour, minute, second; - start = 0; - str.IndexOf(L"-", start, idx); - String yearString; - str.SubString(0, idx, yearString); - Integer::Parse(yearString, year); +start = 0; +str.IndexOf(L"-", start, idx); +String yearString; +str.SubString(0, idx, yearString); +Integer::Parse(yearString, year); - start = idx+1; - str.IndexOf(L"-", start, idx); - String monthString; - str.SubString(start, idx - start, monthString); - Integer::Parse(monthString, month); +start = idx+1; +str.IndexOf(L"-", start, idx); +String monthString; +str.SubString(start, idx - start, monthString); +Integer::Parse(monthString, month); - start = idx+1; - str.IndexOf(L"T", start, idx); - String dayString; - str.SubString(start, idx - start, dayString); - Integer::Parse(dayString, day); +start = idx+1; +str.IndexOf(L"T", start, idx); +String dayString; +str.SubString(start, idx - start, dayString); +Integer::Parse(dayString, day); - start = idx+1; - str.IndexOf(L":", start, idx); - if(idx > 0) { - String hourString; - str.SubString(start, idx - start, hourString); - Integer::Parse(hourString, hour); - } +start = idx+1; +str.IndexOf(L":", start, idx); +if(idx > 0) { +String hourString; +str.SubString(start, idx - start, hourString); +Integer::Parse(hourString, hour); +} - start = idx+1; - str.IndexOf(L":", start, idx); - if(idx > 0) { - String minuteString; - str.SubString(start, idx - start, minuteString); - Integer::Parse(minuteString, minute); - } +start = idx+1; +str.IndexOf(L":", start, idx); +if(idx > 0) { +String minuteString; +str.SubString(start, idx - start, minuteString); +Integer::Parse(minuteString, minute); +} - start = idx+1; - str.IndexOf(L"+", start, idx); - if(idx > 0) { - String secondString; - str.SubString(start, idx - start, secondString); - Integer::Parse(secondString, second); - } +start = idx+1; +str.IndexOf(L"+", start, idx); +if(idx > 0) { +String secondString; +str.SubString(start, idx - start, secondString); +Integer::Parse(secondString, second); +} - dt->SetValue(year, month, day, hour, minute, second); - } +dt->SetValue(year, month, day, hour, minute, second); +} - void - jsonToValue(void* target, IJsonValue* ptr, String type, String innerType) { - if(target == null || ptr == null) { - return; - } - if(type.StartsWith(L"Boolean", 0)) { - JsonBool* json = static_cast< JsonBool* >(ptr); - Boolean* val = static_cast< Boolean* > (target); - val->value = json->ToBool(); - } - else if(type.StartsWith(L"String", 0)) { - JsonString* json = static_cast< JsonString* >(ptr); - String* val = static_cast< String* > (target); - val->Clear(); - val->Append(json->GetPointer()); - } - else if(type.StartsWith(L"Integer", 0)) { - JsonNumber* json = static_cast< JsonNumber* >(ptr); - Integer* val = static_cast< Integer* > (target); - *val = json->ToInt(); - } - else if(type.StartsWith(L"Long", 0)) { - JsonNumber* json = static_cast< JsonNumber* >(ptr); - Long* val = static_cast< Long* > (target); - *val = json->ToLong(); - } - else if(type.StartsWith(L"DateTime", 0)) { - JsonString* json = static_cast< JsonString* >(ptr); - String str; - str.Append(json->GetPointer()); +void +jsonToValue(void* target, IJsonValue* ptr, String type, String innerType) { +if(target == null || ptr == null) { +return; +} +if(type.StartsWith(L"Boolean", 0)) { +JsonBool* json = static_cast< JsonBool* >(ptr); +Boolean* val = static_cast< Boolean* > (target); +val->value = json->ToBool(); +} +else if(type.StartsWith(L"String", 0)) { +JsonString* json = static_cast< JsonString* >(ptr); +String* val = static_cast< String* > (target); +val->Clear(); +val->Append(json->GetPointer()); +} +else if(type.StartsWith(L"Integer", 0)) { +JsonNumber* json = static_cast< JsonNumber* >(ptr); +Integer* val = static_cast< Integer* > (target); +*val = json->ToInt(); +} +else if(type.StartsWith(L"Long", 0)) { +JsonNumber* json = static_cast< JsonNumber* >(ptr); +Long* val = static_cast< Long* > (target); +*val = json->ToLong(); +} +else if(type.StartsWith(L"DateTime", 0)) { +JsonString* json = static_cast< JsonString* >(ptr); +String str; +str.Append(json->GetPointer()); - DateTime* val = static_cast< DateTime* > (target); - toISO8601(str, val); - } - else if(type.StartsWith(L"Sami", 0)) { - SamiObject* obj = static_cast< SamiObject* > (target); - obj->fromJsonObject(ptr); - } - else if(type.StartsWith(L"IList", 0)) { - IList* obj = static_cast< IList* >(target); - JsonArray* pJsonArray = static_cast< JsonArray* >(ptr); +DateTime* val = static_cast< DateTime* > (target); +toISO8601(str, val); +} +else if(type.StartsWith(L"Sami", 0)) { +SamiObject* obj = static_cast< SamiObject* > (target); +obj->fromJsonObject(ptr); +} +else if(type.StartsWith(L"IList", 0)) { +IList* obj = static_cast< IList* >(target); +JsonArray* pJsonArray = static_cast< JsonArray* >(ptr); - IEnumeratorT< IJsonValue* >* pEnum = pJsonArray->GetEnumeratorN(); - while (pEnum->MoveNext() == E_SUCCESS) { - IJsonValue* pJsonValue = null; - pEnum->GetCurrent(pJsonValue); - void* updatedTarget = null; - updatedTarget = create(innerType); +IEnumeratorT< IJsonValue* >* pEnum = pJsonArray->GetEnumeratorN(); +while (pEnum->MoveNext() == E_SUCCESS) { +IJsonValue* pJsonValue = null; +pEnum->GetCurrent(pJsonValue); +void* updatedTarget = null; +updatedTarget = create(innerType); - if(updatedTarget != null) { - jsonToValue(updatedTarget, pJsonValue, innerType, L""); - obj->Add((Object*)updatedTarget); - } - } - delete pEnum; - } - } +if(updatedTarget != null) { +jsonToValue(updatedTarget, pJsonValue, innerType, L""); +obj->Add((Object*)updatedTarget); +} +} +delete pEnum; +} +} - Integer* - jsonToInteger(IJsonValue* value) { - if(value == null) - return null; - switch(value->GetType()) { - case JSON_TYPE_STRING: - break; - case JSON_TYPE_NUMBER: { - JsonNumber* number = static_cast< JsonNumber* >(value); - int num = number->ToInt(); - return new Integer(num); - } - case JSON_TYPE_OBJECT: - break; - case JSON_TYPE_ARRAY: - break; - case JSON_TYPE_BOOL: - break; - case JSON_TYPE_NULL: - break; - } - return null; - } +Integer* +jsonToInteger(IJsonValue* value) { +if(value == null) +return null; +switch(value->GetType()) { +case JSON_TYPE_STRING: +break; +case JSON_TYPE_NUMBER: { +JsonNumber* number = static_cast< JsonNumber* >(value); +int num = number->ToInt(); +return new Integer(num); +} +case JSON_TYPE_OBJECT: +break; +case JSON_TYPE_ARRAY: +break; +case JSON_TYPE_BOOL: +break; +case JSON_TYPE_NULL: +break; +} +return null; +} - Long* - jsonToLong(IJsonValue* value) { - if(value == null) - return null; - switch(value->GetType()) { - case JSON_TYPE_STRING: - break; - case JSON_TYPE_NUMBER: { - JsonNumber* number = static_cast< JsonNumber* >(value); - long int num = number->ToLong(); - return new Long(num); - } - case JSON_TYPE_OBJECT: - break; - case JSON_TYPE_ARRAY: - break; - case JSON_TYPE_BOOL: - break; - case JSON_TYPE_NULL: - break; - } - return null; - } +Long* +jsonToLong(IJsonValue* value) { +if(value == null) +return null; +switch(value->GetType()) { +case JSON_TYPE_STRING: +break; +case JSON_TYPE_NUMBER: { +JsonNumber* number = static_cast< JsonNumber* >(value); +long int num = number->ToLong(); +return new Long(num); +} +case JSON_TYPE_OBJECT: +break; +case JSON_TYPE_ARRAY: +break; +case JSON_TYPE_BOOL: +break; +case JSON_TYPE_NULL: +break; +} +return null; +} - String* - jsonToString(IJsonValue* value) { - if(value == null) - return null; - switch(value->GetType()) { - case JSON_TYPE_STRING: { - JsonString* string = static_cast< JsonString* >(value); - return new String(string->GetPointer()); - } - case JSON_TYPE_NUMBER: - break; - case JSON_TYPE_OBJECT: - break; - case JSON_TYPE_ARRAY: - break; - case JSON_TYPE_BOOL: - break; - case JSON_TYPE_NULL: - break; - } - return null; - } +String* +jsonToString(IJsonValue* value) { +if(value == null) +return null; +switch(value->GetType()) { +case JSON_TYPE_STRING: { +JsonString* string = static_cast< JsonString* >(value); +return new String(string->GetPointer()); +} +case JSON_TYPE_NUMBER: +break; +case JSON_TYPE_OBJECT: +break; +case JSON_TYPE_ARRAY: +break; +case JSON_TYPE_BOOL: +break; +case JSON_TYPE_NULL: +break; +} +return null; +} - String - stringify(void* ptr, String type) { - if(type.StartsWith(L"String", 0)) { - String * str = static_cast< String* > (ptr); - return String(str->GetPointer()); - } - if(type.StartsWith(L"Integer", 0)) { - Integer* pInt = static_cast< Integer* > (ptr); - return pInt->ToString(); - } - if(type.StartsWith(L"Long", 0)) { - Long* pLong = static_cast< Long* > (ptr); - return pLong->ToString(); - } - return L""; - } +String +stringify(void* ptr, String type) { +if(type.StartsWith(L"String", 0)) { +String * str = static_cast< String* > (ptr); +return String(str->GetPointer()); +} +if(type.StartsWith(L"Integer", 0)) { +Integer* pInt = static_cast< Integer* > (ptr); +return pInt->ToString(); +} +if(type.StartsWith(L"Long", 0)) { +Long* pLong = static_cast< Long* > (ptr); +return pLong->ToString(); +} +return L""; +} } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiHelpers.h b/samples/client/petstore/tizen/client/SamiHelpers.h index e29eb3cb34b..c7181c6432f 100644 --- a/samples/client/petstore/tizen/client/SamiHelpers.h +++ b/samples/client/petstore/tizen/client/SamiHelpers.h @@ -1,45 +1,50 @@ #ifndef HELPERS_H_ #define HELPERS_H_ -#include -#include -#include -#include -#include -#include "SamiHelpers.h" -#include "SamiObject.h" - -using Tizen::Base::String; -using Tizen::Base::DateTime; -using namespace Tizen::Web::Json; -using namespace Tizen::Base::Collection; - -using Tizen::Base::Long; -using Tizen::Base::DateTime; -using Tizen::Base::String; -using Tizen::Base::Integer; - -namespace Swagger { -JsonObject* -toJson(void* v, String type, String containerType); - -void -jsonToValue(void* target, IJsonValue* ptr, String type, String innerType); - -Integer* -jsonToInteger(IJsonValue* value); - -Long* -jsonToLong(IJsonValue* value); - -String* -jsonToString(IJsonValue* value); - -DateTime* -jsonToDateTime(IJsonValue* value); - -String -stringify(void* ptr, String type); - -} /* namespace Swagger */ -#endif /* HELPERS_H_ */ +#include + + #include + + #include + + #include + + #include + + #include "SamiHelpers.h" + #include "SamiObject.h" + + using Tizen::Base::String; + using Tizen::Base::DateTime; + using namespace Tizen::Web::Json; + using namespace Tizen::Base::Collection; + + using Tizen::Base::Long; + using Tizen::Base::DateTime; + using Tizen::Base::String; + using Tizen::Base::Integer; + + namespace Swagger { + JsonObject* + toJson(void* v, String type, String containerType); + + void + jsonToValue(void* target, IJsonValue* ptr, String type, String innerType); + + Integer* + jsonToInteger(IJsonValue* value); + + Long* + jsonToLong(IJsonValue* value); + + String* + jsonToString(IJsonValue* value); + + DateTime* + jsonToDateTime(IJsonValue* value); + + String + stringify(void* ptr, String type); + + } /* namespace Swagger */ + #endif /* HELPERS_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiModelFactory.h b/samples/client/petstore/tizen/client/SamiModelFactory.h index a2e1ab0e0de..6331b2af5c6 100644 --- a/samples/client/petstore/tizen/client/SamiModelFactory.h +++ b/samples/client/petstore/tizen/client/SamiModelFactory.h @@ -3,45 +3,45 @@ #include "SamiObject.h" -#include "SamiUser.h" -#include "SamiCategory.h" -#include "SamiPet.h" -#include "SamiTag.h" -#include "SamiOrder.h" + #include "SamiUser.h" + #include "SamiCategory.h" + #include "SamiPet.h" + #include "SamiTag.h" + #include "SamiOrder.h" namespace Swagger { - void* - create(String type) { - if(type.Equals(L"SamiUser", true)) { - return new SamiUser(); - } - if(type.Equals(L"SamiCategory", true)) { - return new SamiCategory(); - } - if(type.Equals(L"SamiPet", true)) { - return new SamiPet(); - } - if(type.Equals(L"SamiTag", true)) { - return new SamiTag(); - } - if(type.Equals(L"SamiOrder", true)) { - return new SamiOrder(); - } - - if(type.Equals(L"String", true)) { - return new String(); - } - if(type.Equals(L"Integer", true)) { - return new Integer(); - } - if(type.Equals(L"Long", true)) { - return new Long(); - } - if(type.Equals(L"DateTime", true)) { - return new DateTime(); - } - return null; - } +void* +create(String type) { +if(type.Equals(L"SamiUser", true)) { +return new SamiUser(); +} +if(type.Equals(L"SamiCategory", true)) { +return new SamiCategory(); +} +if(type.Equals(L"SamiPet", true)) { +return new SamiPet(); +} +if(type.Equals(L"SamiTag", true)) { +return new SamiTag(); +} +if(type.Equals(L"SamiOrder", true)) { +return new SamiOrder(); +} + +if(type.Equals(L"String", true)) { +return new String(); +} +if(type.Equals(L"Integer", true)) { +return new Integer(); +} +if(type.Equals(L"Long", true)) { +return new Long(); +} +if(type.Equals(L"DateTime", true)) { +return new DateTime(); +} +return null; +} } /* namespace Swagger */ #endif /* ModelFactory_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiObject.h b/samples/client/petstore/tizen/client/SamiObject.h index b0f921205ad..8feefbe3552 100644 --- a/samples/client/petstore/tizen/client/SamiObject.h +++ b/samples/client/petstore/tizen/client/SamiObject.h @@ -1,27 +1,30 @@ #ifndef _Sami_OBJECT_H_ #define _Sami_OBJECT_H_ -#include -#include -#include +#include + + #include + + #include + -using Tizen::Base::String; + using Tizen::Base::String; -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; -class SamiObject { - public: - virtual JsonObject* asJsonObject() { - return null; - } - virtual ~SamiObject() {} - virtual SamiObject* fromJson(String* obj) { - return null; - } - virtual void fromJsonObject(IJsonValue* obj) {} - virtual String asJson() { - return L""; - } -}; + class SamiObject { + public: + virtual JsonObject* asJsonObject() { + return null; + } + virtual ~SamiObject() {} + virtual SamiObject* fromJson(String* obj) { + return null; + } + virtual void fromJsonObject(IJsonValue* obj) {} + virtual String asJson() { + return L""; + } + }; -#endif /* _Sami_OBJECT_H_ */ + #endif /* _Sami_OBJECT_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiOrder.cpp b/samples/client/petstore/tizen/client/SamiOrder.cpp index a319e88e616..f75cb93277d 100644 --- a/samples/client/petstore/tizen/client/SamiOrder.cpp +++ b/samples/client/petstore/tizen/client/SamiOrder.cpp @@ -1,27 +1,28 @@ -#include "SamiOrder.h" -#include + #include "SamiOrder.h" + #include + -using namespace Tizen::Base; -using namespace Tizen::System; -using namespace Tizen::Base::Utility; -using namespace Tizen::Base::Collection; -using namespace Tizen::Web::Json; -using namespace Tizen::Locales; + using namespace Tizen::Base; + using namespace Tizen::System; + using namespace Tizen::Base::Utility; + using namespace Tizen::Base::Collection; + using namespace Tizen::Web::Json; + using namespace Tizen::Locales; -namespace Swagger { + namespace Swagger { -SamiOrder::SamiOrder() { - init(); -} + SamiOrder::SamiOrder() { + init(); + } -SamiOrder::~SamiOrder() { - this->cleanup(); -} + SamiOrder::~SamiOrder() { + this->cleanup(); + } -void -SamiOrder::init() { + void + SamiOrder::init() { pId = null; pPetId = null; pQuantity = null; @@ -29,266 +30,273 @@ SamiOrder::init() { pStatus = null; pComplete = null; -} + } -void -SamiOrder::cleanup() { + void + SamiOrder::cleanup() { if(pId != null) { - + delete pId; - pId = null; - } + pId = null; + } if(pPetId != null) { - + delete pPetId; - pPetId = null; - } + pPetId = null; + } if(pQuantity != null) { - + delete pQuantity; - pQuantity = null; - } + pQuantity = null; + } if(pShipDate != null) { - + delete pShipDate; - pShipDate = null; - } + pShipDate = null; + } if(pStatus != null) { - + delete pStatus; - pStatus = null; - } + pStatus = null; + } if(pComplete != null) { - + delete pComplete; - pComplete = null; - } + pComplete = null; + } -} - - -SamiOrder* -SamiOrder::fromJson(String* json) { - this->cleanup(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; - return this; -} - - -void -SamiOrder::fromJsonObject(IJsonValue* pJson) { - JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); - - if(pJsonObject != null) { - JsonString* pIdKey = new JsonString(L"id"); + } + + + SamiOrder* + SamiOrder::fromJson(String* json) { + this->cleanup(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + return this; + } + + + void + SamiOrder::fromJsonObject(IJsonValue* pJson) { + JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); + + if(pJsonObject != null) { + JsonString* pIdKey = new JsonString(L"id"); IJsonValue* pIdVal = null; pJsonObject->GetValue(pIdKey, pIdVal); if(pIdVal != null) { - - pId = new Long(); - jsonToValue(pId, pIdVal, L"Long", L"Long"); + + pId = new Long(); + jsonToValue(pId, pIdVal, L"Long", L"Long"); } delete pIdKey; - JsonString* pPetIdKey = new JsonString(L"petId"); + JsonString* pPetIdKey = new JsonString(L"petId"); IJsonValue* pPetIdVal = null; pJsonObject->GetValue(pPetIdKey, pPetIdVal); if(pPetIdVal != null) { - - pPetId = new Long(); - jsonToValue(pPetId, pPetIdVal, L"Long", L"Long"); + + pPetId = new Long(); + jsonToValue(pPetId, pPetIdVal, L"Long", L"Long"); } delete pPetIdKey; - JsonString* pQuantityKey = new JsonString(L"quantity"); + JsonString* pQuantityKey = new JsonString(L"quantity"); IJsonValue* pQuantityVal = null; pJsonObject->GetValue(pQuantityKey, pQuantityVal); if(pQuantityVal != null) { - - pQuantity = new Integer(); - jsonToValue(pQuantity, pQuantityVal, L"Integer", L"Integer"); + + pQuantity = new Integer(); + jsonToValue(pQuantity, pQuantityVal, L"Integer", L"Integer"); } delete pQuantityKey; - JsonString* pShipDateKey = new JsonString(L"shipDate"); + JsonString* pShipDateKey = new JsonString(L"shipDate"); IJsonValue* pShipDateVal = null; pJsonObject->GetValue(pShipDateKey, pShipDateVal); if(pShipDateVal != null) { - - pShipDate = new DateTime(); - jsonToValue(pShipDate, pShipDateVal, L"DateTime", L"DateTime"); + + pShipDate = new DateTime(); + jsonToValue(pShipDate, pShipDateVal, L"DateTime", L"DateTime"); } delete pShipDateKey; - JsonString* pStatusKey = new JsonString(L"status"); + JsonString* pStatusKey = new JsonString(L"status"); IJsonValue* pStatusVal = null; pJsonObject->GetValue(pStatusKey, pStatusVal); if(pStatusVal != null) { - - pStatus = new String(); - jsonToValue(pStatus, pStatusVal, L"String", L"String"); + + pStatus = new String(); + jsonToValue(pStatus, pStatusVal, L"String", L"String"); } delete pStatusKey; - JsonString* pCompleteKey = new JsonString(L"complete"); + JsonString* pCompleteKey = new JsonString(L"complete"); IJsonValue* pCompleteVal = null; pJsonObject->GetValue(pCompleteKey, pCompleteVal); if(pCompleteVal != null) { - - pComplete = new Boolean(false); - jsonToValue(pComplete, pCompleteVal, L"Boolean", L"Boolean"); + + pComplete = new Boolean(false); + jsonToValue(pComplete, pCompleteVal, L"Boolean", L"Boolean"); } delete pCompleteKey; - - } -} - -SamiOrder::SamiOrder(String* json) { - init(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; -} - -String -SamiOrder::asJson () -{ - JsonObject* pJsonObject = asJsonObject(); - - char *pComposeBuf = new char[256]; - JsonWriter::Compose(pJsonObject, pComposeBuf, 256); - String s = String(pComposeBuf); - - delete pComposeBuf; - pJsonObject->RemoveAll(true); - delete pJsonObject; - - return s; -} - -JsonObject* -SamiOrder::asJsonObject() { - JsonObject *pJsonObject = new JsonObject(); - pJsonObject->Construct(); + + } + } + + SamiOrder::SamiOrder(String* json) { + init(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + } + + String + SamiOrder::asJson () + { + JsonObject* pJsonObject = asJsonObject(); + + char *pComposeBuf = new char[256]; + JsonWriter::Compose(pJsonObject, pComposeBuf, 256); + String s = String(pComposeBuf); + + delete pComposeBuf; + pJsonObject->RemoveAll(true); + delete pJsonObject; + + return s; + } + + JsonObject* + SamiOrder::asJsonObject() { + JsonObject *pJsonObject = new JsonObject(); + pJsonObject->Construct(); + + + JsonString *pIdKey = new JsonString(L"id"); + pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + + + JsonString *pPetIdKey = new JsonString(L"petId"); + pJsonObject->Add(pPetIdKey, toJson(getPPetId(), "Long", "")); + + + JsonString *pQuantityKey = new JsonString(L"quantity"); + pJsonObject->Add(pQuantityKey, toJson(getPQuantity(), "Integer", "")); + + + JsonString *pShipDateKey = new JsonString(L"shipDate"); + pJsonObject->Add(pShipDateKey, toJson(getPShipDate(), "DateTime", "")); - JsonString *pIdKey = new JsonString(L"id"); - pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + JsonString *pStatusKey = new JsonString(L"status"); + pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", "")); - JsonString *pPetIdKey = new JsonString(L"petId"); - pJsonObject->Add(pPetIdKey, toJson(getPPetId(), "Long", "")); + JsonString *pCompleteKey = new JsonString(L"complete"); + pJsonObject->Add(pCompleteKey, toJson(getPComplete(), "Boolean", "")); - JsonString *pQuantityKey = new JsonString(L"quantity"); - pJsonObject->Add(pQuantityKey, toJson(getPQuantity(), "Integer", "")); + return pJsonObject; + } + + + Long* + SamiOrder::getPId() { + return pId; + } + void + SamiOrder::setPId(Long* pId) { + this->pId = pId; + } + + + Long* + SamiOrder::getPPetId() { + return pPetId; + } + void + SamiOrder::setPPetId(Long* pPetId) { + this->pPetId = pPetId; + } - JsonString *pShipDateKey = new JsonString(L"shipDate"); - pJsonObject->Add(pShipDateKey, toJson(getPShipDate(), "DateTime", "")); + Integer* + SamiOrder::getPQuantity() { + return pQuantity; + } + void + SamiOrder::setPQuantity(Integer* pQuantity) { + this->pQuantity = pQuantity; + } - JsonString *pStatusKey = new JsonString(L"status"); - pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", "")); + DateTime* + SamiOrder::getPShipDate() { + return pShipDate; + } + void + SamiOrder::setPShipDate(DateTime* pShipDate) { + this->pShipDate = pShipDate; + } - JsonString *pCompleteKey = new JsonString(L"complete"); - pJsonObject->Add(pCompleteKey, toJson(getPComplete(), "Boolean", "")); + String* + SamiOrder::getPStatus() { + return pStatus; + } + void + SamiOrder::setPStatus(String* pStatus) { + this->pStatus = pStatus; + } - return pJsonObject; -} - -Long* -SamiOrder::getPId() { - return pId; -} -void -SamiOrder::setPId(Long* pId) { - this->pId = pId; -} - -Long* -SamiOrder::getPPetId() { - return pPetId; -} -void -SamiOrder::setPPetId(Long* pPetId) { - this->pPetId = pPetId; -} - -Integer* -SamiOrder::getPQuantity() { - return pQuantity; -} -void -SamiOrder::setPQuantity(Integer* pQuantity) { - this->pQuantity = pQuantity; -} - -DateTime* -SamiOrder::getPShipDate() { - return pShipDate; -} -void -SamiOrder::setPShipDate(DateTime* pShipDate) { - this->pShipDate = pShipDate; -} - -String* -SamiOrder::getPStatus() { - return pStatus; -} -void -SamiOrder::setPStatus(String* pStatus) { - this->pStatus = pStatus; -} - -Boolean* -SamiOrder::getPComplete() { - return pComplete; -} -void -SamiOrder::setPComplete(Boolean* pComplete) { - this->pComplete = pComplete; -} - - - -} /* namespace Swagger */ + Boolean* + SamiOrder::getPComplete() { + return pComplete; + } + void + SamiOrder::setPComplete(Boolean* pComplete) { + this->pComplete = pComplete; + } + + + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiOrder.h b/samples/client/petstore/tizen/client/SamiOrder.h index 08b79cc195c..0b13f1723f7 100644 --- a/samples/client/petstore/tizen/client/SamiOrder.h +++ b/samples/client/petstore/tizen/client/SamiOrder.h @@ -1,20 +1,24 @@ /* - * SamiOrder.h - * - * - */ +* SamiOrder.h +* +* +*/ #ifndef SamiOrder_H_ #define SamiOrder_H_ -#include -#include -#include -#include -#include "SamiHelpers.h" -#include "SamiObject.h" +#include + + #include + + #include + + #include + + #include "SamiHelpers.h" + #include "SamiObject.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; using Tizen::Base::Long; @@ -24,47 +28,47 @@ using Tizen::Base::Boolean; using Tizen::Base::Integer; -namespace Swagger { + namespace Swagger { -class SamiOrder: public SamiObject { -public: + class SamiOrder: public SamiObject { + public: SamiOrder(); SamiOrder(String* json); - virtual ~SamiOrder(); + virtual ~SamiOrder(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); SamiOrder* fromJson(String* obj); - Long* getPId(); - void setPId(Long* pId); + Long* getPId(); + void setPId(Long* pId); - Long* getPPetId(); - void setPPetId(Long* pPetId); + Long* getPPetId(); + void setPPetId(Long* pPetId); - Integer* getPQuantity(); - void setPQuantity(Integer* pQuantity); + Integer* getPQuantity(); + void setPQuantity(Integer* pQuantity); - DateTime* getPShipDate(); - void setPShipDate(DateTime* pShipDate); + DateTime* getPShipDate(); + void setPShipDate(DateTime* pShipDate); - String* getPStatus(); - void setPStatus(String* pStatus); + String* getPStatus(); + void setPStatus(String* pStatus); - Boolean* getPComplete(); - void setPComplete(Boolean* pComplete); + Boolean* getPComplete(); + void setPComplete(Boolean* pComplete); -private: + private: Long* pId; Long* pPetId; Integer* pQuantity; @@ -72,8 +76,8 @@ class SamiOrder: public SamiObject { String* pStatus; Boolean* pComplete; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SamiOrder_H_ */ + #endif /* SamiOrder_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiPet.cpp b/samples/client/petstore/tizen/client/SamiPet.cpp index ecf63f060a4..a24dca97441 100644 --- a/samples/client/petstore/tizen/client/SamiPet.cpp +++ b/samples/client/petstore/tizen/client/SamiPet.cpp @@ -1,27 +1,28 @@ -#include "SamiPet.h" -#include + #include "SamiPet.h" + #include + -using namespace Tizen::Base; -using namespace Tizen::System; -using namespace Tizen::Base::Utility; -using namespace Tizen::Base::Collection; -using namespace Tizen::Web::Json; -using namespace Tizen::Locales; + using namespace Tizen::Base; + using namespace Tizen::System; + using namespace Tizen::Base::Utility; + using namespace Tizen::Base::Collection; + using namespace Tizen::Web::Json; + using namespace Tizen::Locales; -namespace Swagger { + namespace Swagger { -SamiPet::SamiPet() { - init(); -} + SamiPet::SamiPet() { + init(); + } -SamiPet::~SamiPet() { - this->cleanup(); -} + SamiPet::~SamiPet() { + this->cleanup(); + } -void -SamiPet::init() { + void + SamiPet::init() { pId = null; pCategory = null; pName = null; @@ -29,266 +30,273 @@ SamiPet::init() { pTags = null; pStatus = null; -} + } -void -SamiPet::cleanup() { + void + SamiPet::cleanup() { if(pId != null) { - + delete pId; - pId = null; - } + pId = null; + } if(pCategory != null) { - + delete pCategory; - pCategory = null; - } + pCategory = null; + } if(pName != null) { - + delete pName; - pName = null; - } + pName = null; + } if(pPhotoUrls != null) { - pPhotoUrls->RemoveAll(true); + pPhotoUrls->RemoveAll(true); delete pPhotoUrls; - pPhotoUrls = null; - } + pPhotoUrls = null; + } if(pTags != null) { - pTags->RemoveAll(true); + pTags->RemoveAll(true); delete pTags; - pTags = null; - } + pTags = null; + } if(pStatus != null) { - + delete pStatus; - pStatus = null; - } + pStatus = null; + } -} - - -SamiPet* -SamiPet::fromJson(String* json) { - this->cleanup(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; - return this; -} - - -void -SamiPet::fromJsonObject(IJsonValue* pJson) { - JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); - - if(pJsonObject != null) { - JsonString* pIdKey = new JsonString(L"id"); + } + + + SamiPet* + SamiPet::fromJson(String* json) { + this->cleanup(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + return this; + } + + + void + SamiPet::fromJsonObject(IJsonValue* pJson) { + JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); + + if(pJsonObject != null) { + JsonString* pIdKey = new JsonString(L"id"); IJsonValue* pIdVal = null; pJsonObject->GetValue(pIdKey, pIdVal); if(pIdVal != null) { - - pId = new Long(); - jsonToValue(pId, pIdVal, L"Long", L"Long"); + + pId = new Long(); + jsonToValue(pId, pIdVal, L"Long", L"Long"); } delete pIdKey; - JsonString* pCategoryKey = new JsonString(L"category"); + JsonString* pCategoryKey = new JsonString(L"category"); IJsonValue* pCategoryVal = null; pJsonObject->GetValue(pCategoryKey, pCategoryVal); if(pCategoryVal != null) { - - pCategory = new SamiCategory(); - jsonToValue(pCategory, pCategoryVal, L"SamiCategory", L"SamiCategory"); + + pCategory = new SamiCategory(); + jsonToValue(pCategory, pCategoryVal, L"SamiCategory", L"SamiCategory"); } delete pCategoryKey; - JsonString* pNameKey = new JsonString(L"name"); + JsonString* pNameKey = new JsonString(L"name"); IJsonValue* pNameVal = null; pJsonObject->GetValue(pNameKey, pNameVal); if(pNameVal != null) { - - pName = new String(); - jsonToValue(pName, pNameVal, L"String", L"String"); + + pName = new String(); + jsonToValue(pName, pNameVal, L"String", L"String"); } delete pNameKey; - JsonString* pPhotoUrlsKey = new JsonString(L"photoUrls"); + JsonString* pPhotoUrlsKey = new JsonString(L"photoUrls"); IJsonValue* pPhotoUrlsVal = null; pJsonObject->GetValue(pPhotoUrlsKey, pPhotoUrlsVal); if(pPhotoUrlsVal != null) { - pPhotoUrls = new ArrayList(); - - jsonToValue(pPhotoUrls, pPhotoUrlsVal, L"IList", L"String"); + pPhotoUrls = new ArrayList(); + + jsonToValue(pPhotoUrls, pPhotoUrlsVal, L"IList", L"String"); } delete pPhotoUrlsKey; - JsonString* pTagsKey = new JsonString(L"tags"); + JsonString* pTagsKey = new JsonString(L"tags"); IJsonValue* pTagsVal = null; pJsonObject->GetValue(pTagsKey, pTagsVal); if(pTagsVal != null) { - pTags = new ArrayList(); - - jsonToValue(pTags, pTagsVal, L"IList", L"SamiTag"); + pTags = new ArrayList(); + + jsonToValue(pTags, pTagsVal, L"IList", L"SamiTag"); } delete pTagsKey; - JsonString* pStatusKey = new JsonString(L"status"); + JsonString* pStatusKey = new JsonString(L"status"); IJsonValue* pStatusVal = null; pJsonObject->GetValue(pStatusKey, pStatusVal); if(pStatusVal != null) { - - pStatus = new String(); - jsonToValue(pStatus, pStatusVal, L"String", L"String"); + + pStatus = new String(); + jsonToValue(pStatus, pStatusVal, L"String", L"String"); } delete pStatusKey; - - } -} - -SamiPet::SamiPet(String* json) { - init(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; -} - -String -SamiPet::asJson () -{ - JsonObject* pJsonObject = asJsonObject(); - - char *pComposeBuf = new char[256]; - JsonWriter::Compose(pJsonObject, pComposeBuf, 256); - String s = String(pComposeBuf); - - delete pComposeBuf; - pJsonObject->RemoveAll(true); - delete pJsonObject; - - return s; -} - -JsonObject* -SamiPet::asJsonObject() { - JsonObject *pJsonObject = new JsonObject(); - pJsonObject->Construct(); + + } + } + + SamiPet::SamiPet(String* json) { + init(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + } + + String + SamiPet::asJson () + { + JsonObject* pJsonObject = asJsonObject(); + + char *pComposeBuf = new char[256]; + JsonWriter::Compose(pJsonObject, pComposeBuf, 256); + String s = String(pComposeBuf); + + delete pComposeBuf; + pJsonObject->RemoveAll(true); + delete pJsonObject; + + return s; + } + + JsonObject* + SamiPet::asJsonObject() { + JsonObject *pJsonObject = new JsonObject(); + pJsonObject->Construct(); + + + JsonString *pIdKey = new JsonString(L"id"); + pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + + + JsonString *pCategoryKey = new JsonString(L"category"); + pJsonObject->Add(pCategoryKey, toJson(getPCategory(), "SamiCategory", "")); + + + JsonString *pNameKey = new JsonString(L"name"); + pJsonObject->Add(pNameKey, toJson(getPName(), "String", "")); + + + JsonString *pPhotoUrlsKey = new JsonString(L"photoUrls"); + pJsonObject->Add(pPhotoUrlsKey, toJson(getPPhotoUrls(), "String", "array")); - JsonString *pIdKey = new JsonString(L"id"); - pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + JsonString *pTagsKey = new JsonString(L"tags"); + pJsonObject->Add(pTagsKey, toJson(getPTags(), "SamiTag", "array")); - JsonString *pCategoryKey = new JsonString(L"category"); - pJsonObject->Add(pCategoryKey, toJson(getPCategory(), "SamiCategory", "")); + JsonString *pStatusKey = new JsonString(L"status"); + pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", "")); - JsonString *pNameKey = new JsonString(L"name"); - pJsonObject->Add(pNameKey, toJson(getPName(), "String", "")); + return pJsonObject; + } + + + Long* + SamiPet::getPId() { + return pId; + } + void + SamiPet::setPId(Long* pId) { + this->pId = pId; + } + + + SamiCategory* + SamiPet::getPCategory() { + return pCategory; + } + void + SamiPet::setPCategory(SamiCategory* pCategory) { + this->pCategory = pCategory; + } - JsonString *pPhotoUrlsKey = new JsonString(L"photoUrls"); - pJsonObject->Add(pPhotoUrlsKey, toJson(getPPhotoUrls(), "String", "array")); + String* + SamiPet::getPName() { + return pName; + } + void + SamiPet::setPName(String* pName) { + this->pName = pName; + } - JsonString *pTagsKey = new JsonString(L"tags"); - pJsonObject->Add(pTagsKey, toJson(getPTags(), "SamiTag", "array")); + IList* + SamiPet::getPPhotoUrls() { + return pPhotoUrls; + } + void + SamiPet::setPPhotoUrls(IList* pPhotoUrls) { + this->pPhotoUrls = pPhotoUrls; + } - JsonString *pStatusKey = new JsonString(L"status"); - pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", "")); + IList* + SamiPet::getPTags() { + return pTags; + } + void + SamiPet::setPTags(IList* pTags) { + this->pTags = pTags; + } - return pJsonObject; -} - -Long* -SamiPet::getPId() { - return pId; -} -void -SamiPet::setPId(Long* pId) { - this->pId = pId; -} - -SamiCategory* -SamiPet::getPCategory() { - return pCategory; -} -void -SamiPet::setPCategory(SamiCategory* pCategory) { - this->pCategory = pCategory; -} - -String* -SamiPet::getPName() { - return pName; -} -void -SamiPet::setPName(String* pName) { - this->pName = pName; -} - -IList* -SamiPet::getPPhotoUrls() { - return pPhotoUrls; -} -void -SamiPet::setPPhotoUrls(IList* pPhotoUrls) { - this->pPhotoUrls = pPhotoUrls; -} - -IList* -SamiPet::getPTags() { - return pTags; -} -void -SamiPet::setPTags(IList* pTags) { - this->pTags = pTags; -} - -String* -SamiPet::getPStatus() { - return pStatus; -} -void -SamiPet::setPStatus(String* pStatus) { - this->pStatus = pStatus; -} - - - -} /* namespace Swagger */ + String* + SamiPet::getPStatus() { + return pStatus; + } + void + SamiPet::setPStatus(String* pStatus) { + this->pStatus = pStatus; + } + + + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiPet.h b/samples/client/petstore/tizen/client/SamiPet.h index a1658248436..d50fcc1915e 100644 --- a/samples/client/petstore/tizen/client/SamiPet.h +++ b/samples/client/petstore/tizen/client/SamiPet.h @@ -1,20 +1,24 @@ /* - * SamiPet.h - * - * - */ +* SamiPet.h +* +* +*/ #ifndef SamiPet_H_ #define SamiPet_H_ -#include -#include -#include -#include -#include "SamiHelpers.h" -#include "SamiObject.h" +#include + + #include + + #include + + #include + + #include "SamiHelpers.h" + #include "SamiObject.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; #include "SamiCategory.h" @@ -24,47 +28,47 @@ using Tizen::Base::String; using Tizen::Base::Collection::IList; -namespace Swagger { + namespace Swagger { -class SamiPet: public SamiObject { -public: + class SamiPet: public SamiObject { + public: SamiPet(); SamiPet(String* json); - virtual ~SamiPet(); + virtual ~SamiPet(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); SamiPet* fromJson(String* obj); - Long* getPId(); - void setPId(Long* pId); + Long* getPId(); + void setPId(Long* pId); - SamiCategory* getPCategory(); - void setPCategory(SamiCategory* pCategory); + SamiCategory* getPCategory(); + void setPCategory(SamiCategory* pCategory); - String* getPName(); - void setPName(String* pName); + String* getPName(); + void setPName(String* pName); - IList* getPPhotoUrls(); - void setPPhotoUrls(IList* pPhotoUrls); + IList* getPPhotoUrls(); + void setPPhotoUrls(IList* pPhotoUrls); - IList* getPTags(); - void setPTags(IList* pTags); + IList* getPTags(); + void setPTags(IList* pTags); - String* getPStatus(); - void setPStatus(String* pStatus); + String* getPStatus(); + void setPStatus(String* pStatus); -private: + private: Long* pId; SamiCategory* pCategory; String* pName; @@ -72,8 +76,8 @@ class SamiPet: public SamiObject { IList* pTags; String* pStatus; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SamiPet_H_ */ + #endif /* SamiPet_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiPetApi.cpp b/samples/client/petstore/tizen/client/SamiPetApi.cpp index 69997d3cee0..32a53aae42a 100644 --- a/samples/client/petstore/tizen/client/SamiPetApi.cpp +++ b/samples/client/petstore/tizen/client/SamiPetApi.cpp @@ -8,457 +8,466 @@ using namespace Tizen::Base; namespace Swagger { -SamiPetApi::SamiPetApi() { + SamiPetApi::SamiPetApi() { -} - -SamiPetApi::~SamiPetApi() { + } -} + SamiPetApi::~SamiPetApi() { -void -updatePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} + void + updatePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -void -SamiPetApi::updatePetWithCompletion(SamiPet* body, void(*success)(SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&updatePetProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiPetApi::updatePetWithCompletion(SamiPet* body, void(*success)(SamiError*)) { + client = new SamiApiClient(); - + client->success(&updatePetProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - - - - if(body != null) { - mBody = new String(body->asJson()); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - + String* mBody = null; - String url(L"/pet"); + + + + if(body != null) { + mBody = new String(body->asJson()); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + - + String url(L"/pet"); - client->execute(SamiPetApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} + -void -addPetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiPetApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - - handler(error, null); - } -} - -void -SamiPetApi::addPetWithCompletion(SamiPet* body, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&addPetProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - - if(body != null) { - mBody = new String(body->asJson()); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - - - String url(L"/pet"); - - - - client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - -void -findPetsByStatusProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); - - IList* out = new ArrayList(); - jsonToValue(out, pJson, L"IList*", L"SamiPet"); - - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); - } - - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); - } -} - -IList* -SamiPetApi::findPetsByStatusWithCompletion(IList* status, void (* success)(IList*, SamiError*)) { - client = new SamiApiClient(); + void + addPetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); - client->success(&findPetsByStatusProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - + void + SamiPetApi::addPetWithCompletion(SamiPet* body, void(*success)(SamiError*)) { + client = new SamiApiClient(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + client->success(&addPetProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - - int sz = status->GetCount(); - for(int i = 0; i < sz; i++) { - String itemAt = stringify(status->GetAt(i), "String*"); - queryParams->Add(new String("status"), new String(itemAt)); - } - - + - String* mBody = null; + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - + - String url(L"/pet/findByStatus"); + String* mBody = null; - + + + + if(body != null) { + mBody = new String(body->asJson()); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + - client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} + String url(L"/pet"); -void -findPetsByTagsProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - IList* out = new ArrayList(); - jsonToValue(out, pJson, L"IList*", L"SamiPet"); - - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); - } - - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); - } -} - -IList* -SamiPetApi::findPetsByTagsWithCompletion(IList* tags, void (* success)(IList*, SamiError*)) { - client = new SamiApiClient(); - - client->success(&findPetsByTagsProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - int sz = tags->GetCount(); - for(int i = 0; i < sz; i++) { - String itemAt = stringify(tags->GetAt(i), "String*"); - queryParams->Add(new String("tags"), new String(itemAt)); - } - - - - String* mBody = null; - - - - String url(L"/pet/findByTags"); + void + findPetsByStatusProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + IList* out = new ArrayList(); + jsonToValue(out, pJson, L"IList*", L"SamiPet"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + IList* + SamiPetApi::findPetsByStatusWithCompletion(IList* status, void (* success)(IList*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&findPetsByStatusProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + int sz = status->GetCount(); + for(int i = 0; i < sz; i++) { + String itemAt = stringify(status->GetAt(i), "String*"); + queryParams->Add(new String("status"), new String(itemAt)); + } + + + + String* mBody = null; + + + + String url(L"/pet/findByStatus"); + + + + client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } - - - client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} - -void -getPetByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); - - SamiPet* out = new SamiPet(); - jsonToValue(out, pJson, L"SamiPet*", L"SamiPet"); + + void + findPetsByTagsProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + IList* out = new ArrayList(); + jsonToValue(out, pJson, L"IList*", L"SamiPet"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + IList* + SamiPetApi::findPetsByTagsWithCompletion(IList* tags, void (* success)(IList*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&findPetsByTagsProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + int sz = tags->GetCount(); + for(int i = 0; i < sz; i++) { + String itemAt = stringify(tags->GetAt(i), "String*"); + queryParams->Add(new String("tags"), new String(itemAt)); + } + + + + String* mBody = null; + + + + String url(L"/pet/findByTags"); + + + + client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); - } - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); + void + getPetByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + SamiPet* out = new SamiPet(); + jsonToValue(out, pJson, L"SamiPet*", L"SamiPet"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + SamiPet* + SamiPetApi::getPetByIdWithCompletion(Long* petId, void (* success)(SamiPet*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&getPetByIdProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + String url(L"/pet/{petId}"); + + + String s_petId(L"{"); + s_petId.Append(L"petId"); + s_petId.Append(L"}"); + url.Replace(s_petId, stringify(petId, L"Long*")); + + + client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } + - } -} + void + updatePetWithFormProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -SamiPet* -SamiPetApi::getPetByIdWithCompletion(Long* petId, void (* success)(SamiPet*, SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&getPetByIdProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiPetApi::updatePetWithFormWithCompletion(String* petId, String* name, String* status, void(*success)(SamiError*)) { + client = new SamiApiClient(); - + client->success(&updatePetWithFormProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - + String* mBody = null; - String url(L"/pet/{petId}"); + - - String s_petId(L"{"); - s_petId.Append(L"petId"); - s_petId.Append(L"}"); - url.Replace(s_petId, stringify(petId, L"Long*")); - + String url(L"/pet/{petId}"); - client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} + + String s_petId(L"{"); + s_petId.Append(L"petId"); + s_petId.Append(L"}"); + url.Replace(s_petId, stringify(petId, L"String*")); + -void -updatePetWithFormProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} + void + deletePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -void -SamiPetApi::updatePetWithFormWithCompletion(String* petId, String* name, String* status, void(*success)(SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&updatePetWithFormProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiPetApi::deletePetWithCompletion(String* apiKey, Long* petId, void(*success)(SamiError*)) { + client = new SamiApiClient(); - + client->success(&deletePetProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + + headerParams->Add(new String("api_key"), apiKey); + + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - + String* mBody = null; - String url(L"/pet/{petId}"); + - - String s_petId(L"{"); - s_petId.Append(L"petId"); - s_petId.Append(L"}"); - url.Replace(s_petId, stringify(petId, L"String*")); - + String url(L"/pet/{petId}"); - client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} + + String s_petId(L"{"); + s_petId.Append(L"petId"); + s_petId.Append(L"}"); + url.Replace(s_petId, stringify(petId, L"Long*")); + -void -deletePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiPetApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} + void + uploadFileProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -void -SamiPetApi::deletePetWithCompletion(String* apiKey, Long* petId, void(*success)(SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&deletePetProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiPetApi::uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void(*success)(SamiError*)) { + client = new SamiApiClient(); - - headerParams->Add(new String("api_key"), apiKey); - - + client->success(&uploadFileProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - + String* mBody = null; - String url(L"/pet/{petId}"); + - - String s_petId(L"{"); - s_petId.Append(L"petId"); - s_petId.Append(L"}"); - url.Replace(s_petId, stringify(petId, L"Long*")); - + String url(L"/pet/{petId}/uploadImage"); - client->execute(SamiPetApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} + + String s_petId(L"{"); + s_petId.Append(L"petId"); + s_petId.Append(L"}"); + url.Replace(s_petId, stringify(petId, L"Long*")); + -void -uploadFileProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} - -void -SamiPetApi::uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&uploadFileProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - String url(L"/pet/{petId}/uploadImage"); - - - String s_petId(L"{"); - s_petId.Append(L"petId"); - s_petId.Append(L"}"); - url.Replace(s_petId, stringify(petId, L"Long*")); - - - client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiPetApi.h b/samples/client/petstore/tizen/client/SamiPetApi.h index 05844bd88bd..ac6d8d61762 100644 --- a/samples/client/petstore/tizen/client/SamiPetApi.h +++ b/samples/client/petstore/tizen/client/SamiPetApi.h @@ -1,58 +1,70 @@ #ifndef SamiPetApi_H_ #define SamiPetApi_H_ -#include -#include "SamiApiClient.h" -#include "SamiError.h" - -#include "SamiPet.h" -using Tizen::Base::String; -using Tizen::Base::Long; -#include "SamiFile.h" - -using namespace Tizen::Net::Http; - -namespace Swagger { - -class SamiPetApi { -public: - SamiPetApi(); - virtual ~SamiPetApi(); - - - void - updatePetWithCompletion(SamiPet* body, void(* handler)(SamiError*)); - - void - addPetWithCompletion(SamiPet* body, void(* handler)(SamiError*)); - - IList* - findPetsByStatusWithCompletion(IList* status, void (* handler)(IList*, SamiError*)); - - IList* - findPetsByTagsWithCompletion(IList* tags, void (* handler)(IList*, SamiError*)); - - SamiPet* - getPetByIdWithCompletion(Long* petId, void (* handler)(SamiPet*, SamiError*)); - - void - updatePetWithFormWithCompletion(String* petId, String* name, String* status, void(* handler)(SamiError*)); - - void - deletePetWithCompletion(String* apiKey, Long* petId, void(* handler)(SamiError*)); - - void - uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void(* handler)(SamiError*)); - - static String getBasePath() { - return L"http://petstore.swagger.io/v2"; - } - -private: - SamiApiClient* client; -}; - - -} /* namespace Swagger */ - -#endif /* SamiPetApi_H_ */ +#include + + #include "SamiApiClient.h" + #include "SamiError.h" + + #include "SamiPet.h" + using Tizen::Base::String; + using Tizen::Base::Long; + #include "SamiFile.h" + + + using namespace Tizen::Net::Http; + + namespace Swagger { + + + class SamiPetApi { + public: + SamiPetApi(); + virtual ~SamiPetApi(); + + + void + updatePetWithCompletion(SamiPet* body, void(* handler)(SamiError*)); + + void + addPetWithCompletion(SamiPet* body, void(* handler)(SamiError*)); + + IList* + findPetsByStatusWithCompletion(IList* status, void (* handler)(IList* + , SamiError*)); + + IList* + findPetsByTagsWithCompletion(IList* tags, void (* handler)(IList* + , SamiError*)); + + SamiPet* + getPetByIdWithCompletion(Long* petId, void (* handler)(SamiPet* + , SamiError*)); + + void + updatePetWithFormWithCompletion(String* petId + , String* name + , String* status, void(* handler)(SamiError*)); + + void + deletePetWithCompletion(String* apiKey + , Long* petId, void(* handler)(SamiError*)); + + void + uploadFileWithCompletion(Long* petId + , String* additionalMetadata + , SamiFile* file, void(* handler)(SamiError*)); + + static String getBasePath() { + return L"http://petstore.swagger.io/v2"; + } + + private: + SamiApiClient* client; + }; + + + + } /* namespace Swagger */ + + #endif /* SamiPetApi_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiStoreApi.cpp b/samples/client/petstore/tizen/client/SamiStoreApi.cpp index c567896c48d..be4bc6e8782 100644 --- a/samples/client/petstore/tizen/client/SamiStoreApi.cpp +++ b/samples/client/petstore/tizen/client/SamiStoreApi.cpp @@ -8,258 +8,263 @@ using namespace Tizen::Base; namespace Swagger { -SamiStoreApi::SamiStoreApi() { + SamiStoreApi::SamiStoreApi() { -} - -SamiStoreApi::~SamiStoreApi() { - -} - -void -getInventoryProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); - - HashMap* out = new HashMap(); - jsonToValue(out, pJson, L"HashMap*", L"Integer"); - - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); } - - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); - - } -} - -HashMap* -SamiStoreApi::getInventoryWithCompletion( void (* success)(HashMap*, SamiError*)) { - client = new SamiApiClient(); - - client->success(&getInventoryProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - + SamiStoreApi::~SamiStoreApi() { - String* mBody = null; - - - - String url(L"/store/inventory"); - - - - client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} - -void -placeOrderProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); - - SamiOrder* out = new SamiOrder(); - jsonToValue(out, pJson, L"SamiOrder*", L"SamiOrder"); - - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); } - - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); - - } -} - -SamiOrder* -SamiStoreApi::placeOrderWithCompletion(SamiOrder* body, void (* success)(SamiOrder*, SamiError*)) { - client = new SamiApiClient(); - - client->success(&placeOrderProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - - if(body != null) { - mBody = new String(body->asJson()); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - - - String url(L"/store/order"); - - - - client->execute(SamiStoreApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} - -void -getOrderByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + void + getInventoryProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + HashMap* out = new HashMap(); + jsonToValue(out, pJson, L"HashMap*", L"Integer"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + HashMap* + SamiStoreApi::getInventoryWithCompletion( void (* success)(HashMap*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&getInventoryProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + String url(L"/store/inventory"); + + + + client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } - SamiOrder* out = new SamiOrder(); - jsonToValue(out, pJson, L"SamiOrder*", L"SamiOrder"); + + void + placeOrderProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + SamiOrder* out = new SamiOrder(); + jsonToValue(out, pJson, L"SamiOrder*", L"SamiOrder"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + SamiOrder* + SamiStoreApi::placeOrderWithCompletion(SamiOrder* body, void (* success)(SamiOrder*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&placeOrderProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + + if(body != null) { + mBody = new String(body->asJson()); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + + + String url(L"/store/order"); + + + + client->execute(SamiStoreApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); - } - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); + void + getOrderByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + SamiOrder* out = new SamiOrder(); + jsonToValue(out, pJson, L"SamiOrder*", L"SamiOrder"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + SamiOrder* + SamiStoreApi::getOrderByIdWithCompletion(String* orderId, void (* success)(SamiOrder*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&getOrderByIdProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + String url(L"/store/order/{orderId}"); + + + String s_orderId(L"{"); + s_orderId.Append(L"orderId"); + s_orderId.Append(L"}"); + url.Replace(s_orderId, stringify(orderId, L"String*")); + + + client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } + - } -} + void + deleteOrderProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -SamiOrder* -SamiStoreApi::getOrderByIdWithCompletion(String* orderId, void (* success)(SamiOrder*, SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&getOrderByIdProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiStoreApi::deleteOrderWithCompletion(String* orderId, void(*success)(SamiError*)) { + client = new SamiApiClient(); - + client->success(&deleteOrderProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - + String* mBody = null; - String url(L"/store/order/{orderId}"); + - - String s_orderId(L"{"); - s_orderId.Append(L"orderId"); - s_orderId.Append(L"}"); - url.Replace(s_orderId, stringify(orderId, L"String*")); - + String url(L"/store/order/{orderId}"); - client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} + + String s_orderId(L"{"); + s_orderId.Append(L"orderId"); + s_orderId.Append(L"}"); + url.Replace(s_orderId, stringify(orderId, L"String*")); + -void -deleteOrderProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiStoreApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} - -void -SamiStoreApi::deleteOrderWithCompletion(String* orderId, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&deleteOrderProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - String url(L"/store/order/{orderId}"); - - - String s_orderId(L"{"); - s_orderId.Append(L"orderId"); - s_orderId.Append(L"}"); - url.Replace(s_orderId, stringify(orderId, L"String*")); - - - client->execute(SamiStoreApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiStoreApi.h b/samples/client/petstore/tizen/client/SamiStoreApi.h index a36f4ba6ee9..3f93480d37b 100644 --- a/samples/client/petstore/tizen/client/SamiStoreApi.h +++ b/samples/client/petstore/tizen/client/SamiStoreApi.h @@ -1,45 +1,52 @@ #ifndef SamiStoreApi_H_ #define SamiStoreApi_H_ -#include -#include "SamiApiClient.h" -#include "SamiError.h" - -using Tizen::Base::Integer; -#include "SamiOrder.h" -using Tizen::Base::String; - -using namespace Tizen::Net::Http; - -namespace Swagger { - -class SamiStoreApi { -public: - SamiStoreApi(); - virtual ~SamiStoreApi(); - - - HashMap* - getInventoryWithCompletion( void (* handler)(HashMap*, SamiError*)); - - SamiOrder* - placeOrderWithCompletion(SamiOrder* body, void (* handler)(SamiOrder*, SamiError*)); - - SamiOrder* - getOrderByIdWithCompletion(String* orderId, void (* handler)(SamiOrder*, SamiError*)); - - void - deleteOrderWithCompletion(String* orderId, void(* handler)(SamiError*)); - - static String getBasePath() { - return L"http://petstore.swagger.io/v2"; - } - -private: - SamiApiClient* client; -}; - - -} /* namespace Swagger */ - -#endif /* SamiStoreApi_H_ */ +#include + + #include "SamiApiClient.h" + #include "SamiError.h" + + using Tizen::Base::Integer; + #include "SamiOrder.h" + using Tizen::Base::String; + + + using namespace Tizen::Net::Http; + + namespace Swagger { + + + class SamiStoreApi { + public: + SamiStoreApi(); + virtual ~SamiStoreApi(); + + + HashMap* + getInventoryWithCompletion( void (* handler)(HashMap* + , SamiError*)); + + SamiOrder* + placeOrderWithCompletion(SamiOrder* body, void (* handler)(SamiOrder* + , SamiError*)); + + SamiOrder* + getOrderByIdWithCompletion(String* orderId, void (* handler)(SamiOrder* + , SamiError*)); + + void + deleteOrderWithCompletion(String* orderId, void(* handler)(SamiError*)); + + static String getBasePath() { + return L"http://petstore.swagger.io/v2"; + } + + private: + SamiApiClient* client; + }; + + + + } /* namespace Swagger */ + + #endif /* SamiStoreApi_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiTag.cpp b/samples/client/petstore/tizen/client/SamiTag.cpp index d07b64a531d..0183a623ce9 100644 --- a/samples/client/petstore/tizen/client/SamiTag.cpp +++ b/samples/client/petstore/tizen/client/SamiTag.cpp @@ -1,182 +1,186 @@ -#include "SamiTag.h" -#include + #include "SamiTag.h" + #include + -using namespace Tizen::Base; -using namespace Tizen::System; -using namespace Tizen::Base::Utility; -using namespace Tizen::Base::Collection; -using namespace Tizen::Web::Json; -using namespace Tizen::Locales; + using namespace Tizen::Base; + using namespace Tizen::System; + using namespace Tizen::Base::Utility; + using namespace Tizen::Base::Collection; + using namespace Tizen::Web::Json; + using namespace Tizen::Locales; -namespace Swagger { + namespace Swagger { -SamiTag::SamiTag() { - init(); -} + SamiTag::SamiTag() { + init(); + } -SamiTag::~SamiTag() { - this->cleanup(); -} + SamiTag::~SamiTag() { + this->cleanup(); + } -void -SamiTag::init() { + void + SamiTag::init() { pId = null; pName = null; -} + } -void -SamiTag::cleanup() { + void + SamiTag::cleanup() { if(pId != null) { - + delete pId; - pId = null; - } + pId = null; + } if(pName != null) { - + delete pName; - pName = null; - } + pName = null; + } -} - - -SamiTag* -SamiTag::fromJson(String* json) { - this->cleanup(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; - return this; -} - - -void -SamiTag::fromJsonObject(IJsonValue* pJson) { - JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); - - if(pJsonObject != null) { - JsonString* pIdKey = new JsonString(L"id"); + } + + + SamiTag* + SamiTag::fromJson(String* json) { + this->cleanup(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + return this; + } + + + void + SamiTag::fromJsonObject(IJsonValue* pJson) { + JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); + + if(pJsonObject != null) { + JsonString* pIdKey = new JsonString(L"id"); IJsonValue* pIdVal = null; pJsonObject->GetValue(pIdKey, pIdVal); if(pIdVal != null) { - - pId = new Long(); - jsonToValue(pId, pIdVal, L"Long", L"Long"); + + pId = new Long(); + jsonToValue(pId, pIdVal, L"Long", L"Long"); } delete pIdKey; - JsonString* pNameKey = new JsonString(L"name"); + JsonString* pNameKey = new JsonString(L"name"); IJsonValue* pNameVal = null; pJsonObject->GetValue(pNameKey, pNameVal); if(pNameVal != null) { - - pName = new String(); - jsonToValue(pName, pNameVal, L"String", L"String"); + + pName = new String(); + jsonToValue(pName, pNameVal, L"String", L"String"); } delete pNameKey; - - } -} - -SamiTag::SamiTag(String* json) { - init(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; -} - -String -SamiTag::asJson () -{ - JsonObject* pJsonObject = asJsonObject(); - - char *pComposeBuf = new char[256]; - JsonWriter::Compose(pJsonObject, pComposeBuf, 256); - String s = String(pComposeBuf); - - delete pComposeBuf; - pJsonObject->RemoveAll(true); - delete pJsonObject; - - return s; -} - -JsonObject* -SamiTag::asJsonObject() { - JsonObject *pJsonObject = new JsonObject(); - pJsonObject->Construct(); + + } + } + + SamiTag::SamiTag(String* json) { + init(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + } + + String + SamiTag::asJson () + { + JsonObject* pJsonObject = asJsonObject(); + + char *pComposeBuf = new char[256]; + JsonWriter::Compose(pJsonObject, pComposeBuf, 256); + String s = String(pComposeBuf); + + delete pComposeBuf; + pJsonObject->RemoveAll(true); + delete pJsonObject; + + return s; + } + + JsonObject* + SamiTag::asJsonObject() { + JsonObject *pJsonObject = new JsonObject(); + pJsonObject->Construct(); + + + JsonString *pIdKey = new JsonString(L"id"); + pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + + + JsonString *pNameKey = new JsonString(L"name"); + pJsonObject->Add(pNameKey, toJson(getPName(), "String", "")); + + + return pJsonObject; + } - JsonString *pIdKey = new JsonString(L"id"); - pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + Long* + SamiTag::getPId() { + return pId; + } + void + SamiTag::setPId(Long* pId) { + this->pId = pId; + } - JsonString *pNameKey = new JsonString(L"name"); - pJsonObject->Add(pNameKey, toJson(getPName(), "String", "")); + String* + SamiTag::getPName() { + return pName; + } + void + SamiTag::setPName(String* pName) { + this->pName = pName; + } - return pJsonObject; -} - -Long* -SamiTag::getPId() { - return pId; -} -void -SamiTag::setPId(Long* pId) { - this->pId = pId; -} - -String* -SamiTag::getPName() { - return pName; -} -void -SamiTag::setPName(String* pName) { - this->pName = pName; -} - - - -} /* namespace Swagger */ + + + } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiTag.h b/samples/client/petstore/tizen/client/SamiTag.h index 6521b0a6bed..caf113cc7fe 100644 --- a/samples/client/petstore/tizen/client/SamiTag.h +++ b/samples/client/petstore/tizen/client/SamiTag.h @@ -1,60 +1,64 @@ /* - * SamiTag.h - * - * - */ +* SamiTag.h +* +* +*/ #ifndef SamiTag_H_ #define SamiTag_H_ -#include -#include -#include -#include -#include "SamiHelpers.h" -#include "SamiObject.h" +#include + + #include + + #include + + #include + + #include "SamiHelpers.h" + #include "SamiObject.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; using Tizen::Base::Long; using Tizen::Base::String; -namespace Swagger { + namespace Swagger { -class SamiTag: public SamiObject { -public: + class SamiTag: public SamiObject { + public: SamiTag(); SamiTag(String* json); - virtual ~SamiTag(); + virtual ~SamiTag(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); SamiTag* fromJson(String* obj); - Long* getPId(); - void setPId(Long* pId); + Long* getPId(); + void setPId(Long* pId); - String* getPName(); - void setPName(String* pName); + String* getPName(); + void setPName(String* pName); -private: + private: Long* pId; String* pName; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SamiTag_H_ */ + #endif /* SamiTag_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiUser.cpp b/samples/client/petstore/tizen/client/SamiUser.cpp index 916bec83d5a..bf89570ffcc 100644 --- a/samples/client/petstore/tizen/client/SamiUser.cpp +++ b/samples/client/petstore/tizen/client/SamiUser.cpp @@ -1,27 +1,28 @@ -#include "SamiUser.h" -#include + #include "SamiUser.h" + #include + -using namespace Tizen::Base; -using namespace Tizen::System; -using namespace Tizen::Base::Utility; -using namespace Tizen::Base::Collection; -using namespace Tizen::Web::Json; -using namespace Tizen::Locales; + using namespace Tizen::Base; + using namespace Tizen::System; + using namespace Tizen::Base::Utility; + using namespace Tizen::Base::Collection; + using namespace Tizen::Web::Json; + using namespace Tizen::Locales; -namespace Swagger { + namespace Swagger { -SamiUser::SamiUser() { - init(); -} + SamiUser::SamiUser() { + init(); + } -SamiUser::~SamiUser() { - this->cleanup(); -} + SamiUser::~SamiUser() { + this->cleanup(); + } -void -SamiUser::init() { + void + SamiUser::init() { pId = null; pUsername = null; pFirstName = null; @@ -31,320 +32,329 @@ SamiUser::init() { pPhone = null; pUserStatus = null; -} + } -void -SamiUser::cleanup() { + void + SamiUser::cleanup() { if(pId != null) { - + delete pId; - pId = null; - } + pId = null; + } if(pUsername != null) { - + delete pUsername; - pUsername = null; - } + pUsername = null; + } if(pFirstName != null) { - + delete pFirstName; - pFirstName = null; - } + pFirstName = null; + } if(pLastName != null) { - + delete pLastName; - pLastName = null; - } + pLastName = null; + } if(pEmail != null) { - + delete pEmail; - pEmail = null; - } + pEmail = null; + } if(pPassword != null) { - + delete pPassword; - pPassword = null; - } + pPassword = null; + } if(pPhone != null) { - + delete pPhone; - pPhone = null; - } + pPhone = null; + } if(pUserStatus != null) { - + delete pUserStatus; - pUserStatus = null; - } - -} - - -SamiUser* -SamiUser::fromJson(String* json) { - this->cleanup(); - String str(json->GetPointer()); - int length = str.GetLength(); - - ByteBuffer buffer; - buffer.Construct(length); - - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } - - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; - return this; -} - - -void -SamiUser::fromJsonObject(IJsonValue* pJson) { - JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); - - if(pJsonObject != null) { - JsonString* pIdKey = new JsonString(L"id"); + pUserStatus = null; + } + + } + + + SamiUser* + SamiUser::fromJson(String* json) { + this->cleanup(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + return this; + } + + + void + SamiUser::fromJsonObject(IJsonValue* pJson) { + JsonObject* pJsonObject = static_cast< JsonObject* >(pJson); + + if(pJsonObject != null) { + JsonString* pIdKey = new JsonString(L"id"); IJsonValue* pIdVal = null; pJsonObject->GetValue(pIdKey, pIdVal); if(pIdVal != null) { - - pId = new Long(); - jsonToValue(pId, pIdVal, L"Long", L"Long"); + + pId = new Long(); + jsonToValue(pId, pIdVal, L"Long", L"Long"); } delete pIdKey; - JsonString* pUsernameKey = new JsonString(L"username"); + JsonString* pUsernameKey = new JsonString(L"username"); IJsonValue* pUsernameVal = null; pJsonObject->GetValue(pUsernameKey, pUsernameVal); if(pUsernameVal != null) { - - pUsername = new String(); - jsonToValue(pUsername, pUsernameVal, L"String", L"String"); + + pUsername = new String(); + jsonToValue(pUsername, pUsernameVal, L"String", L"String"); } delete pUsernameKey; - JsonString* pFirstNameKey = new JsonString(L"firstName"); + JsonString* pFirstNameKey = new JsonString(L"firstName"); IJsonValue* pFirstNameVal = null; pJsonObject->GetValue(pFirstNameKey, pFirstNameVal); if(pFirstNameVal != null) { - - pFirstName = new String(); - jsonToValue(pFirstName, pFirstNameVal, L"String", L"String"); + + pFirstName = new String(); + jsonToValue(pFirstName, pFirstNameVal, L"String", L"String"); } delete pFirstNameKey; - JsonString* pLastNameKey = new JsonString(L"lastName"); + JsonString* pLastNameKey = new JsonString(L"lastName"); IJsonValue* pLastNameVal = null; pJsonObject->GetValue(pLastNameKey, pLastNameVal); if(pLastNameVal != null) { - - pLastName = new String(); - jsonToValue(pLastName, pLastNameVal, L"String", L"String"); + + pLastName = new String(); + jsonToValue(pLastName, pLastNameVal, L"String", L"String"); } delete pLastNameKey; - JsonString* pEmailKey = new JsonString(L"email"); + JsonString* pEmailKey = new JsonString(L"email"); IJsonValue* pEmailVal = null; pJsonObject->GetValue(pEmailKey, pEmailVal); if(pEmailVal != null) { - - pEmail = new String(); - jsonToValue(pEmail, pEmailVal, L"String", L"String"); + + pEmail = new String(); + jsonToValue(pEmail, pEmailVal, L"String", L"String"); } delete pEmailKey; - JsonString* pPasswordKey = new JsonString(L"password"); + JsonString* pPasswordKey = new JsonString(L"password"); IJsonValue* pPasswordVal = null; pJsonObject->GetValue(pPasswordKey, pPasswordVal); if(pPasswordVal != null) { - - pPassword = new String(); - jsonToValue(pPassword, pPasswordVal, L"String", L"String"); + + pPassword = new String(); + jsonToValue(pPassword, pPasswordVal, L"String", L"String"); } delete pPasswordKey; - JsonString* pPhoneKey = new JsonString(L"phone"); + JsonString* pPhoneKey = new JsonString(L"phone"); IJsonValue* pPhoneVal = null; pJsonObject->GetValue(pPhoneKey, pPhoneVal); if(pPhoneVal != null) { - - pPhone = new String(); - jsonToValue(pPhone, pPhoneVal, L"String", L"String"); + + pPhone = new String(); + jsonToValue(pPhone, pPhoneVal, L"String", L"String"); } delete pPhoneKey; - JsonString* pUserStatusKey = new JsonString(L"userStatus"); + JsonString* pUserStatusKey = new JsonString(L"userStatus"); IJsonValue* pUserStatusVal = null; pJsonObject->GetValue(pUserStatusKey, pUserStatusVal); if(pUserStatusVal != null) { - - pUserStatus = new Integer(); - jsonToValue(pUserStatus, pUserStatusVal, L"Integer", L"Integer"); + + pUserStatus = new Integer(); + jsonToValue(pUserStatus, pUserStatusVal, L"Integer", L"Integer"); } delete pUserStatusKey; - - } -} + + } + } + + SamiUser::SamiUser(String* json) { + init(); + String str(json->GetPointer()); + int length = str.GetLength(); + + ByteBuffer buffer; + buffer.Construct(length); + + for (int i = 0; i < length; ++i) { + byte b = str[i]; + buffer.SetByte(b); + } + + IJsonValue* pJson = JsonParser::ParseN(buffer); + fromJsonObject(pJson); + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + delete pJson; + } + + String + SamiUser::asJson () + { + JsonObject* pJsonObject = asJsonObject(); + + char *pComposeBuf = new char[256]; + JsonWriter::Compose(pJsonObject, pComposeBuf, 256); + String s = String(pComposeBuf); + + delete pComposeBuf; + pJsonObject->RemoveAll(true); + delete pJsonObject; + + return s; + } + + JsonObject* + SamiUser::asJsonObject() { + JsonObject *pJsonObject = new JsonObject(); + pJsonObject->Construct(); + + + JsonString *pIdKey = new JsonString(L"id"); + pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); + + + JsonString *pUsernameKey = new JsonString(L"username"); + pJsonObject->Add(pUsernameKey, toJson(getPUsername(), "String", "")); + + + JsonString *pFirstNameKey = new JsonString(L"firstName"); + pJsonObject->Add(pFirstNameKey, toJson(getPFirstName(), "String", "")); -SamiUser::SamiUser(String* json) { - init(); - String str(json->GetPointer()); - int length = str.GetLength(); + + JsonString *pLastNameKey = new JsonString(L"lastName"); + pJsonObject->Add(pLastNameKey, toJson(getPLastName(), "String", "")); + + + JsonString *pEmailKey = new JsonString(L"email"); + pJsonObject->Add(pEmailKey, toJson(getPEmail(), "String", "")); + + + JsonString *pPasswordKey = new JsonString(L"password"); + pJsonObject->Add(pPasswordKey, toJson(getPPassword(), "String", "")); + + + JsonString *pPhoneKey = new JsonString(L"phone"); + pJsonObject->Add(pPhoneKey, toJson(getPPhone(), "String", "")); + + + JsonString *pUserStatusKey = new JsonString(L"userStatus"); + pJsonObject->Add(pUserStatusKey, toJson(getPUserStatus(), "Integer", "")); + + + return pJsonObject; + } - ByteBuffer buffer; - buffer.Construct(length); + + Long* + SamiUser::getPId() { + return pId; + } + void + SamiUser::setPId(Long* pId) { + this->pId = pId; + } + + + String* + SamiUser::getPUsername() { + return pUsername; + } + void + SamiUser::setPUsername(String* pUsername) { + this->pUsername = pUsername; + } + + + String* + SamiUser::getPFirstName() { + return pFirstName; + } + void + SamiUser::setPFirstName(String* pFirstName) { + this->pFirstName = pFirstName; + } + + + String* + SamiUser::getPLastName() { + return pLastName; + } + void + SamiUser::setPLastName(String* pLastName) { + this->pLastName = pLastName; + } - for (int i = 0; i < length; ++i) { - byte b = str[i]; - buffer.SetByte(b); - } + + String* + SamiUser::getPEmail() { + return pEmail; + } + void + SamiUser::setPEmail(String* pEmail) { + this->pEmail = pEmail; + } - IJsonValue* pJson = JsonParser::ParseN(buffer); - fromJsonObject(pJson); - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - delete pJson; -} + + String* + SamiUser::getPPassword() { + return pPassword; + } + void + SamiUser::setPPassword(String* pPassword) { + this->pPassword = pPassword; + } -String -SamiUser::asJson () -{ - JsonObject* pJsonObject = asJsonObject(); + + String* + SamiUser::getPPhone() { + return pPhone; + } + void + SamiUser::setPPhone(String* pPhone) { + this->pPhone = pPhone; + } - char *pComposeBuf = new char[256]; - JsonWriter::Compose(pJsonObject, pComposeBuf, 256); - String s = String(pComposeBuf); - - delete pComposeBuf; - pJsonObject->RemoveAll(true); - delete pJsonObject; - - return s; -} - -JsonObject* -SamiUser::asJsonObject() { - JsonObject *pJsonObject = new JsonObject(); - pJsonObject->Construct(); - - - JsonString *pIdKey = new JsonString(L"id"); - pJsonObject->Add(pIdKey, toJson(getPId(), "Long", "")); - - - JsonString *pUsernameKey = new JsonString(L"username"); - pJsonObject->Add(pUsernameKey, toJson(getPUsername(), "String", "")); - - - JsonString *pFirstNameKey = new JsonString(L"firstName"); - pJsonObject->Add(pFirstNameKey, toJson(getPFirstName(), "String", "")); - - - JsonString *pLastNameKey = new JsonString(L"lastName"); - pJsonObject->Add(pLastNameKey, toJson(getPLastName(), "String", "")); - - - JsonString *pEmailKey = new JsonString(L"email"); - pJsonObject->Add(pEmailKey, toJson(getPEmail(), "String", "")); - - - JsonString *pPasswordKey = new JsonString(L"password"); - pJsonObject->Add(pPasswordKey, toJson(getPPassword(), "String", "")); - - - JsonString *pPhoneKey = new JsonString(L"phone"); - pJsonObject->Add(pPhoneKey, toJson(getPPhone(), "String", "")); - - - JsonString *pUserStatusKey = new JsonString(L"userStatus"); - pJsonObject->Add(pUserStatusKey, toJson(getPUserStatus(), "Integer", "")); - - - return pJsonObject; -} - -Long* -SamiUser::getPId() { - return pId; -} -void -SamiUser::setPId(Long* pId) { - this->pId = pId; -} - -String* -SamiUser::getPUsername() { - return pUsername; -} -void -SamiUser::setPUsername(String* pUsername) { - this->pUsername = pUsername; -} - -String* -SamiUser::getPFirstName() { - return pFirstName; -} -void -SamiUser::setPFirstName(String* pFirstName) { - this->pFirstName = pFirstName; -} - -String* -SamiUser::getPLastName() { - return pLastName; -} -void -SamiUser::setPLastName(String* pLastName) { - this->pLastName = pLastName; -} - -String* -SamiUser::getPEmail() { - return pEmail; -} -void -SamiUser::setPEmail(String* pEmail) { - this->pEmail = pEmail; -} + + Integer* + SamiUser::getPUserStatus() { + return pUserStatus; + } + void + SamiUser::setPUserStatus(Integer* pUserStatus) { + this->pUserStatus = pUserStatus; + } -String* -SamiUser::getPPassword() { - return pPassword; -} -void -SamiUser::setPPassword(String* pPassword) { - this->pPassword = pPassword; -} + -String* -SamiUser::getPPhone() { - return pPhone; -} -void -SamiUser::setPPhone(String* pPhone) { - this->pPhone = pPhone; -} -Integer* -SamiUser::getPUserStatus() { - return pUserStatus; -} -void -SamiUser::setPUserStatus(Integer* pUserStatus) { - this->pUserStatus = pUserStatus; -} - - - -} /* namespace Swagger */ + } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiUser.h b/samples/client/petstore/tizen/client/SamiUser.h index a874f9c6245..d60b17dea72 100644 --- a/samples/client/petstore/tizen/client/SamiUser.h +++ b/samples/client/petstore/tizen/client/SamiUser.h @@ -1,20 +1,24 @@ /* - * SamiUser.h - * - * - */ +* SamiUser.h +* +* +*/ #ifndef SamiUser_H_ #define SamiUser_H_ -#include -#include -#include -#include -#include "SamiHelpers.h" -#include "SamiObject.h" +#include + + #include + + #include + + #include + + #include "SamiHelpers.h" + #include "SamiObject.h" -using namespace Tizen::Web::Json; + using namespace Tizen::Web::Json; using Tizen::Base::Long; @@ -22,53 +26,53 @@ using Tizen::Base::String; using Tizen::Base::Integer; -namespace Swagger { + namespace Swagger { -class SamiUser: public SamiObject { -public: + class SamiUser: public SamiObject { + public: SamiUser(); SamiUser(String* json); - virtual ~SamiUser(); + virtual ~SamiUser(); - void init(); + void init(); - void cleanup(); + void cleanup(); - String asJson (); + String asJson (); - JsonObject* asJsonObject(); + JsonObject* asJsonObject(); - void fromJsonObject(IJsonValue* json); + void fromJsonObject(IJsonValue* json); SamiUser* fromJson(String* obj); - Long* getPId(); - void setPId(Long* pId); + Long* getPId(); + void setPId(Long* pId); - String* getPUsername(); - void setPUsername(String* pUsername); + String* getPUsername(); + void setPUsername(String* pUsername); - String* getPFirstName(); - void setPFirstName(String* pFirstName); + String* getPFirstName(); + void setPFirstName(String* pFirstName); - String* getPLastName(); - void setPLastName(String* pLastName); + String* getPLastName(); + void setPLastName(String* pLastName); - String* getPEmail(); - void setPEmail(String* pEmail); + String* getPEmail(); + void setPEmail(String* pEmail); - String* getPPassword(); - void setPPassword(String* pPassword); + String* getPPassword(); + void setPPassword(String* pPassword); - String* getPPhone(); - void setPPhone(String* pPhone); + String* getPPhone(); + void setPPhone(String* pPhone); - Integer* getPUserStatus(); - void setPUserStatus(Integer* pUserStatus); + Integer* getPUserStatus(); + void setPUserStatus(Integer* pUserStatus); -private: + private: Long* pId; String* pUsername; String* pFirstName; @@ -78,8 +82,8 @@ class SamiUser: public SamiObject { String* pPhone; Integer* pUserStatus; -}; + }; -} /* namespace Swagger */ + } /* namespace Swagger */ -#endif /* SamiUser_H_ */ + #endif /* SamiUser_H_ */ diff --git a/samples/client/petstore/tizen/client/SamiUserApi.cpp b/samples/client/petstore/tizen/client/SamiUserApi.cpp index 7010ed6bac7..2e277d4d8ba 100644 --- a/samples/client/petstore/tizen/client/SamiUserApi.cpp +++ b/samples/client/petstore/tizen/client/SamiUserApi.cpp @@ -8,454 +8,463 @@ using namespace Tizen::Base; namespace Swagger { -SamiUserApi::SamiUserApi() { + SamiUserApi::SamiUserApi() { -} - -SamiUserApi::~SamiUserApi() { + } -} + SamiUserApi::~SamiUserApi() { -void -createUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} + void + createUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -void -SamiUserApi::createUserWithCompletion(SamiUser* body, void(*success)(SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&createUserProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiUserApi::createUserWithCompletion(SamiUser* body, void(*success)(SamiError*)) { + client = new SamiApiClient(); - + client->success(&createUserProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - - - - if(body != null) { - mBody = new String(body->asJson()); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - + String* mBody = null; - String url(L"/user"); + + + + if(body != null) { + mBody = new String(body->asJson()); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + - + String url(L"/user"); - client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} + -void -createUsersWithArrayInputProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - - handler(error, null); - } -} - -void -SamiUserApi::createUsersWithArrayInputWithCompletion(IList* body, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&createUsersWithArrayInputProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - if(body != null) { - mBody = new String(""); - int sz = body->GetCount(); - for(int i = 0; i < sz; i++) { - SamiObject * obj = (SamiObject*)body->GetAt(i); - String json = obj->asJson(); - if(i > 0) - mBody->Append(","); - mBody->Append(json); - } - mBody->Append("]"); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - - - - String url(L"/user/createWithArray"); - - - - client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - -void -createUsersWithListInputProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - - handler(error, null); - } -} - -void -SamiUserApi::createUsersWithListInputWithCompletion(IList* body, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&createUsersWithListInputProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - if(body != null) { - mBody = new String(""); - int sz = body->GetCount(); - for(int i = 0; i < sz; i++) { - SamiObject * obj = (SamiObject*)body->GetAt(i); - String json = obj->asJson(); - if(i > 0) - mBody->Append(","); - mBody->Append(json); - } - mBody->Append("]"); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - - - - String url(L"/user/createWithList"); - - - - client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - -void -loginUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); - - String* out = new String(); - jsonToValue(out, pJson, L"String*", L"String"); - - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); - } - - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); - } -} - -String* -SamiUserApi::loginUserWithCompletion(String* username, String* password, void (* success)(String*, SamiError*)) { - client = new SamiApiClient(); - - client->success(&loginUserProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - queryParams->Add(new String("username"), username); - - - queryParams->Add(new String("password"), password); - - - - String* mBody = null; - - - - String url(L"/user/login"); - - + void + createUsersWithArrayInputProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } + + void + SamiUserApi::createUsersWithArrayInputWithCompletion(IList* body, void(*success)(SamiError*)) { + client = new SamiApiClient(); + + client->success(&createUsersWithArrayInputProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + if(body != null) { + mBody = new String(""); + int sz = body->GetCount(); + for(int i = 0; i < sz; i++) { + SamiObject * obj = (SamiObject*)body->GetAt(i); + String json = obj->asJson(); + if(i > 0) + mBody->Append(","); + mBody->Append(json); + } + mBody->Append("]"); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + + + + String url(L"/user/createWithArray"); + + + + client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} - -void -logoutUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + + void + createUsersWithListInputProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } + + void + SamiUserApi::createUsersWithListInputWithCompletion(IList* body, void(*success)(SamiError*)) { + client = new SamiApiClient(); + + client->success(&createUsersWithListInputProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + if(body != null) { + mBody = new String(""); + int sz = body->GetCount(); + for(int i = 0; i < sz; i++) { + SamiObject * obj = (SamiObject*)body->GetAt(i); + String json = obj->asJson(); + if(i > 0) + mBody->Append(","); + mBody->Append(json); + } + mBody->Append("]"); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + + + + String url(L"/user/createWithList"); + + + + client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} + void + loginUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + String* out = new String(); + jsonToValue(out, pJson, L"String*", L"String"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + String* + SamiUserApi::loginUserWithCompletion(String* username, String* password, void (* success)(String*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&loginUserProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + queryParams->Add(new String("username"), username); + + + queryParams->Add(new String("password"), password); + + + + String* mBody = null; + + + + String url(L"/user/login"); + + + + client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } -void -SamiUserApi::logoutUserWithCompletion( void(*success)(SamiError*)) { - client = new SamiApiClient(); + + void + logoutUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); - client->success(&logoutUserProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - + void + SamiUserApi::logoutUserWithCompletion( void(*success)(SamiError*)) { + client = new SamiApiClient(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + client->success(&logoutUserProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - + - String* mBody = null; + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - + - String url(L"/user/logout"); + String* mBody = null; - + - client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} + String url(L"/user/logout"); -void -getUserByNameProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + - if(code >= 200 && code < 300) { - ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); - IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - SamiUser* out = new SamiUser(); - jsonToValue(out, pJson, L"SamiUser*", L"SamiUser"); + + void + getUserByNameProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + ByteBuffer* pBuffer = pHttpResponse->ReadBodyN(); + IJsonValue* pJson = JsonParser::ParseN(*pBuffer); + + SamiUser* out = new SamiUser(); + jsonToValue(out, pJson, L"SamiUser*", L"SamiUser"); + + if (pJson) { + if (pJson->GetType() == JSON_TYPE_OBJECT) { + JsonObject* pObject = static_cast< JsonObject* >(pJson); + pObject->RemoveAll(true); + } + else if (pJson->GetType() == JSON_TYPE_ARRAY) { + JsonArray* pArray = static_cast< JsonArray* >(pJson); + pArray->RemoveAll(true); + } + handler(out, null); + } + else { + SamiError* error = new SamiError(0, new String(L"No parsable response received")); + handler(null, error); + } + + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + handler(null, error); + + } + } + + SamiUser* + SamiUserApi::getUserByNameWithCompletion(String* username, void (* success)(SamiUser*, SamiError*)) { + client = new SamiApiClient(); + + client->success(&getUserByNameProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + String url(L"/user/{username}"); + + + String s_username(L"{"); + s_username.Append(L"username"); + s_username.Append(L"}"); + url.Replace(s_username, stringify(username, L"String*")); + + + client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + return null; + } - if (pJson) { - if (pJson->GetType() == JSON_TYPE_OBJECT) { - JsonObject* pObject = static_cast< JsonObject* >(pJson); - pObject->RemoveAll(true); - } - else if (pJson->GetType() == JSON_TYPE_ARRAY) { - JsonArray* pArray = static_cast< JsonArray* >(pJson); - pArray->RemoveAll(true); - } - handler(out, null); - } - else { - SamiError* error = new SamiError(0, new String(L"No parsable response received")); - handler(null, error); - } - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(null, error); + void + updateUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); + + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } + + void + SamiUserApi::updateUserWithCompletion(String* username, SamiUser* body, void(*success)(SamiError*)) { + client = new SamiApiClient(); + + client->success(&updateUserProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); + + + + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); + + + + String* mBody = null; + + + + + if(body != null) { + mBody = new String(body->asJson()); + headerParams->Add(new String("Content-Type"), new String("application/json")); + } + + + + String url(L"/user/{username}"); + + + String s_username(L"{"); + s_username.Append(L"username"); + s_username.Append(L"}"); + url.Replace(s_username, stringify(username, L"String*")); + + + client->execute(SamiUserApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } + - } -} + void + deleteUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { + int code = pHttpResponse->GetHttpStatusCode(); -SamiUser* -SamiUserApi::getUserByNameWithCompletion(String* username, void (* success)(SamiUser*, SamiError*)) { - client = new SamiApiClient(); + if(code >= 200 && code < 300) { + handler(null, null); + } + else { + SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); + + handler(error, null); + } + } - client->success(&getUserByNameProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); + void + SamiUserApi::deleteUserWithCompletion(String* username, void(*success)(SamiError*)) { + client = new SamiApiClient(); - + client->success(&deleteUserProcessor, (void(*)(void*, SamiError*))success); + HashMap* headerParams = new HashMap(SingleObjectDeleter); + headerParams->Construct(); - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); + - + HashMap* queryParams = new HashMap(SingleObjectDeleter); + queryParams->Construct(); - String* mBody = null; + - + String* mBody = null; - String url(L"/user/{username}"); + - - String s_username(L"{"); - s_username.Append(L"username"); - s_username.Append(L"}"); - url.Replace(s_username, stringify(username, L"String*")); - + String url(L"/user/{username}"); - client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - return null; -} + + String s_username(L"{"); + s_username.Append(L"username"); + s_username.Append(L"}"); + url.Replace(s_username, stringify(username, L"String*")); + -void -updateUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); + client->execute(SamiUserApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); + + } - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - - handler(error, null); - } -} - -void -SamiUserApi::updateUserWithCompletion(String* username, SamiUser* body, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&updateUserProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - - if(body != null) { - mBody = new String(body->asJson()); - headerParams->Add(new String("Content-Type"), new String("application/json")); - } - - - - String url(L"/user/{username}"); - - - String s_username(L"{"); - s_username.Append(L"username"); - s_username.Append(L"}"); - url.Replace(s_username, stringify(username, L"String*")); - - - client->execute(SamiUserApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - -void -deleteUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) { - int code = pHttpResponse->GetHttpStatusCode(); - - if(code >= 200 && code < 300) { - handler(null, null); - } - else { - SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText())); - handler(error, null); - } -} - -void -SamiUserApi::deleteUserWithCompletion(String* username, void(*success)(SamiError*)) { - client = new SamiApiClient(); - - client->success(&deleteUserProcessor, (void(*)(void*, SamiError*))success); - HashMap* headerParams = new HashMap(SingleObjectDeleter); - headerParams->Construct(); - - - - HashMap* queryParams = new HashMap(SingleObjectDeleter); - queryParams->Construct(); - - - - String* mBody = null; - - - - String url(L"/user/{username}"); - - - String s_username(L"{"); - s_username.Append(L"username"); - s_username.Append(L"}"); - url.Replace(s_username, stringify(username, L"String*")); - - - client->execute(SamiUserApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json"); - -} - } /* namespace Swagger */ diff --git a/samples/client/petstore/tizen/client/SamiUserApi.h b/samples/client/petstore/tizen/client/SamiUserApi.h index 1b42e3bc3b1..74f597d9f43 100644 --- a/samples/client/petstore/tizen/client/SamiUserApi.h +++ b/samples/client/petstore/tizen/client/SamiUserApi.h @@ -1,57 +1,65 @@ #ifndef SamiUserApi_H_ #define SamiUserApi_H_ -#include -#include "SamiApiClient.h" -#include "SamiError.h" - -#include "SamiUser.h" -using Tizen::Base::Collection::IList; -using Tizen::Base::String; - -using namespace Tizen::Net::Http; - -namespace Swagger { - -class SamiUserApi { -public: - SamiUserApi(); - virtual ~SamiUserApi(); - - - void - createUserWithCompletion(SamiUser* body, void(* handler)(SamiError*)); - - void - createUsersWithArrayInputWithCompletion(IList* body, void(* handler)(SamiError*)); - - void - createUsersWithListInputWithCompletion(IList* body, void(* handler)(SamiError*)); - - String* - loginUserWithCompletion(String* username, String* password, void (* handler)(String*, SamiError*)); - - void - logoutUserWithCompletion( void(* handler)(SamiError*)); - - SamiUser* - getUserByNameWithCompletion(String* username, void (* handler)(SamiUser*, SamiError*)); - - void - updateUserWithCompletion(String* username, SamiUser* body, void(* handler)(SamiError*)); - - void - deleteUserWithCompletion(String* username, void(* handler)(SamiError*)); - - static String getBasePath() { - return L"http://petstore.swagger.io/v2"; - } - -private: - SamiApiClient* client; -}; - - -} /* namespace Swagger */ - -#endif /* SamiUserApi_H_ */ +#include + + #include "SamiApiClient.h" + #include "SamiError.h" + + #include "SamiUser.h" + using Tizen::Base::Collection::IList; + using Tizen::Base::String; + + + using namespace Tizen::Net::Http; + + namespace Swagger { + + + class SamiUserApi { + public: + SamiUserApi(); + virtual ~SamiUserApi(); + + + void + createUserWithCompletion(SamiUser* body, void(* handler)(SamiError*)); + + void + createUsersWithArrayInputWithCompletion(IList* body, void(* handler)(SamiError*)); + + void + createUsersWithListInputWithCompletion(IList* body, void(* handler)(SamiError*)); + + String* + loginUserWithCompletion(String* username + , String* password, void (* handler)(String* + , SamiError*)); + + void + logoutUserWithCompletion( void(* handler)(SamiError*)); + + SamiUser* + getUserByNameWithCompletion(String* username, void (* handler)(SamiUser* + , SamiError*)); + + void + updateUserWithCompletion(String* username + , SamiUser* body, void(* handler)(SamiError*)); + + void + deleteUserWithCompletion(String* username, void(* handler)(SamiError*)); + + static String getBasePath() { + return L"http://petstore.swagger.io/v2"; + } + + private: + SamiApiClient* client; + }; + + + + } /* namespace Swagger */ + + #endif /* SamiUserApi_H_ */ diff --git a/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala b/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala index d66950e4991..91573211cb9 100644 --- a/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala +++ b/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala @@ -1,29 +1,27 @@ /** - * Copyright 2014 Wordnik, Inc. + * Copyright 2014 Wordnik, Inc. * - * 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 + * 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 + * 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. + * 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. */ -import com.wordnik.swagger.codegen.BasicPHPGenerator - import java.io.File object PHPWordnikApiCodegen extends BasicPHPGenerator { def main(args: Array[String]) = generateClient(args) - override def destinationDir = "samples/client/wordnik-api/php/wordnik" - override def supportingFiles = List( ("Swagger.mustache", destinationDir + File.separator + apiPackage.get, "Swagger.php") ) + + override def destinationDir = "samples/client/wordnik-api/php/wordnik" } diff --git a/samples/client/wordnik-api-php/wordnik/AccountApi.php b/samples/client/wordnik-api-php/wordnik/AccountApi.php index 4e5e4e6d4e1..6b77a5fe01c 100644 --- a/samples/client/wordnik-api-php/wordnik/AccountApi.php +++ b/samples/client/wordnik-api-php/wordnik/AccountApi.php @@ -1,6 +1,6 @@ fail("ooops") } } - + it should "get the logged in user" in { api.getLoggedInUser(auth.token) match { case Some(user) => { user.id should not be (0) - user.username should be (USER_NAME) - user.status should be (0) + user.username should be(USER_NAME) + user.status should be(0) user.email should not be (null) } case None => fail("didn't get user") diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala index 3295996d930..58401c904d5 100644 --- a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala +++ b/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala @@ -1,17 +1,3 @@ -import com.wordnik.client.api._ -import com.wordnik.client.model._ - -import com.wordnik.swagger.core._ -import com.wordnik.swagger.core.util.JsonUtil - -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner -import org.scalatest._ - -import scala.collection.mutable.{ ListBuffer, HashMap } -import scala.collection.JavaConversions._ -import scala.beans.BeanProperty - import scala.io.Source @RunWith(classOf[JUnitRunner]) @@ -41,8 +27,8 @@ class WordApiTest extends FlatSpec with Matchers with BaseApiTest { api.getWord("cAt", "false", "true") match { case Some(word) => { word.word should be("cAt") - word.suggestions.size should be (1) - word.suggestions(0) should be ("cat") + word.suggestions.size should be(1) + word.suggestions(0) should be("cat") word should not be (null) } case None => fail("didn't find word cAt") @@ -126,7 +112,7 @@ class WordApiTest extends FlatSpec with Matchers with BaseApiTest { api.getRelatedWords("cat", null, null) match { case Some(relateds) => { var count = 0 - relateds.foreach(related =>{ + relateds.foreach(related => { related.words.size should (be <= 10) }) } diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala index 5c1a8a0bd3a..1c5adaa871b 100644 --- a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala +++ b/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala @@ -1,13 +1,4 @@ -import com.wordnik.client.api._ -import com.wordnik.client.model._ -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner -import org.scalatest._ - -import scala.collection.mutable.{ ListBuffer, HashMap } -import scala.collection.JavaConversions._ -import scala.beans.BeanProperty @RunWith(classOf[JUnitRunner]) class WordListApiTest extends FlatSpec with Matchers with BaseApiTest { @@ -23,17 +14,17 @@ class WordListApiTest extends FlatSpec with Matchers with BaseApiTest { val wordListsApi = new WordListsApi val wordList = WordList( - 0, // id - null, // permalink - "my test list", // name - new java.util.Date, //created at - null, // updated at - null, // lastActivityAt - null, // username - 0, // user id - "some words I want to play with", // description - 0, // words in list - "PUBLIC") // type + 0, // id + null, // permalink + "my test list", // name + new java.util.Date, //created at + null, // updated at + null, // lastActivityAt + null, // username + 0, // user id + "some words I want to play with", // description + 0, // words in list + "PUBLIC") // type var sampleList = wordListsApi.createWordList(wordList, auth.token) match { case Some(wl) => wl diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala index aa786c41cd0..1f518940bcb 100644 --- a/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala +++ b/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala @@ -1,13 +1,4 @@ -import com.wordnik.client.api._ -import com.wordnik.client.model._ -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner -import org.scalatest._ - -import scala.collection.mutable.{ ListBuffer, HashMap } -import scala.collection.JavaConversions._ -import scala.beans.BeanProperty @RunWith(classOf[JUnitRunner]) class WordsApiTest extends FlatSpec with Matchers with BaseApiTest { diff --git a/samples/client/wordnik/akka-scala/pom.xml b/samples/client/wordnik/akka-scala/pom.xml index f865a97c38b..07ba600a902 100644 --- a/samples/client/wordnik/akka-scala/pom.xml +++ b/samples/client/wordnik/akka-scala/pom.xml @@ -1,4 +1,4 @@ - 4.0.0 com.wordnik @@ -82,7 +82,8 @@ - src/main/java + src/main/java + @@ -95,7 +96,8 @@ - src/test/java + src/test/java + @@ -107,7 +109,8 @@ 2.3.2 - 1.6 + 1.6 + 1.6 diff --git a/samples/client/wordnik/akka-scala/src/main/resources/reference.conf b/samples/client/wordnik/akka-scala/src/main/resources/reference.conf index f993f765edd..41f5f4a60cc 100644 --- a/samples/client/wordnik/akka-scala/src/main/resources/reference.conf +++ b/samples/client/wordnik/akka-scala/src/main/resources/reference.conf @@ -1,24 +1,24 @@ io.swagger.client { - apiRequest { + apiRequest { - compression { - enabled: false - size-threshold: 0 - } - - trust-certificates: true + compression { + enabled: false + size-threshold: 0 + } - connection-timeout: 5000ms + trust-certificates: true - default-headers { - "userAgent": "swagger-client_1.0.0" - } + connection-timeout: 5000ms - // let you define custom http status code, as in : - // { code: 601, reason: "some custom http status code", success: false } - custom-codes : [] + default-headers { + "userAgent": "swagger-client_1.0.0" } + + // let you define custom http status code, as in : + // { code: 601, reason: "some custom http status code", success: false } + custom-codes: [] + } } spray.can.host-connector.max-redirects = 10 \ No newline at end of file diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala index 8168c1c0f4f..0b722750b24 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala @@ -1,23 +1,15 @@ package io.swagger.client.api -import io.swagger.client.model.ApiTokenStatus -import io.swagger.client.model.AuthenticationToken -import io.swagger.client.model.User -import io.swagger.client.model.WordList -import io.swagger.client.core._ -import io.swagger.client.core.CollectionFormats._ -import io.swagger.client.core.ApiKeyLocations._ - object AccountApi { /** - * - * + * + * * Expected answers: - * code 200 : ApiTokenStatus (Usage statistics for the supplied API key) - * code 400 : (No token supplied.) - * code 404 : (No API account with supplied token.) - * + * code 200 : ApiTokenStatus (Usage statistics for the supplied API key) + * code 400 : (No token supplied.) + * code 404 : (No API account with supplied token.) + * * @param apiKey Wordnik authentication token */ def getApiTokenStatus(apiKey: Option[String] = None): ApiRequest[ApiTokenStatus] = @@ -26,15 +18,15 @@ object AccountApi { .withSuccessResponse[ApiTokenStatus](200) .withErrorResponse[Unit](400) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : AuthenticationToken (A valid authentication token) - * code 403 : (Account not available.) - * code 404 : (User not found.) - * + * code 200 : AuthenticationToken (A valid authentication token) + * code 403 : (Account not available.) + * code 404 : (User not found.) + * * @param username A confirmed Wordnik username * @param password The user's password */ @@ -45,15 +37,15 @@ object AccountApi { .withSuccessResponse[AuthenticationToken](200) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : AuthenticationToken (A valid authentication token) - * code 403 : (Account not available.) - * code 404 : (User not found.) - * + * code 200 : AuthenticationToken (A valid authentication token) + * code 403 : (Account not available.) + * code 404 : (User not found.) + * * @param username A confirmed Wordnik username * @param body The user's password */ @@ -64,15 +56,15 @@ object AccountApi { .withSuccessResponse[AuthenticationToken](200) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** * Requires a valid auth_token to be set. - * + * * Expected answers: - * code 200 : User (The logged-in user) - * code 403 : (Not logged in.) - * code 404 : (User not found.) - * + * code 200 : User (The logged-in user) + * code 403 : (Not logged in.) + * code 404 : (User not found.) + * * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) */ def getLoggedInUser(authToken: String): ApiRequest[User] = @@ -81,15 +73,15 @@ object AccountApi { .withSuccessResponse[User](200) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : Seq[WordList] (success) - * code 403 : (Not authenticated.) - * code 404 : (User account not found.) - * + * code 200 : Seq[WordList] (success) + * code 403 : (Not authenticated.) + * code 404 : (User account not found.) + * * @param authToken auth_token of logged-in user * @param skip Results to skip * @param limit Maximum number of results to return @@ -102,7 +94,6 @@ object AccountApi { .withSuccessResponse[Seq[WordList]](200) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala index c95a49ad0b2..43b0284db57 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala @@ -1,7 +1,5 @@ package io.swagger.client.api -import io.swagger.client.model._ -import org.json4s._ import scala.reflect.ClassTag object EnumsSerializers { @@ -9,16 +7,14 @@ object EnumsSerializers { def all = Seq[Serializer[_]]() - - private class EnumNameSerializer[E <: Enumeration: ClassTag](enum: E) + private class EnumNameSerializer[E <: Enumeration : ClassTag](enum: E) extends Serializer[E#Value] { - import JsonDSL._ val EnumerationClass = classOf[E#Value] def deserialize(implicit format: Formats): PartialFunction[(TypeInfo, JValue), E#Value] = { - case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) => { + case (t@TypeInfo(EnumerationClass, _), json) if isValid(json) => { json match { case JString(value) => enum.withName(value) diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala index 3c85b1a857f..04c0a046750 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala @@ -1,24 +1,14 @@ package io.swagger.client.api -import io.swagger.client.model.WordObject -import io.swagger.client.model.AudioFile -import io.swagger.client.model.Definition -import io.swagger.client.model.FrequencySummary -import io.swagger.client.model.Bigram -import io.swagger.client.model.Example -import io.swagger.client.core._ -import io.swagger.client.core.CollectionFormats._ -import io.swagger.client.core.ApiKeyLocations._ - object WordApi { /** - * - * + * + * * Expected answers: - * code 200 : WordObject (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : WordObject (success) + * code 400 : (Invalid word supplied.) + * * @param word String value of WordObject to return * @param useCanonical If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested. * @param includeSuggestions Return suggestions (for correct spelling, case variants, etc.) @@ -30,14 +20,14 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[WordObject](200) .withErrorResponse[Unit](400) - + /** * The metadata includes a time-expiring fileUrl which allows reading the audio file directly from the API. Currently only audio pronunciations from the American Heritage Dictionary in mp3 format are supported. - * + * * Expected answers: - * code 200 : Seq[AudioFile] (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : Seq[AudioFile] (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to get audio for. * @param useCanonical Use the canonical form of the word * @param limit Maximum number of results to return @@ -49,15 +39,15 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Seq[AudioFile]](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : Seq[Definition] (success) - * code 400 : (Invalid word supplied.) - * code 404 : (No definitions found.) - * + * code 200 : Seq[Definition] (success) + * code 400 : (Invalid word supplied.) + * code 404 : (No definitions found.) + * * @param word Word to return definitions for * @param limit Maximum number of results to return * @param partOfSpeech CSV list of part-of-speech types @@ -78,15 +68,15 @@ object WordApi { .withSuccessResponse[Seq[Definition]](200) .withErrorResponse[Unit](400) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : Seq[String] (success) - * code 400 : (Invalid word supplied.) - * code 404 : (No definitions found.) - * + * code 200 : Seq[String] (success) + * code 400 : (Invalid word supplied.) + * code 404 : (No definitions found.) + * * @param word Word to return * @param useCanonical If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested. */ @@ -97,14 +87,14 @@ object WordApi { .withSuccessResponse[Seq[String]](200) .withErrorResponse[Unit](400) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to return examples for * @param includeDuplicates Show duplicate examples from different sources * @param useCanonical If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested. @@ -120,15 +110,15 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Unit](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : FrequencySummary (success) - * code 400 : (Invalid word supplied.) - * code 404 : (No results.) - * + * code 200 : FrequencySummary (success) + * code 400 : (Invalid word supplied.) + * code 404 : (No results.) + * * @param word Word to return * @param useCanonical If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested. * @param startYear Starting Year @@ -143,14 +133,14 @@ object WordApi { .withSuccessResponse[FrequencySummary](200) .withErrorResponse[Unit](400) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to get syllables for * @param useCanonical If true will try to return a correct word root ('cats' -> 'cat'). If false returns exactly what was requested. * @param sourceDictionary Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet. @@ -164,14 +154,14 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Unit](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : Seq[Bigram] (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : Seq[Bigram] (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to fetch phrases for * @param limit Maximum number of results to return * @param wlmi Minimum WLMI for the phrase @@ -185,14 +175,14 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Seq[Bigram]](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to get pronunciations for * @param useCanonical If true will try to return a correct word root ('cats' -> 'cat'). If false returns exactly what was requested. * @param sourceDictionary Get from a single dictionary @@ -208,14 +198,14 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Unit](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to fetch relationships for * @param useCanonical If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested. * @param relationshipTypes Limits the total results per type of relationship type @@ -229,14 +219,14 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Unit](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : Example (success) - * code 400 : (Invalid word supplied.) - * + * code 200 : Example (success) + * code 400 : (Invalid word supplied.) + * * @param word Word to fetch examples for * @param useCanonical If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested. */ @@ -246,7 +236,6 @@ object WordApi { .withPathParam("word", word) .withSuccessResponse[Example](200) .withErrorResponse[Unit](400) - } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala index 6ff76587e1a..e150a96ce77 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala @@ -1,22 +1,16 @@ package io.swagger.client.api -import io.swagger.client.model.WordList -import io.swagger.client.model.StringValue -import io.swagger.client.core._ -import io.swagger.client.core.CollectionFormats._ -import io.swagger.client.core.ApiKeyLocations._ - object WordListApi { /** - * - * + * + * * Expected answers: - * code 200 : WordList (success) - * code 400 : (Invalid ID supplied) - * code 403 : (Not Authorized to access WordList) - * code 404 : (WordList not found) - * + * code 200 : WordList (success) + * code 400 : (Invalid ID supplied) + * code 403 : (Not Authorized to access WordList) + * code 404 : (WordList not found) + * * @param permalink permalink of WordList to fetch * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) */ @@ -28,16 +22,16 @@ object WordListApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid ID supplied) - * code 403 : (Not Authorized to update WordList) - * code 404 : (WordList not found) - * + * code 200 : (success) + * code 400 : (Invalid ID supplied) + * code 403 : (Not Authorized to update WordList) + * code 404 : (WordList not found) + * * @param permalink permalink of WordList to update * @param body Updated WordList * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) @@ -51,16 +45,16 @@ object WordListApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid ID supplied) - * code 403 : (Not Authorized to delete WordList) - * code 404 : (WordList not found) - * + * code 200 : (success) + * code 400 : (Invalid ID supplied) + * code 403 : (Not Authorized to delete WordList) + * code 404 : (WordList not found) + * * @param permalink ID of WordList to delete * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) */ @@ -72,16 +66,16 @@ object WordListApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid permalink supplied) - * code 403 : (Not Authorized to modify WordList) - * code 404 : (WordList not found) - * + * code 200 : (success) + * code 400 : (Invalid permalink supplied) + * code 403 : (Not Authorized to modify WordList) + * code 404 : (WordList not found) + * * @param permalink permalink of WordList to use * @param body Words to remove from WordList * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) @@ -95,16 +89,16 @@ object WordListApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid ID supplied) - * code 403 : (Not Authorized to access WordList) - * code 404 : (WordList not found) - * + * code 200 : (success) + * code 400 : (Invalid ID supplied) + * code 403 : (Not Authorized to access WordList) + * code 404 : (WordList not found) + * * @param permalink ID of WordList to use * @param sortBy Field to sort by * @param sortOrder Direction to sort @@ -124,16 +118,16 @@ object WordListApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid permalink supplied) - * code 403 : (Not Authorized to access WordList) - * code 404 : (WordList not found) - * + * code 200 : (success) + * code 400 : (Invalid permalink supplied) + * code 403 : (Not Authorized to access WordList) + * code 404 : (WordList not found) + * * @param permalink permalink of WordList to user * @param body Array of words to add to WordList * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) @@ -147,7 +141,6 @@ object WordListApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala index cad9a37ba87..ad1e1e95877 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala @@ -1,21 +1,16 @@ package io.swagger.client.api -import io.swagger.client.model.WordList -import io.swagger.client.core._ -import io.swagger.client.core.CollectionFormats._ -import io.swagger.client.core.ApiKeyLocations._ - object WordListsApi { /** - * - * + * + * * Expected answers: - * code 200 : WordList (success) - * code 400 : (Invalid WordList supplied or mandatory fields are missing) - * code 403 : (Not authenticated) - * code 404 : (WordList owner not found) - * + * code 200 : WordList (success) + * code 400 : (Invalid WordList supplied or mandatory fields are missing) + * code 403 : (Not authenticated) + * code 404 : (WordList owner not found) + * * @param body WordList to create * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above) */ @@ -27,7 +22,6 @@ object WordListsApi { .withErrorResponse[Unit](400) .withErrorResponse[Unit](403) .withErrorResponse[Unit](404) - } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala index b3b33679252..413271f6665 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala @@ -1,22 +1,14 @@ package io.swagger.client.api -import io.swagger.client.model.WordObject -import io.swagger.client.model.DefinitionSearchResults -import io.swagger.client.model.WordSearchResults -import io.swagger.client.model.WordOfTheDay -import io.swagger.client.core._ -import io.swagger.client.core.CollectionFormats._ -import io.swagger.client.core.ApiKeyLocations._ - object WordsApi { /** - * - * + * + * * Expected answers: - * code 200 : WordObject (success) - * code 404 : (No word found.) - * + * code 200 : WordObject (success) + * code 404 : (No word found.) + * * @param hasDictionaryDef Only return words with dictionary definitions * @param includePartOfSpeech CSV part-of-speech values to include * @param excludePartOfSpeech CSV part-of-speech values to exclude @@ -40,15 +32,15 @@ object WordsApi { .withQueryParam("maxLength", maxLength) .withSuccessResponse[WordObject](200) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : (success) - * code 400 : (Invalid term supplied.) - * code 404 : (No results.) - * + * code 200 : (success) + * code 400 : (Invalid term supplied.) + * code 404 : (No results.) + * * @param hasDictionaryDef Only return words with dictionary definitions * @param includePartOfSpeech CSV part-of-speech values to include * @param excludePartOfSpeech CSV part-of-speech values to exclude @@ -79,14 +71,14 @@ object WordsApi { .withSuccessResponse[Unit](200) .withErrorResponse[Unit](400) .withErrorResponse[Unit](404) - + /** - * - * + * + * * Expected answers: - * code 200 : DefinitionSearchResults (success) - * code 400 : (Invalid term supplied.) - * + * code 200 : DefinitionSearchResults (success) + * code 400 : (Invalid term supplied.) + * * @param query Search term * @param findSenseForWord Restricts words and finds closest sense * @param includeSourceDictionaries Only include these comma-delimited source dictionaries @@ -124,14 +116,14 @@ object WordsApi { .withQueryParam("limit", limit) .withSuccessResponse[DefinitionSearchResults](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 200 : WordSearchResults (success) - * code 400 : (Invalid query supplied.) - * + * code 200 : WordSearchResults (success) + * code 400 : (Invalid query supplied.) + * * @param query Search query * @param caseSensitive Search case sensitive * @param includePartOfSpeech Only include these comma-delimited parts of speech @@ -161,20 +153,19 @@ object WordsApi { .withPathParam("query", query) .withSuccessResponse[WordSearchResults](200) .withErrorResponse[Unit](400) - + /** - * - * + * + * * Expected answers: - * code 0 : WordOfTheDay (success) - * + * code 0 : WordOfTheDay (success) + * * @param date Fetches by date in yyyy-MM-dd */ def getWordOfTheDay(date: Option[String] = None): ApiRequest[WordOfTheDay] = ApiRequest[WordOfTheDay](ApiMethods.GET, "https://api.wordnik.com/v4", "/words.json/wordOfTheDay", "application/json") .withQueryParam("date", date) .withDefaultSuccessResponse[WordOfTheDay] - } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala index 3b11d866017..01569183c48 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala @@ -4,29 +4,6 @@ import java.io.File import java.security.cert.X509Certificate import javax.net.ssl._ -import akka.actor.ActorSystem -import akka.io.IO -import akka.pattern.ask -import akka.util.Timeout -import org.joda.time.DateTime -import org.joda.time.format.ISODateTimeFormat -import org.json4s.JsonAST.JString -import org.json4s._ -import org.json4s.jackson.JsonMethods._ -import org.json4s.jackson.Serialization -import spray.can.Http -import spray.can.Http.HostConnectorSetup -import spray.client.pipelining -import spray.client.pipelining._ -import spray.http.HttpEncodings._ -import spray.http.HttpHeaders.{RawHeader, `Accept-Encoding`} -import spray.http.Uri.Query -import spray.http._ -import spray.http.parser.HttpParser -import spray.httpx.encoding.{Deflate, Encoder, Gzip} -import spray.httpx.unmarshalling._ -import spray.io.ClientSSLEngineProvider - import scala.concurrent.{ExecutionContext, Future} import scala.reflect.ClassTag import scala.util.control.NonFatal @@ -35,11 +12,11 @@ object ApiInvoker { def apply()(implicit system: ActorSystem): ApiInvoker = apply(DefaultFormats + DateTimeSerializer) + def apply(serializers: Traversable[Serializer[_]])(implicit system: ActorSystem): ApiInvoker = apply(DefaultFormats + DateTimeSerializer ++ serializers) - def apply(formats: Formats)(implicit system: ActorSystem): ApiInvoker = new ApiInvoker(formats) - case class CustomStatusCode(value: Int, reason: String = "Application-defined status code", isSuccess: Boolean = true) + def apply(formats: Formats)(implicit system: ActorSystem): ApiInvoker = new ApiInvoker(formats) def addCustomStatusCode(code: CustomStatusCode): Unit = addCustomStatusCode(code.value, code.reason, code.isSuccess) @@ -49,11 +26,13 @@ object ApiInvoker { } } + case class CustomStatusCode(value: Int, reason: String = "Application-defined status code", isSuccess: Boolean = true) + /** * Allows request execution without calling apiInvoker.execute(request) * request.response can be used to get a future of the ApiResponse generated. * request.result can be used to get a future of the expected ApiResponse content. If content doesn't match, a - * Future will failed with a ClassCastException + * Future will failed with a ClassCastException * @param request the apiRequest to be executed */ implicit class ApiRequestImprovements[T](request: ApiRequest[T]) { @@ -84,26 +63,72 @@ object ApiInvoker { case d: DateTime => JString(ISODateTimeFormat.dateTimeParser().print(d)) })) + } class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends UntrustedSslContext with CustomContentTypes { - import io.swagger.client.core.ApiInvoker._ - import io.swagger.client.core.ParametersMap._ - implicit val ec = system.dispatcher implicit val jsonFormats = formats + val CompressionFilter = MessagePredicate({ _ => settings.compressionEnabled }) && + Encoder.DefaultFilter && + minEntitySize(settings.compressionSizeThreshold) - def settings = ApiSettings(system) + def execute[T](r: ApiRequest[T]): Future[ApiResponse[T]] = { + try { + implicit val timeout: Timeout = settings.connectionTimeout - import spray.http.MessagePredicate._ + val uri = makeUri(r) - val CompressionFilter = MessagePredicate({ _ => settings.compressionEnabled}) && - Encoder.DefaultFilter && - minEntitySize(settings.compressionSizeThreshold) + val connector = HostConnectorSetup( + uri.authority.host.toString, + uri.effectivePort, + sslEncryption = "https".equals(uri.scheme), + defaultHeaders = settings.defaultHeaders ++ List(`Accept-Encoding`(gzip, deflate))) + + val request = createRequest(uri, r) + + for { + Http.HostConnectorInfo(hostConnector, _) <- IO(Http) ? connector + response <- hostConnector.ask(request).mapTo[HttpResponse] + } yield { + response ~> decode(Deflate) ~> decode(Gzip) ~> unmarshallApiResponse(r) + } + } + catch { + case NonFatal(x) => Future.failed(x) + } + } settings.customCodes.foreach(addCustomStatusCode) + def settings = ApiSettings(system) + + private def createRequest(uri: Uri, request: ApiRequest[_]): HttpRequest = { + + val builder = new RequestBuilder(request.method.toSprayMethod) + val httpRequest = request.method.toSprayMethod match { + case HttpMethods.GET | HttpMethods.DELETE => builder.apply(uri) + case HttpMethods.POST | HttpMethods.PUT => + formDataContent(request) orElse bodyContent(request) match { + case Some(c: FormData) => + builder.apply(uri, c) + case Some(c: MultipartFormData) => + builder.apply(uri, c) + case Some(c: String) => + builder.apply(uri, HttpEntity(normalizedContentType(request.contentType), c)) + case _ => + builder.apply(uri, HttpEntity(normalizedContentType(request.contentType), " ")) + } + case _ => builder.apply(uri) + } + + httpRequest ~> + addHeaders(request.headerParams) ~> + addAuthentication(request.credentials) ~> + encode(Gzip(CompressionFilter)) + } + private def addAuthentication(credentialsSeq: Seq[Credentials]): pipelining.RequestTransformer = request => credentialsSeq.foldLeft(request) { @@ -124,19 +149,6 @@ class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends Untrust request.withHeaders(rawHeaders.toList) } - private def bodyPart(name: String, value: Any): BodyPart = { - value match { - case f: File => - BodyPart(f, name) - case v: String => - BodyPart(HttpEntity(String.valueOf(v))) - case NumericValue(v) => - BodyPart(HttpEntity(String.valueOf(v))) - case m: ApiModel => - BodyPart(HttpEntity(Serialization.write(m))) - } - } - private def formDataContent(request: ApiRequest[_]) = { val params = request.formParams.asFormattedParams if (params.isEmpty) @@ -145,7 +157,7 @@ class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends Untrust Some( normalizedContentType(request.contentType).mediaType match { case MediaTypes.`multipart/form-data` => - MultipartFormData(params.map { case (name, value) => (name, bodyPart(name, value))}) + MultipartFormData(params.map { case (name, value) => (name, bodyPart(name, value)) }) case MediaTypes.`application/x-www-form-urlencoded` => FormData(params.mapValues(String.valueOf)) case m: MediaType => // Default : application/x-www-form-urlencoded. @@ -154,45 +166,21 @@ class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends Untrust ) } - private def bodyContent(request: ApiRequest[_]): Option[Any] = { - request.bodyParam.map(Extraction.decompose).map(compact) - } - - private def createRequest(uri: Uri, request: ApiRequest[_]): HttpRequest = { - - val builder = new RequestBuilder(request.method.toSprayMethod) - val httpRequest = request.method.toSprayMethod match { - case HttpMethods.GET | HttpMethods.DELETE => builder.apply(uri) - case HttpMethods.POST | HttpMethods.PUT => - formDataContent(request) orElse bodyContent(request) match { - case Some(c: FormData) => - builder.apply(uri, c) - case Some(c: MultipartFormData) => - builder.apply(uri, c) - case Some(c: String) => - builder.apply(uri, HttpEntity(normalizedContentType(request.contentType), c)) - case _ => - builder.apply(uri, HttpEntity(normalizedContentType(request.contentType), " ")) - } - case _ => builder.apply(uri) + private def bodyPart(name: String, value: Any): BodyPart = { + value match { + case f: File => + BodyPart(f, name) + case v: String => + BodyPart(HttpEntity(String.valueOf(v))) + case NumericValue(v) => + BodyPart(HttpEntity(String.valueOf(v))) + case m: ApiModel => + BodyPart(HttpEntity(Serialization.write(m))) } - - httpRequest ~> - addHeaders(request.headerParams) ~> - addAuthentication(request.credentials) ~> - encode(Gzip(CompressionFilter)) } - def makeQuery(r: ApiRequest[_]): Query = { - r.credentials.foldLeft(r.queryParams) { - case (params, ApiKeyCredentials(key, keyName, ApiKeyLocations.QUERY)) => - params + (keyName -> key.value) - case (params, _) => params - }.asFormattedParams - .mapValues(String.valueOf) - .foldRight[Query](Uri.Query.Empty) { - case ((name, value), acc) => acc.+:(name, value) - } + private def bodyContent(request: ApiRequest[_]): Option[Any] = { + request.bodyParam.map(Extraction.decompose).map(compact) } def makeUri(r: ApiRequest[_]): Uri = { @@ -207,35 +195,21 @@ class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends Untrust Uri(r.basePath + opPathWithParams).withQuery(query) } - def execute[T](r: ApiRequest[T]): Future[ApiResponse[T]] = { - try { - implicit val timeout: Timeout = settings.connectionTimeout - - val uri = makeUri(r) - - val connector = HostConnectorSetup( - uri.authority.host.toString, - uri.effectivePort, - sslEncryption = "https".equals(uri.scheme), - defaultHeaders = settings.defaultHeaders ++ List(`Accept-Encoding`(gzip, deflate))) - - val request = createRequest(uri, r) - - for { - Http.HostConnectorInfo(hostConnector, _) <- IO(Http) ? connector - response <- hostConnector.ask(request).mapTo[HttpResponse] - } yield { - response ~> decode(Deflate) ~> decode(Gzip) ~> unmarshallApiResponse(r) - } - } - catch { - case NonFatal(x) => Future.failed(x) + def makeQuery(r: ApiRequest[_]): Query = { + r.credentials.foldLeft(r.queryParams) { + case (params, ApiKeyCredentials(key, keyName, ApiKeyLocations.QUERY)) => + params + (keyName -> key.value) + case (params, _) => params + }.asFormattedParams + .mapValues(String.valueOf) + .foldRight[Query](Uri.Query.Empty) { + case ((name, value), acc) => acc.+:(name, value) } } def unmarshallApiResponse[T](request: ApiRequest[T])(response: HttpResponse): ApiResponse[T] = { request.responseForCode(response.status.intValue) match { - case Some( (manifest: Manifest[T], state: ResponseState) ) => + case Some((manifest: Manifest[T], state: ResponseState)) => entityUnmarshaller(manifest)(response.entity) match { case Right(value) ⇒ state match { diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala index 0588193cfbe..794c43f5f41 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala @@ -1,34 +1,38 @@ package io.swagger.client.core sealed trait ResponseState + object ResponseState { + case object Success extends ResponseState + case object Error extends ResponseState + } case class ApiRequest[U]( - // required fields - method: ApiMethod, - basePath: String, - operationPath: String, - contentType: String, - - // optional fields - responses: Map[Int, (Manifest[_], ResponseState)] = Map.empty, - bodyParam: Option[Any] = None, - formParams: Map[String, Any] = Map.empty, - pathParams: Map[String, Any] = Map.empty, - queryParams: Map[String, Any] = Map.empty, - headerParams: Map[String, Any] = Map.empty, - credentials: Seq[Credentials] = List.empty) { + // required fields + method: ApiMethod, + basePath: String, + operationPath: String, + contentType: String, + + // optional fields + responses: Map[Int, (Manifest[_], ResponseState)] = Map.empty, + bodyParam: Option[Any] = None, + formParams: Map[String, Any] = Map.empty, + pathParams: Map[String, Any] = Map.empty, + queryParams: Map[String, Any] = Map.empty, + headerParams: Map[String, Any] = Map.empty, + credentials: Seq[Credentials] = List.empty) { def withCredentials(cred: Credentials) = copy[U](credentials = credentials :+ cred) def withApiKey(key: ApiKeyValue, keyName: String, location: ApiKeyLocation) = withCredentials(ApiKeyCredentials(key, keyName, location)) - def withSuccessResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code -> (m, ResponseState.Success))) + def withSuccessResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code ->(m, ResponseState.Success))) - def withErrorResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code -> (m, ResponseState.Error))) + def withErrorResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code ->(m, ResponseState.Error))) def withDefaultSuccessResponse[T](implicit m: Manifest[T]) = withSuccessResponse[T](0) diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala index 3162fb9f6be..0eb4fb5e09b 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala @@ -2,19 +2,9 @@ package io.swagger.client.core import java.util.concurrent.TimeUnit -import akka.actor.{ExtendedActorSystem, Extension, ExtensionKey} -import com.typesafe.config.Config -import io.swagger.client.core.ApiInvoker.CustomStatusCode -import spray.http.HttpHeaders.RawHeader - -import scala.collection.JavaConversions._ import scala.concurrent.duration.FiniteDuration class ApiSettings(config: Config) extends Extension { - def this(system: ExtendedActorSystem) = this(system.settings.config) - - private def cfg = config.getConfig("io.swagger.client.apiRequest") - val alwaysTrustCertificates = cfg.getBoolean("trust-certificates") val defaultHeaders = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render)) val connectionTimeout = FiniteDuration(cfg.getDuration("connection-timeout", TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS) @@ -26,6 +16,10 @@ class ApiSettings(config: Config) extends Extension { c.getBoolean("success")) } + def this(system: ExtendedActorSystem) = this(system.settings.config) + + private def cfg = config.getConfig("io.swagger.client.apiRequest") + } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala index a096a994ea3..9ed9f6e1f3f 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala @@ -2,18 +2,31 @@ package io.swagger.client.core import java.io.File import java.net.URLEncoder + import scala.util.Try sealed trait ApiReturnWithHeaders { def headers: Map[String, String] + def header(name: String): Option[String] = headers.get(name) + def getStringHeader(name: String) = header(name) + def getIntHeader(name: String) = castedHeader(name, java.lang.Integer.parseInt) + def getLongHeader(name: String) = castedHeader(name, java.lang.Long.parseLong) + def getFloatHeader(name: String) = castedHeader(name, java.lang.Float.parseFloat) + def getDoubleHeader(name: String) = castedHeader(name, java.lang.Double.parseDouble) + def getBooleanHeader(name: String) = castedHeader(name, java.lang.Boolean.parseBoolean) - private def castedHeader[U](name: String, conversion: String => U): Option[U] = { Try { header(name).map( conversion ) }.get } + + private def castedHeader[U](name: String, conversion: String => U): Option[U] = { + Try { + header(name).map(conversion) + }.get + } } sealed case class ApiResponse[T](code: Int, content: T, headers: Map[String, String] = Map.empty) @@ -67,6 +80,7 @@ object ApiKeyLocations { case object QUERY extends ApiKeyLocation case object HEADER extends ApiKeyLocation + } @@ -163,4 +177,5 @@ object ParametersMap { } } + } diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala index 0887fb0ba76..1c099f61d88 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala @@ -1,16 +1,13 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class ApiTokenStatus ( - valid: Option[Boolean], - token: Option[String], - resetsInMillis: Option[Long], - remainingCalls: Option[Long], - expiresInMillis: Option[Long], - totalRequests: Option[Long]) - extends ApiModel +case class ApiTokenStatus( + valid: Option[Boolean], + token: Option[String], + resetsInMillis: Option[Long], + remainingCalls: Option[Long], + expiresInMillis: Option[Long], + totalRequests: Option[Long]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala index 3b3e9186b69..ae1975d3359 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala @@ -1,24 +1,21 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class AudioFile ( - attributionUrl: Option[String], - commentCount: Option[Int], - voteCount: Option[Int], - fileUrl: Option[String], - audioType: Option[String], - id: Option[Long], - duration: Option[Double], - attributionText: Option[String], - createdBy: Option[String], - description: Option[String], - createdAt: Option[DateTime], - voteWeightedAverage: Option[Float], - voteAverage: Option[Float], - word: Option[String]) - extends ApiModel +case class AudioFile( + attributionUrl: Option[String], + commentCount: Option[Int], + voteCount: Option[Int], + fileUrl: Option[String], + audioType: Option[String], + id: Option[Long], + duration: Option[Double], + attributionText: Option[String], + createdBy: Option[String], + description: Option[String], + createdAt: Option[DateTime], + voteWeightedAverage: Option[Float], + voteAverage: Option[Float], + word: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala index be7d0a1d5ef..90984887967 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class AudioType ( - id: Option[Int], - name: Option[String]) - extends ApiModel +case class AudioType( + id: Option[Int], + name: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala index 981c7340d8e..c150a7b6385 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala @@ -1,13 +1,10 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class AuthenticationToken ( - token: Option[String], - userId: Option[Long], - userSignature: Option[String]) - extends ApiModel +case class AuthenticationToken( + token: Option[String], + userId: Option[Long], + userSignature: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala index c0a567c4ff9..ac0bb8c5f1f 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala @@ -1,15 +1,12 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Bigram ( - count: Option[Long], - gram2: Option[String], - gram1: Option[String], - wlmi: Option[Double], - mi: Option[Double]) - extends ApiModel +case class Bigram( + count: Option[Long], + gram2: Option[String], + gram1: Option[String], + wlmi: Option[Double], + mi: Option[Double]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala index af66bc14753..d965ec4d6bd 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Category ( - id: Option[Long], - name: Option[String]) - extends ApiModel +case class Category( + id: Option[Long], + name: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala index 16f75961500..c93d8b9e2ed 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Citation ( - cite: Option[String], - source: Option[String]) - extends ApiModel +case class Citation( + cite: Option[String], + source: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala index c7832871f7e..3baf96be8e1 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class ContentProvider ( - id: Option[Int], - name: Option[String]) - extends ApiModel +case class ContentProvider( + id: Option[Int], + name: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala index 6274df1aa61..f0b97f3d726 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala @@ -1,26 +1,23 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Definition ( - extendedText: Option[String], - text: Option[String], - sourceDictionary: Option[String], - citations: Option[Seq[Citation]], - labels: Option[Seq[Label]], - score: Option[Float], - exampleUses: Option[Seq[ExampleUsage]], - attributionUrl: Option[String], - seqString: Option[String], - attributionText: Option[String], - relatedWords: Option[Seq[Related]], - sequence: Option[String], - word: Option[String], - notes: Option[Seq[Note]], - textProns: Option[Seq[TextPron]], - partOfSpeech: Option[String]) - extends ApiModel +case class Definition( + extendedText: Option[String], + text: Option[String], + sourceDictionary: Option[String], + citations: Option[Seq[Citation]], + labels: Option[Seq[Label]], + score: Option[Float], + exampleUses: Option[Seq[ExampleUsage]], + attributionUrl: Option[String], + seqString: Option[String], + attributionText: Option[String], + relatedWords: Option[Seq[Related]], + sequence: Option[String], + word: Option[String], + notes: Option[Seq[Note]], + textProns: Option[Seq[TextPron]], + partOfSpeech: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala index 28d7d4e239b..4c35cec842c 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class DefinitionSearchResults ( - results: Option[Seq[Definition]], - totalResults: Option[Int]) - extends ApiModel +case class DefinitionSearchResults( + results: Option[Seq[Definition]], + totalResults: Option[Int]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala index 0d4d52aec98..9557c5d8a24 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala @@ -1,22 +1,19 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Example ( - id: Option[Long], - exampleId: Option[Long], - title: Option[String], - text: Option[String], - score: Option[ScoredWord], - sentence: Option[Sentence], - word: Option[String], - provider: Option[ContentProvider], - year: Option[Int], - rating: Option[Float], - documentId: Option[Long], - url: Option[String]) - extends ApiModel +case class Example( + id: Option[Long], + exampleId: Option[Long], + title: Option[String], + text: Option[String], + score: Option[ScoredWord], + sentence: Option[Sentence], + word: Option[String], + provider: Option[ContentProvider], + year: Option[Int], + rating: Option[Float], + documentId: Option[Long], + url: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala index bd4494666da..51107d9e4b6 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class ExampleSearchResults ( - facets: Option[Seq[Facet]], - examples: Option[Seq[Example]]) - extends ApiModel +case class ExampleSearchResults( + facets: Option[Seq[Facet]], + examples: Option[Seq[Example]]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala index 377ee69f27a..10706036a58 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala @@ -1,11 +1,8 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class ExampleUsage ( - text: Option[String]) - extends ApiModel +case class ExampleUsage( + text: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala index 80d28578b78..1feb9cd7ec6 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Facet ( - facetValues: Option[Seq[FacetValue]], - name: Option[String]) - extends ApiModel +case class Facet( + facetValues: Option[Seq[FacetValue]], + name: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala index 8a6f5d78cbb..9f38118203a 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class FacetValue ( - count: Option[Long], - value: Option[String]) - extends ApiModel +case class FacetValue( + count: Option[Long], + value: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala index 58c29eb0b12..8eee02d1187 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Frequency ( - count: Option[Long], - year: Option[Int]) - extends ApiModel +case class Frequency( + count: Option[Long], + year: Option[Int]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala index 3eacadbde71..7bb89bed051 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala @@ -1,15 +1,12 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class FrequencySummary ( - unknownYearCount: Option[Int], - totalCount: Option[Long], - frequencyString: Option[String], - word: Option[String], - frequency: Option[Seq[Frequency]]) - extends ApiModel +case class FrequencySummary( + unknownYearCount: Option[Int], + totalCount: Option[Long], + frequencyString: Option[String], + word: Option[String], + frequency: Option[Seq[Frequency]]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala index 5adba8e3276..528bf4a5763 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Label ( - text: Option[String], - `type`: Option[String]) - extends ApiModel +case class Label( + text: Option[String], + `type`: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala index ff0d72524ed..d898b662a3f 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala @@ -1,14 +1,11 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Note ( - noteType: Option[String], - appliesTo: Option[Seq[String]], - value: Option[String], - pos: Option[Int]) - extends ApiModel +case class Note( + noteType: Option[String], + appliesTo: Option[Seq[String]], + value: Option[String], + pos: Option[Int]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala index 182a8974ff6..8f1b90d974b 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala @@ -1,13 +1,10 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class PartOfSpeech ( - roots: Option[Seq[Root]], - storageAbbr: Option[Seq[String]], - allCategories: Option[Seq[Category]]) - extends ApiModel +case class PartOfSpeech( + roots: Option[Seq[Root]], + storageAbbr: Option[Seq[String]], + allCategories: Option[Seq[Category]]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala index 5fdd347cb33..c0bd46c0030 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala @@ -1,17 +1,14 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Related ( - label1: Option[String], - relationshipType: Option[String], - label2: Option[String], - label3: Option[String], - words: Option[Seq[String]], - gram: Option[String], - label4: Option[String]) - extends ApiModel +case class Related( + label1: Option[String], + relationshipType: Option[String], + label2: Option[String], + label3: Option[String], + words: Option[Seq[String]], + gram: Option[String], + label4: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala index ee134f80340..b2205936656 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala @@ -1,13 +1,10 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Root ( - id: Option[Long], - name: Option[String], - categories: Option[Seq[Category]]) - extends ApiModel +case class Root( + id: Option[Long], + name: Option[String], + categories: Option[Seq[Category]]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala index 7c7b7e9b5ab..9a37a609a3b 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala @@ -1,21 +1,18 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class ScoredWord ( - position: Option[Int], - id: Option[Long], - docTermCount: Option[Int], - lemma: Option[String], - wordType: Option[String], - score: Option[Float], - sentenceId: Option[Long], - word: Option[String], - stopword: Option[Boolean], - baseWordScore: Option[Double], - partOfSpeech: Option[String]) - extends ApiModel +case class ScoredWord( + position: Option[Int], + id: Option[Long], + docTermCount: Option[Int], + lemma: Option[String], + wordType: Option[String], + score: Option[Float], + sentenceId: Option[Long], + word: Option[String], + stopword: Option[Boolean], + baseWordScore: Option[Double], + partOfSpeech: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala index 99f7f0400af..401d64d012a 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala @@ -1,16 +1,13 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Sentence ( - hasScoredWords: Option[Boolean], - id: Option[Long], - scoredWords: Option[Seq[ScoredWord]], - display: Option[String], - rating: Option[Int], - documentMetadataId: Option[Long]) - extends ApiModel +case class Sentence( + hasScoredWords: Option[Boolean], + id: Option[Long], + scoredWords: Option[Seq[ScoredWord]], + display: Option[String], + rating: Option[Int], + documentMetadataId: Option[Long]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala index 1807123222c..b7e7d4d49f5 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala @@ -1,14 +1,11 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class SimpleDefinition ( - text: Option[String], - source: Option[String], - note: Option[String], - partOfSpeech: Option[String]) - extends ApiModel +case class SimpleDefinition( + text: Option[String], + source: Option[String], + note: Option[String], + partOfSpeech: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala index 4548c2ece38..cfd8626465a 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala @@ -1,14 +1,11 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class SimpleExample ( - id: Option[Long], - title: Option[String], - text: Option[String], - url: Option[String]) - extends ApiModel +case class SimpleExample( + id: Option[Long], + title: Option[String], + text: Option[String], + url: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala index bb36fabef8e..e324032e9be 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala @@ -1,11 +1,8 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class StringValue ( - word: Option[String]) - extends ApiModel +case class StringValue( + word: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala index 0db80cb840f..eba455d9e8a 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala @@ -1,13 +1,10 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class Syllable ( - text: Option[String], - seq: Option[Int], - `type`: Option[String]) - extends ApiModel +case class Syllable( + text: Option[String], + seq: Option[Int], + `type`: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala index 95d17c14fcf..690e54f6eba 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala @@ -1,13 +1,10 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class TextPron ( - raw: Option[String], - seq: Option[Int], - rawType: Option[String]) - extends ApiModel +case class TextPron( + raw: Option[String], + seq: Option[Int], + rawType: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala index 421c8f3210b..4e2cbd1dc78 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala @@ -1,18 +1,15 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class User ( - id: Option[Long], - username: Option[String], - email: Option[String], - status: Option[Int], - faceBookId: Option[String], - userName: Option[String], - displayName: Option[String], - password: Option[String]) - extends ApiModel +case class User( + id: Option[Long], + username: Option[String], + email: Option[String], + status: Option[Int], + faceBookId: Option[String], + userName: Option[String], + displayName: Option[String], + password: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala index c46484d5978..db2a94d7052 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala @@ -1,21 +1,18 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class WordList ( - id: Option[Long], - permalink: Option[String], - name: Option[String], - createdAt: Option[DateTime], - updatedAt: Option[DateTime], - lastActivityAt: Option[DateTime], - username: Option[String], - userId: Option[Long], - description: Option[String], - numberWordsInList: Option[Long], - `type`: Option[String]) - extends ApiModel +case class WordList( + id: Option[Long], + permalink: Option[String], + name: Option[String], + createdAt: Option[DateTime], + updatedAt: Option[DateTime], + lastActivityAt: Option[DateTime], + username: Option[String], + userId: Option[Long], + description: Option[String], + numberWordsInList: Option[Long], + `type`: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala index 062f1fe6a6b..6bfce5522b8 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala @@ -1,17 +1,14 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class WordListWord ( - id: Option[Long], - word: Option[String], - username: Option[String], - userId: Option[Long], - createdAt: Option[DateTime], - numberCommentsOnWord: Option[Long], - numberLists: Option[Long]) - extends ApiModel +case class WordListWord( + id: Option[Long], + word: Option[String], + username: Option[String], + userId: Option[Long], + createdAt: Option[DateTime], + numberCommentsOnWord: Option[Long], + numberLists: Option[Long]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala index 5f5c1c6a426..965bed21104 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala @@ -1,16 +1,13 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class WordObject ( - id: Option[Long], - word: Option[String], - originalWord: Option[String], - suggestions: Option[Seq[String]], - canonicalForm: Option[String], - vulgar: Option[String]) - extends ApiModel +case class WordObject( + id: Option[Long], + word: Option[String], + originalWord: Option[String], + suggestions: Option[Seq[String]], + canonicalForm: Option[String], + vulgar: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala index 6b94e34d211..68a41d87b62 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala @@ -1,22 +1,19 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class WordOfTheDay ( - id: Option[Long], - parentId: Option[String], - category: Option[String], - createdBy: Option[String], - createdAt: Option[DateTime], - contentProvider: Option[ContentProvider], - htmlExtra: Option[String], - word: Option[String], - definitions: Option[Seq[SimpleDefinition]], - examples: Option[Seq[SimpleExample]], - note: Option[String], - publishDate: Option[DateTime]) - extends ApiModel +case class WordOfTheDay( + id: Option[Long], + parentId: Option[String], + category: Option[String], + createdBy: Option[String], + createdAt: Option[DateTime], + contentProvider: Option[ContentProvider], + htmlExtra: Option[String], + word: Option[String], + definitions: Option[Seq[SimpleDefinition]], + examples: Option[Seq[SimpleExample]], + note: Option[String], + publishDate: Option[DateTime]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala index 771fd35b2e8..1d50c67de0e 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala @@ -1,13 +1,10 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class WordSearchResult ( - count: Option[Long], - lexicality: Option[Double], - word: Option[String]) - extends ApiModel +case class WordSearchResult( + count: Option[Long], + lexicality: Option[Double], + word: Option[String]) + extends ApiModel diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala index bc2af2a8448..331ea795da2 100644 --- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala +++ b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala @@ -1,12 +1,9 @@ package io.swagger.client.model -import io.swagger.client.core.ApiModel -import org.joda.time.DateTime - -case class WordSearchResults ( - searchResults: Option[Seq[WordSearchResult]], - totalResults: Option[Int]) - extends ApiModel +case class WordSearchResults( + searchResults: Option[Seq[WordSearchResult]], + totalResults: Option[Int]) + extends ApiModel diff --git a/samples/client/wordnik/android-java/pom.xml b/samples/client/wordnik/android-java/pom.xml index ef2be59b188..0be5e486152 100644 --- a/samples/client/wordnik/android-java/pom.xml +++ b/samples/client/wordnik/android-java/pom.xml @@ -1,162 +1,162 @@ - - 4.0.0 - io.swagger - swagger-client - jar - swagger-client - 1.0.0 - - scm:git:git@github.com:wordnik/swagger-mustache.git - scm:git:git@github.com:wordnik/swagger-codegen.git - https://github.com/wordnik/swagger-codegen - - - 2.2.0 - + + 4.0.0 + io.swagger + swagger-client + jar + swagger-client + 1.0.0 + + scm:git:git@github.com:wordnik/swagger-mustache.git + scm:git:git@github.com:wordnik/swagger-codegen.git + https://github.com/wordnik/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-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.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 - - - - - - - com.wordnik - swagger-annotations - ${swagger-annotations-version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson-version} - compile - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson-version} - compile - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-version} - compile - - - org.apache.httpcomponents - httpclient - ${httpclient-version} - compile - + + 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 + + + + + + + com.wordnik + swagger-annotations + ${swagger-annotations-version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + compile + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + compile + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-version} + compile + + + org.apache.httpcomponents + httpclient + ${httpclient-version} + compile + - - - junit - junit - ${junit-version} - test - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - - 1.5.1-M1 - 2.1.4 - 4.8.1 - 1.0.0 - 4.8.1 - 4.0 - + + + junit + junit + ${junit-version} + test + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + + 1.5.1-M1 + 2.1.4 + 4.8.1 + 1.0.0 + 4.8.1 + 4.0 + diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java index 31bc8a0978a..afeba0fc7d7 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java @@ -1,29 +1,30 @@ package io.swagger.client; public class ApiException extends Exception { - int code = 0; - String message = null; + int code = 0; + String message = null; - public ApiException() {} + public ApiException() { + } - public ApiException(int code, String message) { - this.code = code; - this.message = message; - } + public ApiException(int code, String message) { + this.code = code; + this.message = message; + } - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } \ No newline at end of file diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java index 6306e0734a9..bae71ce367f 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java @@ -1,283 +1,249 @@ package io.swagger.client; -import com.fasterxml.jackson.core.JsonGenerator.Feature; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.annotation.*; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - -import org.apache.http.*; -import org.apache.http.client.*; -import org.apache.http.client.methods.*; -import org.apache.http.conn.*; -import org.apache.http.conn.scheme.*; -import org.apache.http.conn.ssl.*; import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.*; -import org.apache.http.impl.conn.*; -import org.apache.http.params.*; import org.apache.http.util.EntityUtils; -import java.io.File; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import java.io.IOException; import java.net.Socket; import java.net.UnknownHostException; -import java.net.URLEncoder; - -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.io.IOException; -import java.io.UnsupportedEncodingException; - import java.security.GeneralSecurityException; import java.security.KeyManagementException; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import java.security.cert.*; +import java.security.cert.X509Certificate; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import java.text.DateFormat; -import java.text.SimpleDateFormat; +public class ApiInvoker { + private static ApiInvoker INSTANCE = new ApiInvoker(); + private Map defaultHeaderMap = new HashMap(); -import java.util.Date; -import java.util.Random; -import java.util.logging.Level; -import java.util.logging.Logger; + private HttpClient client = null; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; + private boolean ignoreSSLCertificates = false; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; + private ClientConnectionManager ignoreSSLConnectionManager; -public class ApiInvoker { - private static ApiInvoker INSTANCE = new ApiInvoker(); - private Map defaultHeaderMap = new HashMap(); - - private HttpClient client = null; - - private boolean ignoreSSLCertificates = false; - - private ClientConnectionManager ignoreSSLConnectionManager; - - public ApiInvoker() { - initConnectionManager(); - } - - public static ApiInvoker getInstance() { - return INSTANCE; - } - - public void ignoreSSLCertificates(boolean ignoreSSLCertificates) { - this.ignoreSSLCertificates = ignoreSSLCertificates; - } - - public void addDefaultHeader(String key, String value) { - defaultHeaderMap.put(key, value); - } - - public String escapeString(String str) { - return str; - } - - public static Object deserialize(String json, String containerType, Class cls) throws ApiException { - try{ - if("List".equals(containerType)) { - JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); - List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); - return response; - } - else if(String.class.equals(cls)) { - if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) - return json.substring(1, json.length() - 2); - else - return json; - } - else { - return JsonUtil.getJsonMapper().readValue(json, cls); - } + public ApiInvoker() { + initConnectionManager(); } - catch (IOException e) { - throw new ApiException(500, e.getMessage()); - } - } - - public static String serialize(Object obj) throws ApiException { - try { - if (obj != null) - return JsonUtil.getJsonMapper().writeValueAsString(obj); - else - return null; + + public static ApiInvoker getInstance() { + return INSTANCE; } - catch (Exception e) { - throw new ApiException(500, e.getMessage()); + + public static Object deserialize(String json, String containerType, Class cls) throws ApiException { + try { + if ("List".equals(containerType)) { + JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); + List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); + return response; + } else if (String.class.equals(cls)) { + if (json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) { + return json.substring(1, json.length() - 2); + } else { + return json; + } + } else { + return JsonUtil.getJsonMapper().readValue(json, cls); + } + } catch (IOException e) { + throw new ApiException(500, e.getMessage()); + } } - } - - public String invokeAPI(String host, String path, String method, Map queryParams, Object body, Map headerParams, String contentType) throws ApiException { - HttpClient client = getClient(host); - - StringBuilder b = new StringBuilder(); - for(String key : queryParams.keySet()) { - String value = queryParams.get(key); - if (value != null){ - if(b.toString().length() == 0) - b.append("?"); - else - b.append("&"); - b.append(escapeString(key)).append("=").append(escapeString(value)); - } + + public static String serialize(Object obj) throws ApiException { + try { + if (obj != null) { + return JsonUtil.getJsonMapper().writeValueAsString(obj); + } else { + return null; + } + } catch (Exception e) { + throw new ApiException(500, e.getMessage()); + } } - String url = host + path + b.toString(); - HashMap headers = new HashMap(); + public void ignoreSSLCertificates(boolean ignoreSSLCertificates) { + this.ignoreSSLCertificates = ignoreSSLCertificates; + } - for(String key : headerParams.keySet()) { - headers.put(key, headerParams.get(key)); + public void addDefaultHeader(String key, String value) { + defaultHeaderMap.put(key, value); } - - for(String key : defaultHeaderMap.keySet()) { - if(!headerParams.containsKey(key)) { - headers.put(key, defaultHeaderMap.get(key)); - } + + public String escapeString(String str) { + return str; } - headers.put("Accept", "application/json"); - - HttpResponse response = null; - try{ - if("GET".equals(method)) { - HttpGet get = new HttpGet(url); - get.addHeader("Accept", "application/json"); - for(String key : headers.keySet()) { - get.setHeader(key, headers.get(key)); - } - response = client.execute(get); - } - else if ("POST".equals(method)) { - HttpPost post = new HttpPost(url); - - if (body != null) { - post.setHeader("Content-Type", contentType); - post.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - for(String key : headers.keySet()) { - post.setHeader(key, headers.get(key)); - } - response = client.execute(post); - } - else if ("PUT".equals(method)) { - HttpPut put = new HttpPut(url); - if(body != null) { - put.setHeader("Content-Type", contentType); - put.setEntity(new StringEntity(serialize(body), "UTF-8")); - } - for(String key : headers.keySet()) { - put.setHeader(key, headers.get(key)); - } - response = client.execute(put); - } - else if ("DELETE".equals(method)) { - HttpDelete delete = new HttpDelete(url); - for(String key : headers.keySet()) { - delete.setHeader(key, headers.get(key)); - } - response = client.execute(delete); - } - else if ("PATCH".equals(method)) { - HttpPatch patch = new HttpPatch(url); - - if (body != null) { - patch.setHeader("Content-Type", contentType); - patch.setEntity(new StringEntity(serialize(body), "UTF-8")); + + public String invokeAPI(String host, String path, String method, Map queryParams, Object body, Map headerParams, String contentType) throws ApiException { + HttpClient client = getClient(host); + + StringBuilder b = new StringBuilder(); + for (String key : queryParams.keySet()) { + String value = queryParams.get(key); + if (value != null) { + if (b.toString().length() == 0) { + b.append("?"); + } else { + b.append("&"); + } + b.append(escapeString(key)).append("=").append(escapeString(value)); + } } - for(String key : headers.keySet()) { - patch.setHeader(key, headers.get(key)); + String url = host + path + b.toString(); + + HashMap headers = new HashMap(); + + for (String key : headerParams.keySet()) { + headers.put(key, headerParams.get(key)); } - response = client.execute(patch); - } - - int code = response.getStatusLine().getStatusCode(); - String responseString = null; - if(code == 204) - responseString = ""; - else if(code >= 200 && code < 300) { - if(response.getEntity() != null) { - HttpEntity resEntity = response.getEntity(); - responseString = EntityUtils.toString(resEntity); + + for (String key : defaultHeaderMap.keySet()) { + if (!headerParams.containsKey(key)) { + headers.put(key, defaultHeaderMap.get(key)); + } } - } - else { - if(response.getEntity() != null) { - HttpEntity resEntity = response.getEntity(); - responseString = EntityUtils.toString(resEntity); + headers.put("Accept", "application/json"); + + HttpResponse response = null; + try { + if ("GET".equals(method)) { + HttpGet get = new HttpGet(url); + get.addHeader("Accept", "application/json"); + for (String key : headers.keySet()) { + get.setHeader(key, headers.get(key)); + } + response = client.execute(get); + } else if ("POST".equals(method)) { + HttpPost post = new HttpPost(url); + + if (body != null) { + post.setHeader("Content-Type", contentType); + post.setEntity(new StringEntity(serialize(body), "UTF-8")); + } + for (String key : headers.keySet()) { + post.setHeader(key, headers.get(key)); + } + response = client.execute(post); + } else if ("PUT".equals(method)) { + HttpPut put = new HttpPut(url); + if (body != null) { + put.setHeader("Content-Type", contentType); + put.setEntity(new StringEntity(serialize(body), "UTF-8")); + } + for (String key : headers.keySet()) { + put.setHeader(key, headers.get(key)); + } + response = client.execute(put); + } else if ("DELETE".equals(method)) { + HttpDelete delete = new HttpDelete(url); + for (String key : headers.keySet()) { + delete.setHeader(key, headers.get(key)); + } + response = client.execute(delete); + } else if ("PATCH".equals(method)) { + HttpPatch patch = new HttpPatch(url); + + if (body != null) { + patch.setHeader("Content-Type", contentType); + patch.setEntity(new StringEntity(serialize(body), "UTF-8")); + } + for (String key : headers.keySet()) { + patch.setHeader(key, headers.get(key)); + } + response = client.execute(patch); + } + + int code = response.getStatusLine().getStatusCode(); + String responseString = null; + if (code == 204) { + responseString = ""; + } else if (code >= 200 && code < 300) { + if (response.getEntity() != null) { + HttpEntity resEntity = response.getEntity(); + responseString = EntityUtils.toString(resEntity); + } + } else { + if (response.getEntity() != null) { + HttpEntity resEntity = response.getEntity(); + responseString = EntityUtils.toString(resEntity); + } else { + responseString = "no data"; + } + throw new ApiException(code, responseString); + } + return responseString; + } catch (IOException e) { + throw new ApiException(500, e.getMessage()); } - else - responseString = "no data"; - throw new ApiException(code, responseString); - } - return responseString; - } - catch(IOException e) { - throw new ApiException(500, e.getMessage()); - } - } - - private HttpClient getClient(String host) { - if (client == null) { - if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) { - // Trust self signed certificates - client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams()); - } else { - client = new DefaultHttpClient(); - } } - return client; - } - - private void initConnectionManager() { - try { - final SSLContext sslContext = SSLContext.getInstance("SSL"); - - // set up a TrustManager that trusts everything - TrustManager[] trustManagers = new TrustManager[] { - new X509TrustManager() { - public X509Certificate[] getAcceptedIssuers() { - return null; - } - public void checkClientTrusted(X509Certificate[] certs, String authType) {} - public void checkServerTrusted(X509Certificate[] certs, String authType) {} - }}; - - sslContext.init(null, trustManagers, new SecureRandom()); - - SSLSocketFactory sf = new SSLSocketFactory((KeyStore)null) { - private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory(); - - public Socket createSocket(Socket socket, String host, int port, boolean autoClose) - throws IOException, UnknownHostException { - return sslFactory.createSocket(socket, host, port, autoClose); + + private HttpClient getClient(String host) { + if (client == null) { + if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) { + // Trust self signed certificates + client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams()); + } else { + client = new DefaultHttpClient(); + } } + return client; + } - public Socket createSocket() throws IOException { - return sslFactory.createSocket(); + private void initConnectionManager() { + try { + final SSLContext sslContext = SSLContext.getInstance("SSL"); + + // set up a TrustManager that trusts everything + TrustManager[] trustManagers = new TrustManager[]{ + new X509TrustManager() { + public X509Certificate[] getAcceptedIssuers() { + return null; + } + + public void checkClientTrusted(X509Certificate[] certs, String authType) { + } + + public void checkServerTrusted(X509Certificate[] certs, String authType) { + } + }}; + + sslContext.init(null, trustManagers, new SecureRandom()); + + SSLSocketFactory sf = new SSLSocketFactory((KeyStore) null) { + private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory(); + + public Socket createSocket(Socket socket, String host, int port, boolean autoClose) + throws IOException, UnknownHostException { + return sslFactory.createSocket(socket, host, port, autoClose); + } + + public Socket createSocket() throws IOException { + return sslFactory.createSocket(); + } + }; + + sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + Scheme httpsScheme = new Scheme("https", sf, 443); + SchemeRegistry schemeRegistry = new SchemeRegistry(); + schemeRegistry.register(httpsScheme); + schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); + + ignoreSSLConnectionManager = new SingleClientConnManager(new BasicHttpParams(), schemeRegistry); + } catch (NoSuchAlgorithmException e) { + // This will only be thrown if SSL isn't available for some reason. + } catch (KeyManagementException e) { + // This might be thrown when passing a key into init(), but no key is being passed. + } catch (GeneralSecurityException e) { + // This catches anything else that might go wrong. + // If anything goes wrong we default to the standard connection manager. } - }; - - sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); - Scheme httpsScheme = new Scheme("https", sf, 443); - SchemeRegistry schemeRegistry = new SchemeRegistry(); - schemeRegistry.register(httpsScheme); - schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); - - ignoreSSLConnectionManager = new SingleClientConnManager(new BasicHttpParams(), schemeRegistry); - } catch (NoSuchAlgorithmException e) { - // This will only be thrown if SSL isn't available for some reason. - } catch (KeyManagementException e) { - // This might be thrown when passing a key into init(), but no key is being passed. - } catch (GeneralSecurityException e) { - // This catches anything else that might go wrong. - // If anything goes wrong we default to the standard connection manager. } - } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java index cb97056dbc9..c40272a991e 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java @@ -1,7 +1,5 @@ package io.swagger.client; -import org.apache.http.client.methods.*; - public class HttpPatch extends HttpPost { public static final String METHOD_PATCH = "PATCH"; diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java index 90b99b48ec8..f9f47ce6f7f 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java @@ -1,20 +1,15 @@ package io.swagger.client; -import com.fasterxml.jackson.annotation.*; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.core.JsonGenerator.Feature; - public class JsonUtil { - public static ObjectMapper mapper; + public static ObjectMapper mapper; - static { - mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); - } + public static ObjectMapper getJsonMapper() { + return mapper; + } - public static ObjectMapper getJsonMapper() { - return mapper; - } + static { + mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java index e50be9645a6..8931e529821 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java @@ -2,233 +2,207 @@ import io.swagger.client.ApiException; import io.swagger.client.ApiInvoker; - -import io.swagger.client.model.*; - -import java.util.*; - import io.swagger.client.model.ApiTokenStatus; import io.swagger.client.model.AuthenticationToken; import io.swagger.client.model.User; import io.swagger.client.model.WordList; -import java.util.Map; import java.util.HashMap; -import java.io.File; +import java.util.List; +import java.util.Map; public class AccountApi { - String basePath = "https://api.wordnik.com/v4"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); - - public void addHeader(String key, String value) { - getInvoker().addDefaultHeader(key, value); - } - - public ApiInvoker getInvoker() { - return apiInvoker; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public String getBasePath() { - return basePath; - } - - - - public ApiTokenStatus getApiTokenStatus (String api_key) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/account.json/apiTokenStatus".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("api_key", api_key); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (ApiTokenStatus) ApiInvoker.deserialize(response, "", ApiTokenStatus.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + String basePath = "https://api.wordnik.com/v4"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); + + public void addHeader(String key, String value) { + getInvoker().addDefaultHeader(key, value); } - } - - - public AuthenticationToken authenticate (String username, String password) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(password))) - queryParams.put("password", String.valueOf(password)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + public ApiInvoker getInvoker() { + return apiInvoker; } - } - - - public AuthenticationToken authenticatePost (String username, String body) throws ApiException { - Object postBody = body; - - - - // create path and map variables - String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + public String getBasePath() { + return basePath; } - } - - - public User getLoggedInUser (String auth_token) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/account.json/user".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (User) ApiInvoker.deserialize(response, "", User.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + public void setBasePath(String basePath) { + this.basePath = basePath; } - } - - - public List getWordListsForLoggedInUser (String auth_token, Integer skip, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/account.json/wordLists".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(skip))) - queryParams.put("skip", String.valueOf(skip)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (List) ApiInvoker.deserialize(response, "array", WordList.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + public ApiTokenStatus getApiTokenStatus(String api_key) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/account.json/apiTokenStatus".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("api_key", api_key); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (ApiTokenStatus) ApiInvoker.deserialize(response, "", ApiTokenStatus.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - + + + public AuthenticationToken authenticate(String username, String password) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(password))) { + queryParams.put("password", String.valueOf(password)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + + + public AuthenticationToken authenticatePost(String username, String body) throws ApiException { + Object postBody = body; + + + // create path and map variables + String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + + + public User getLoggedInUser(String auth_token) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/account.json/user".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (User) ApiInvoker.deserialize(response, "", User.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + + + public List getWordListsForLoggedInUser(String auth_token, Integer skip, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/account.json/wordLists".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(skip))) { + queryParams.put("skip", String.valueOf(skip)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (List) ApiInvoker.deserialize(response, "array", WordList.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java index 91f29610977..6d7bf89b76b 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java @@ -2,512 +2,482 @@ import io.swagger.client.ApiException; import io.swagger.client.ApiInvoker; - -import io.swagger.client.model.*; - -import java.util.*; - -import io.swagger.client.model.WordObject; import io.swagger.client.model.AudioFile; -import io.swagger.client.model.Definition; -import io.swagger.client.model.FrequencySummary; import io.swagger.client.model.Bigram; +import io.swagger.client.model.Definition; import io.swagger.client.model.Example; +import io.swagger.client.model.FrequencySummary; +import io.swagger.client.model.WordObject; -import java.util.Map; import java.util.HashMap; -import java.io.File; +import java.util.List; +import java.util.Map; public class WordApi { - String basePath = "https://api.wordnik.com/v4"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); - - public void addHeader(String key, String value) { - getInvoker().addDefaultHeader(key, value); - } - - public ApiInvoker getInvoker() { - return apiInvoker; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public String getBasePath() { - return basePath; - } - - - - public WordObject getWord (String word, String useCanonical, String includeSuggestions) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(includeSuggestions))) - queryParams.put("includeSuggestions", String.valueOf(includeSuggestions)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + String basePath = "https://api.wordnik.com/v4"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); + + public void addHeader(String key, String value) { + getInvoker().addDefaultHeader(key, value); } - } - - - public List getAudio (String word, String useCanonical, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/audio".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (List) ApiInvoker.deserialize(response, "array", AudioFile.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + public ApiInvoker getInvoker() { + return apiInvoker; + } + + public String getBasePath() { + return basePath; } - } - - - public List getDefinitions (String word, Integer limit, String partOfSpeech, String includeRelated, List sourceDictionaries, String useCanonical, String includeTags) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/definitions".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - if(!"null".equals(String.valueOf(partOfSpeech))) - queryParams.put("partOfSpeech", String.valueOf(partOfSpeech)); - if(!"null".equals(String.valueOf(includeRelated))) - queryParams.put("includeRelated", String.valueOf(includeRelated)); - if(!"null".equals(String.valueOf(sourceDictionaries))) - queryParams.put("sourceDictionaries", String.valueOf(sourceDictionaries)); - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(includeTags))) - queryParams.put("includeTags", String.valueOf(includeTags)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (List) ApiInvoker.deserialize(response, "array", Definition.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + public void setBasePath(String basePath) { + this.basePath = basePath; + } + + public WordObject getWord(String word, String useCanonical, String includeSuggestions) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(includeSuggestions))) { + queryParams.put("includeSuggestions", String.valueOf(includeSuggestions)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + + + public List getAudio(String word, String useCanonical, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/audio".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (List) ApiInvoker.deserialize(response, "array", AudioFile.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + + + public List getDefinitions(String word, Integer limit, String partOfSpeech, String includeRelated, List sourceDictionaries, String useCanonical, String includeTags) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/definitions".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + if (!"null".equals(String.valueOf(partOfSpeech))) { + queryParams.put("partOfSpeech", String.valueOf(partOfSpeech)); + } + if (!"null".equals(String.valueOf(includeRelated))) { + queryParams.put("includeRelated", String.valueOf(includeRelated)); + } + if (!"null".equals(String.valueOf(sourceDictionaries))) { + queryParams.put("sourceDictionaries", String.valueOf(sourceDictionaries)); + } + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(includeTags))) { + queryParams.put("includeTags", String.valueOf(includeTags)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (List) ApiInvoker.deserialize(response, "array", Definition.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public List getEtymologies (String word, String useCanonical) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/etymologies".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (List) ApiInvoker.deserialize(response, "array", String.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public List getEtymologies(String word, String useCanonical) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/etymologies".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (List) ApiInvoker.deserialize(response, "array", String.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public void getExamples (String word, String includeDuplicates, String useCanonical, Integer skip, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/examples".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(includeDuplicates))) - queryParams.put("includeDuplicates", String.valueOf(includeDuplicates)); - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(skip))) - queryParams.put("skip", String.valueOf(skip)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void getExamples(String word, String includeDuplicates, String useCanonical, Integer skip, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/examples".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(includeDuplicates))) { + queryParams.put("includeDuplicates", String.valueOf(includeDuplicates)); + } + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(skip))) { + queryParams.put("skip", String.valueOf(skip)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public FrequencySummary getWordFrequency (String word, String useCanonical, Integer startYear, Integer endYear) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/frequency".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(startYear))) - queryParams.put("startYear", String.valueOf(startYear)); - if(!"null".equals(String.valueOf(endYear))) - queryParams.put("endYear", String.valueOf(endYear)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (FrequencySummary) ApiInvoker.deserialize(response, "", FrequencySummary.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public FrequencySummary getWordFrequency(String word, String useCanonical, Integer startYear, Integer endYear) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/frequency".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(startYear))) { + queryParams.put("startYear", String.valueOf(startYear)); + } + if (!"null".equals(String.valueOf(endYear))) { + queryParams.put("endYear", String.valueOf(endYear)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (FrequencySummary) ApiInvoker.deserialize(response, "", FrequencySummary.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public void getHyphenation (String word, String useCanonical, String sourceDictionary, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/hyphenation".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(sourceDictionary))) - queryParams.put("sourceDictionary", String.valueOf(sourceDictionary)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void getHyphenation(String word, String useCanonical, String sourceDictionary, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/hyphenation".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(sourceDictionary))) { + queryParams.put("sourceDictionary", String.valueOf(sourceDictionary)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public List getPhrases (String word, Integer limit, Integer wlmi, String useCanonical) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/phrases".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - if(!"null".equals(String.valueOf(wlmi))) - queryParams.put("wlmi", String.valueOf(wlmi)); - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (List) ApiInvoker.deserialize(response, "array", Bigram.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public List getPhrases(String word, Integer limit, Integer wlmi, String useCanonical) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/phrases".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + if (!"null".equals(String.valueOf(wlmi))) { + queryParams.put("wlmi", String.valueOf(wlmi)); + } + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (List) ApiInvoker.deserialize(response, "array", Bigram.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public void getTextPronunciations (String word, String useCanonical, String sourceDictionary, String typeFormat, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/pronunciations".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(sourceDictionary))) - queryParams.put("sourceDictionary", String.valueOf(sourceDictionary)); - if(!"null".equals(String.valueOf(typeFormat))) - queryParams.put("typeFormat", String.valueOf(typeFormat)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void getTextPronunciations(String word, String useCanonical, String sourceDictionary, String typeFormat, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/pronunciations".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(sourceDictionary))) { + queryParams.put("sourceDictionary", String.valueOf(sourceDictionary)); + } + if (!"null".equals(String.valueOf(typeFormat))) { + queryParams.put("typeFormat", String.valueOf(typeFormat)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public void getRelatedWords (String word, String useCanonical, String relationshipTypes, Integer limitPerRelationshipType) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/relatedWords".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - if(!"null".equals(String.valueOf(relationshipTypes))) - queryParams.put("relationshipTypes", String.valueOf(relationshipTypes)); - if(!"null".equals(String.valueOf(limitPerRelationshipType))) - queryParams.put("limitPerRelationshipType", String.valueOf(limitPerRelationshipType)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void getRelatedWords(String word, String useCanonical, String relationshipTypes, Integer limitPerRelationshipType) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/relatedWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + if (!"null".equals(String.valueOf(relationshipTypes))) { + queryParams.put("relationshipTypes", String.valueOf(relationshipTypes)); + } + if (!"null".equals(String.valueOf(limitPerRelationshipType))) { + queryParams.put("limitPerRelationshipType", String.valueOf(limitPerRelationshipType)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public Example getTopExample (String word, String useCanonical) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/word.json/{word}/topExample".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(useCanonical))) - queryParams.put("useCanonical", String.valueOf(useCanonical)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (Example) ApiInvoker.deserialize(response, "", Example.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public Example getTopExample(String word, String useCanonical) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/word.json/{word}/topExample".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(useCanonical))) { + queryParams.put("useCanonical", String.valueOf(useCanonical)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (Example) ApiInvoker.deserialize(response, "", Example.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - + } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java index 27ad7f780c6..1d82e877b1f 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java @@ -2,274 +2,247 @@ import io.swagger.client.ApiException; import io.swagger.client.ApiInvoker; - -import io.swagger.client.model.*; - -import java.util.*; - -import io.swagger.client.model.WordList; -import java.util.*; import io.swagger.client.model.StringValue; +import io.swagger.client.model.WordList; -import java.util.Map; import java.util.HashMap; -import java.io.File; +import java.util.List; +import java.util.Map; public class WordListApi { - String basePath = "https://api.wordnik.com/v4"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); - - public void addHeader(String key, String value) { - getInvoker().addDefaultHeader(key, value); - } - - public ApiInvoker getInvoker() { - return apiInvoker; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public String getBasePath() { - return basePath; - } - - - - public WordList getWordListByPermalink (String permalink, String auth_token) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (WordList) ApiInvoker.deserialize(response, "", WordList.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + String basePath = "https://api.wordnik.com/v4"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); + + public void addHeader(String key, String value) { + getInvoker().addDefaultHeader(key, value); + } + + public ApiInvoker getInvoker() { + return apiInvoker; + } + + public String getBasePath() { + return basePath; + } + + public void setBasePath(String basePath) { + this.basePath = basePath; + } + + public WordList getWordListByPermalink(String permalink, String auth_token) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (WordList) ApiInvoker.deserialize(response, "", WordList.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public void updateWordList (String permalink, WordList body, String auth_token) throws ApiException { - Object postBody = body; - - - - // create path and map variables - String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void updateWordList(String permalink, WordList body, String auth_token) throws ApiException { + Object postBody = body; + + + // create path and map variables + String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public void deleteWordList (String permalink, String auth_token) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void deleteWordList(String permalink, String auth_token) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public void deleteWordsFromWordList (String permalink, List body, String auth_token) throws ApiException { - Object postBody = body; - - - - // create path and map variables - String path = "/wordList.json/{permalink}/deleteWords".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void deleteWordsFromWordList(String permalink, List body, String auth_token) throws ApiException { + Object postBody = body; + + + // create path and map variables + String path = "/wordList.json/{permalink}/deleteWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public void getWordListWords (String permalink, String sortBy, String sortOrder, Integer skip, Integer limit, String auth_token) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(sortBy))) - queryParams.put("sortBy", String.valueOf(sortBy)); - if(!"null".equals(String.valueOf(sortOrder))) - queryParams.put("sortOrder", String.valueOf(sortOrder)); - if(!"null".equals(String.valueOf(skip))) - queryParams.put("skip", String.valueOf(skip)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void getWordListWords(String permalink, String sortBy, String sortOrder, Integer skip, Integer limit, String auth_token) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(sortBy))) { + queryParams.put("sortBy", String.valueOf(sortBy)); + } + if (!"null".equals(String.valueOf(sortOrder))) { + queryParams.put("sortOrder", String.valueOf(sortOrder)); + } + if (!"null".equals(String.valueOf(skip))) { + queryParams.put("skip", String.valueOf(skip)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public void addWordsToWordList (String permalink, List body, String auth_token) throws ApiException { - Object postBody = body; - - - - // create path and map variables - String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void addWordsToWordList(String permalink, List body, String auth_token) throws ApiException { + Object postBody = body; + + + // create path and map variables + String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - + } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java index 25eeb0cde89..21fdf762bc7 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java @@ -2,74 +2,62 @@ import io.swagger.client.ApiException; import io.swagger.client.ApiInvoker; - -import io.swagger.client.model.*; - -import java.util.*; - import io.swagger.client.model.WordList; -import java.util.Map; import java.util.HashMap; -import java.io.File; +import java.util.Map; public class WordListsApi { - String basePath = "https://api.wordnik.com/v4"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); - - public void addHeader(String key, String value) { - getInvoker().addDefaultHeader(key, value); - } - - public ApiInvoker getInvoker() { - return apiInvoker; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public String getBasePath() { - return basePath; - } - - - - public WordList createWordList (WordList body, String auth_token) throws ApiException { - Object postBody = body; - - - - // create path and map variables - String path = "/wordLists.json".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - - - headerParams.put("auth_token", auth_token); - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (WordList) ApiInvoker.deserialize(response, "", WordList.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + String basePath = "https://api.wordnik.com/v4"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); + + public void addHeader(String key, String value) { + getInvoker().addDefaultHeader(key, value); + } + + public ApiInvoker getInvoker() { + return apiInvoker; + } + + public String getBasePath() { + return basePath; + } + + public void setBasePath(String basePath) { + this.basePath = basePath; } - } - + + public WordList createWordList(WordList body, String auth_token) throws ApiException { + Object postBody = body; + + + // create path and map variables + String path = "/wordLists.json".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + + headerParams.put("auth_token", auth_token); + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (WordList) ApiInvoker.deserialize(response, "", WordList.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } + } + } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java index 7cc9da2c132..18d0f5e0df2 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java @@ -2,322 +2,338 @@ import io.swagger.client.ApiException; import io.swagger.client.ApiInvoker; - -import io.swagger.client.model.*; - -import java.util.*; - -import io.swagger.client.model.WordObject; import io.swagger.client.model.DefinitionSearchResults; -import io.swagger.client.model.WordSearchResults; +import io.swagger.client.model.WordObject; import io.swagger.client.model.WordOfTheDay; +import io.swagger.client.model.WordSearchResults; -import java.util.Map; import java.util.HashMap; -import java.io.File; +import java.util.Map; public class WordsApi { - String basePath = "https://api.wordnik.com/v4"; - ApiInvoker apiInvoker = ApiInvoker.getInstance(); - - public void addHeader(String key, String value) { - getInvoker().addDefaultHeader(key, value); - } - - public ApiInvoker getInvoker() { - return apiInvoker; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public String getBasePath() { - return basePath; - } - - - - public WordObject getRandomWord (String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/words.json/randomWord".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(hasDictionaryDef))) - queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef)); - if(!"null".equals(String.valueOf(includePartOfSpeech))) - queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); - if(!"null".equals(String.valueOf(excludePartOfSpeech))) - queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); - if(!"null".equals(String.valueOf(minCorpusCount))) - queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); - if(!"null".equals(String.valueOf(maxCorpusCount))) - queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); - if(!"null".equals(String.valueOf(minDictionaryCount))) - queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount)); - if(!"null".equals(String.valueOf(maxDictionaryCount))) - queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount)); - if(!"null".equals(String.valueOf(minLength))) - queryParams.put("minLength", String.valueOf(minLength)); - if(!"null".equals(String.valueOf(maxLength))) - queryParams.put("maxLength", String.valueOf(maxLength)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + String basePath = "https://api.wordnik.com/v4"; + ApiInvoker apiInvoker = ApiInvoker.getInstance(); + + public void addHeader(String key, String value) { + getInvoker().addDefaultHeader(key, value); + } + + public ApiInvoker getInvoker() { + return apiInvoker; + } + + public String getBasePath() { + return basePath; + } + + public void setBasePath(String basePath) { + this.basePath = basePath; + } + + public WordObject getRandomWord(String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/words.json/randomWord".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(hasDictionaryDef))) { + queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef)); + } + if (!"null".equals(String.valueOf(includePartOfSpeech))) { + queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); + } + if (!"null".equals(String.valueOf(excludePartOfSpeech))) { + queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); + } + if (!"null".equals(String.valueOf(minCorpusCount))) { + queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); + } + if (!"null".equals(String.valueOf(maxCorpusCount))) { + queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); + } + if (!"null".equals(String.valueOf(minDictionaryCount))) { + queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount)); + } + if (!"null".equals(String.valueOf(maxDictionaryCount))) { + queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount)); + } + if (!"null".equals(String.valueOf(minLength))) { + queryParams.put("minLength", String.valueOf(minLength)); + } + if (!"null".equals(String.valueOf(maxLength))) { + queryParams.put("maxLength", String.valueOf(maxLength)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public void getRandomWords (String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, String sortBy, String sortOrder, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/words.json/randomWords".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(hasDictionaryDef))) - queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef)); - if(!"null".equals(String.valueOf(includePartOfSpeech))) - queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); - if(!"null".equals(String.valueOf(excludePartOfSpeech))) - queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); - if(!"null".equals(String.valueOf(minCorpusCount))) - queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); - if(!"null".equals(String.valueOf(maxCorpusCount))) - queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); - if(!"null".equals(String.valueOf(minDictionaryCount))) - queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount)); - if(!"null".equals(String.valueOf(maxDictionaryCount))) - queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount)); - if(!"null".equals(String.valueOf(minLength))) - queryParams.put("minLength", String.valueOf(minLength)); - if(!"null".equals(String.valueOf(maxLength))) - queryParams.put("maxLength", String.valueOf(maxLength)); - if(!"null".equals(String.valueOf(sortBy))) - queryParams.put("sortBy", String.valueOf(sortBy)); - if(!"null".equals(String.valueOf(sortOrder))) - queryParams.put("sortOrder", String.valueOf(sortOrder)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return ; - } - else { - return ; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return ; - } - else { - throw ex; - } + + + public void getRandomWords(String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, String sortBy, String sortOrder, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/words.json/randomWords".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(hasDictionaryDef))) { + queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef)); + } + if (!"null".equals(String.valueOf(includePartOfSpeech))) { + queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); + } + if (!"null".equals(String.valueOf(excludePartOfSpeech))) { + queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); + } + if (!"null".equals(String.valueOf(minCorpusCount))) { + queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); + } + if (!"null".equals(String.valueOf(maxCorpusCount))) { + queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); + } + if (!"null".equals(String.valueOf(minDictionaryCount))) { + queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount)); + } + if (!"null".equals(String.valueOf(maxDictionaryCount))) { + queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount)); + } + if (!"null".equals(String.valueOf(minLength))) { + queryParams.put("minLength", String.valueOf(minLength)); + } + if (!"null".equals(String.valueOf(maxLength))) { + queryParams.put("maxLength", String.valueOf(maxLength)); + } + if (!"null".equals(String.valueOf(sortBy))) { + queryParams.put("sortBy", String.valueOf(sortBy)); + } + if (!"null".equals(String.valueOf(sortOrder))) { + queryParams.put("sortOrder", String.valueOf(sortOrder)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return; + } else { + return; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return; + } else { + throw ex; + } + } } - } - - - public DefinitionSearchResults reverseDictionary (String query, String findSenseForWord, String includeSourceDictionaries, String excludeSourceDictionaries, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minLength, Integer maxLength, String expandTerms, String includeTags, String sortBy, String sortOrder, String skip, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/words.json/reverseDictionary".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(query))) - queryParams.put("query", String.valueOf(query)); - if(!"null".equals(String.valueOf(findSenseForWord))) - queryParams.put("findSenseForWord", String.valueOf(findSenseForWord)); - if(!"null".equals(String.valueOf(includeSourceDictionaries))) - queryParams.put("includeSourceDictionaries", String.valueOf(includeSourceDictionaries)); - if(!"null".equals(String.valueOf(excludeSourceDictionaries))) - queryParams.put("excludeSourceDictionaries", String.valueOf(excludeSourceDictionaries)); - if(!"null".equals(String.valueOf(includePartOfSpeech))) - queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); - if(!"null".equals(String.valueOf(excludePartOfSpeech))) - queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); - if(!"null".equals(String.valueOf(minCorpusCount))) - queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); - if(!"null".equals(String.valueOf(maxCorpusCount))) - queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); - if(!"null".equals(String.valueOf(minLength))) - queryParams.put("minLength", String.valueOf(minLength)); - if(!"null".equals(String.valueOf(maxLength))) - queryParams.put("maxLength", String.valueOf(maxLength)); - if(!"null".equals(String.valueOf(expandTerms))) - queryParams.put("expandTerms", String.valueOf(expandTerms)); - if(!"null".equals(String.valueOf(includeTags))) - queryParams.put("includeTags", String.valueOf(includeTags)); - if(!"null".equals(String.valueOf(sortBy))) - queryParams.put("sortBy", String.valueOf(sortBy)); - if(!"null".equals(String.valueOf(sortOrder))) - queryParams.put("sortOrder", String.valueOf(sortOrder)); - if(!"null".equals(String.valueOf(skip))) - queryParams.put("skip", String.valueOf(skip)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (DefinitionSearchResults) ApiInvoker.deserialize(response, "", DefinitionSearchResults.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public DefinitionSearchResults reverseDictionary(String query, String findSenseForWord, String includeSourceDictionaries, String excludeSourceDictionaries, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minLength, Integer maxLength, String expandTerms, String includeTags, String sortBy, String sortOrder, String skip, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/words.json/reverseDictionary".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(query))) { + queryParams.put("query", String.valueOf(query)); + } + if (!"null".equals(String.valueOf(findSenseForWord))) { + queryParams.put("findSenseForWord", String.valueOf(findSenseForWord)); + } + if (!"null".equals(String.valueOf(includeSourceDictionaries))) { + queryParams.put("includeSourceDictionaries", String.valueOf(includeSourceDictionaries)); + } + if (!"null".equals(String.valueOf(excludeSourceDictionaries))) { + queryParams.put("excludeSourceDictionaries", String.valueOf(excludeSourceDictionaries)); + } + if (!"null".equals(String.valueOf(includePartOfSpeech))) { + queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); + } + if (!"null".equals(String.valueOf(excludePartOfSpeech))) { + queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); + } + if (!"null".equals(String.valueOf(minCorpusCount))) { + queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); + } + if (!"null".equals(String.valueOf(maxCorpusCount))) { + queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); + } + if (!"null".equals(String.valueOf(minLength))) { + queryParams.put("minLength", String.valueOf(minLength)); + } + if (!"null".equals(String.valueOf(maxLength))) { + queryParams.put("maxLength", String.valueOf(maxLength)); + } + if (!"null".equals(String.valueOf(expandTerms))) { + queryParams.put("expandTerms", String.valueOf(expandTerms)); + } + if (!"null".equals(String.valueOf(includeTags))) { + queryParams.put("includeTags", String.valueOf(includeTags)); + } + if (!"null".equals(String.valueOf(sortBy))) { + queryParams.put("sortBy", String.valueOf(sortBy)); + } + if (!"null".equals(String.valueOf(sortOrder))) { + queryParams.put("sortOrder", String.valueOf(sortOrder)); + } + if (!"null".equals(String.valueOf(skip))) { + queryParams.put("skip", String.valueOf(skip)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (DefinitionSearchResults) ApiInvoker.deserialize(response, "", DefinitionSearchResults.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public WordSearchResults searchWords (String query, String caseSensitive, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, Integer skip, Integer limit) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/words.json/search/{query}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "query" + "\\}", apiInvoker.escapeString(query.toString())); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(caseSensitive))) - queryParams.put("caseSensitive", String.valueOf(caseSensitive)); - if(!"null".equals(String.valueOf(includePartOfSpeech))) - queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); - if(!"null".equals(String.valueOf(excludePartOfSpeech))) - queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); - if(!"null".equals(String.valueOf(minCorpusCount))) - queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); - if(!"null".equals(String.valueOf(maxCorpusCount))) - queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); - if(!"null".equals(String.valueOf(minDictionaryCount))) - queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount)); - if(!"null".equals(String.valueOf(maxDictionaryCount))) - queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount)); - if(!"null".equals(String.valueOf(minLength))) - queryParams.put("minLength", String.valueOf(minLength)); - if(!"null".equals(String.valueOf(maxLength))) - queryParams.put("maxLength", String.valueOf(maxLength)); - if(!"null".equals(String.valueOf(skip))) - queryParams.put("skip", String.valueOf(skip)); - if(!"null".equals(String.valueOf(limit))) - queryParams.put("limit", String.valueOf(limit)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (WordSearchResults) ApiInvoker.deserialize(response, "", WordSearchResults.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public WordSearchResults searchWords(String query, String caseSensitive, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, Integer skip, Integer limit) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/words.json/search/{query}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "query" + "\\}", apiInvoker.escapeString(query.toString())); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(caseSensitive))) { + queryParams.put("caseSensitive", String.valueOf(caseSensitive)); + } + if (!"null".equals(String.valueOf(includePartOfSpeech))) { + queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech)); + } + if (!"null".equals(String.valueOf(excludePartOfSpeech))) { + queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech)); + } + if (!"null".equals(String.valueOf(minCorpusCount))) { + queryParams.put("minCorpusCount", String.valueOf(minCorpusCount)); + } + if (!"null".equals(String.valueOf(maxCorpusCount))) { + queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount)); + } + if (!"null".equals(String.valueOf(minDictionaryCount))) { + queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount)); + } + if (!"null".equals(String.valueOf(maxDictionaryCount))) { + queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount)); + } + if (!"null".equals(String.valueOf(minLength))) { + queryParams.put("minLength", String.valueOf(minLength)); + } + if (!"null".equals(String.valueOf(maxLength))) { + queryParams.put("maxLength", String.valueOf(maxLength)); + } + if (!"null".equals(String.valueOf(skip))) { + queryParams.put("skip", String.valueOf(skip)); + } + if (!"null".equals(String.valueOf(limit))) { + queryParams.put("limit", String.valueOf(limit)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (WordSearchResults) ApiInvoker.deserialize(response, "", WordSearchResults.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - - - public WordOfTheDay getWordOfTheDay (String date) throws ApiException { - Object postBody = null; - - - - // create path and map variables - String path = "/words.json/wordOfTheDay".replaceAll("\\{format\\}","json"); - - // query params - Map queryParams = new HashMap(); - Map headerParams = new HashMap(); - - if(!"null".equals(String.valueOf(date))) - queryParams.put("date", String.valueOf(date)); - - - - - String contentType = "application/json"; - - try { - String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); - if(response != null){ - return (WordOfTheDay) ApiInvoker.deserialize(response, "", WordOfTheDay.class); - } - else { - return null; - } - } catch (ApiException ex) { - if(ex.getCode() == 404) { - return null; - } - else { - throw ex; - } + + + public WordOfTheDay getWordOfTheDay(String date) throws ApiException { + Object postBody = null; + + + // create path and map variables + String path = "/words.json/wordOfTheDay".replaceAll("\\{format\\}", "json"); + + // query params + Map queryParams = new HashMap(); + Map headerParams = new HashMap(); + + if (!"null".equals(String.valueOf(date))) { + queryParams.put("date", String.valueOf(date)); + } + + + String contentType = "application/json"; + + try { + String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType); + if (response != null) { + return (WordOfTheDay) ApiInvoker.deserialize(response, "", WordOfTheDay.class); + } else { + return null; + } + } catch (ApiException ex) { + if (ex.getCode() == 404) { + return null; + } else { + throw ex; + } + } } - } - + } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java index 5345aaeb0cc..60388200618 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java @@ -1,106 +1,111 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class ApiTokenStatus { - - private Boolean valid = null; - private String token = null; - private Long resetsInMillis = null; - private Long remainingCalls = null; - private Long expiresInMillis = null; - private Long totalRequests = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("valid") - public Boolean getValid() { - return valid; - } - public void setValid(Boolean valid) { - this.valid = valid; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("token") - public String getToken() { - return token; - } - public void setToken(String token) { - this.token = token; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("resetsInMillis") - public Long getResetsInMillis() { - return resetsInMillis; - } - public void setResetsInMillis(Long resetsInMillis) { - this.resetsInMillis = resetsInMillis; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("remainingCalls") - public Long getRemainingCalls() { - return remainingCalls; - } - public void setRemainingCalls(Long remainingCalls) { - this.remainingCalls = remainingCalls; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("expiresInMillis") - public Long getExpiresInMillis() { - return expiresInMillis; - } - public void setExpiresInMillis(Long expiresInMillis) { - this.expiresInMillis = expiresInMillis; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("totalRequests") - public Long getTotalRequests() { - return totalRequests; - } - public void setTotalRequests(Long totalRequests) { - this.totalRequests = totalRequests; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ApiTokenStatus {\n"); - - sb.append(" valid: ").append(valid).append("\n"); - sb.append(" token: ").append(token).append("\n"); - sb.append(" resetsInMillis: ").append(resetsInMillis).append("\n"); - sb.append(" remainingCalls: ").append(remainingCalls).append("\n"); - sb.append(" expiresInMillis: ").append(expiresInMillis).append("\n"); - sb.append(" totalRequests: ").append(totalRequests).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class ApiTokenStatus { + + private Boolean valid = null; + private String token = null; + private Long resetsInMillis = null; + private Long remainingCalls = null; + private Long expiresInMillis = null; + private Long totalRequests = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("valid") + public Boolean getValid() { + return valid; + } + + public void setValid(Boolean valid) { + this.valid = valid; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("token") + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("resetsInMillis") + public Long getResetsInMillis() { + return resetsInMillis; + } + + public void setResetsInMillis(Long resetsInMillis) { + this.resetsInMillis = resetsInMillis; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("remainingCalls") + public Long getRemainingCalls() { + return remainingCalls; + } + + public void setRemainingCalls(Long remainingCalls) { + this.remainingCalls = remainingCalls; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("expiresInMillis") + public Long getExpiresInMillis() { + return expiresInMillis; + } + + public void setExpiresInMillis(Long expiresInMillis) { + this.expiresInMillis = expiresInMillis; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("totalRequests") + public Long getTotalRequests() { + return totalRequests; + } + + public void setTotalRequests(Long totalRequests) { + this.totalRequests = totalRequests; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ApiTokenStatus {\n"); + + sb.append(" valid: ").append(valid).append("\n"); + sb.append(" token: ").append(token).append("\n"); + sb.append(" resetsInMillis: ").append(resetsInMillis).append("\n"); + sb.append(" remainingCalls: ").append(remainingCalls).append("\n"); + sb.append(" expiresInMillis: ").append(expiresInMillis).append("\n"); + sb.append(" totalRequests: ").append(totalRequests).append("\n"); + sb.append("}\n"); + return sb.toString(); + } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java index 372ccfed7ed..7c982c40a22 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java @@ -1,219 +1,232 @@ package io.swagger.client.model; -import java.util.Date; - -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; + +import java.util.Date; @ApiModel(description = "") -public class AudioFile { - - private String attributionUrl = null; - private Integer commentCount = null; - private Integer voteCount = null; - private String fileUrl = null; - private String audioType = null; - private Long id = null; - private Double duration = null; - private String attributionText = null; - private String createdBy = null; - private String description = null; - private Date createdAt = null; - private Float voteWeightedAverage = null; - private Float voteAverage = null; - private String word = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("attributionUrl") - public String getAttributionUrl() { - return attributionUrl; - } - public void setAttributionUrl(String attributionUrl) { - this.attributionUrl = attributionUrl; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("commentCount") - public Integer getCommentCount() { - return commentCount; - } - public void setCommentCount(Integer commentCount) { - this.commentCount = commentCount; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("voteCount") - public Integer getVoteCount() { - return voteCount; - } - public void setVoteCount(Integer voteCount) { - this.voteCount = voteCount; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("fileUrl") - public String getFileUrl() { - return fileUrl; - } - public void setFileUrl(String fileUrl) { - this.fileUrl = fileUrl; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("audioType") - public String getAudioType() { - return audioType; - } - public void setAudioType(String audioType) { - this.audioType = audioType; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("duration") - public Double getDuration() { - return duration; - } - public void setDuration(Double duration) { - this.duration = duration; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("attributionText") - public String getAttributionText() { - return attributionText; - } - public void setAttributionText(String attributionText) { - this.attributionText = attributionText; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("createdBy") - public String getCreatedBy() { - return createdBy; - } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("description") - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("createdAt") - public Date getCreatedAt() { - return createdAt; - } - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("voteWeightedAverage") - public Float getVoteWeightedAverage() { - return voteWeightedAverage; - } - public void setVoteWeightedAverage(Float voteWeightedAverage) { - this.voteWeightedAverage = voteWeightedAverage; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("voteAverage") - public Float getVoteAverage() { - return voteAverage; - } - public void setVoteAverage(Float voteAverage) { - this.voteAverage = voteAverage; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("word") - public String getWord() { - return word; - } - public void setWord(String word) { - this.word = word; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AudioFile {\n"); - - sb.append(" attributionUrl: ").append(attributionUrl).append("\n"); - sb.append(" commentCount: ").append(commentCount).append("\n"); - sb.append(" voteCount: ").append(voteCount).append("\n"); - sb.append(" fileUrl: ").append(fileUrl).append("\n"); - sb.append(" audioType: ").append(audioType).append("\n"); - sb.append(" id: ").append(id).append("\n"); - sb.append(" duration: ").append(duration).append("\n"); - sb.append(" attributionText: ").append(attributionText).append("\n"); - sb.append(" createdBy: ").append(createdBy).append("\n"); - sb.append(" description: ").append(description).append("\n"); - sb.append(" createdAt: ").append(createdAt).append("\n"); - sb.append(" voteWeightedAverage: ").append(voteWeightedAverage).append("\n"); - sb.append(" voteAverage: ").append(voteAverage).append("\n"); - sb.append(" word: ").append(word).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class AudioFile { + + private String attributionUrl = null; + private Integer commentCount = null; + private Integer voteCount = null; + private String fileUrl = null; + private String audioType = null; + private Long id = null; + private Double duration = null; + private String attributionText = null; + private String createdBy = null; + private String description = null; + private Date createdAt = null; + private Float voteWeightedAverage = null; + private Float voteAverage = null; + private String word = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("attributionUrl") + public String getAttributionUrl() { + return attributionUrl; + } + + public void setAttributionUrl(String attributionUrl) { + this.attributionUrl = attributionUrl; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("commentCount") + public Integer getCommentCount() { + return commentCount; + } + + public void setCommentCount(Integer commentCount) { + this.commentCount = commentCount; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("voteCount") + public Integer getVoteCount() { + return voteCount; + } + + public void setVoteCount(Integer voteCount) { + this.voteCount = voteCount; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("fileUrl") + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("audioType") + public String getAudioType() { + return audioType; + } + + public void setAudioType(String audioType) { + this.audioType = audioType; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("duration") + public Double getDuration() { + return duration; + } + + public void setDuration(Double duration) { + this.duration = duration; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("attributionText") + public String getAttributionText() { + return attributionText; + } + + public void setAttributionText(String attributionText) { + this.attributionText = attributionText; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("createdBy") + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("description") + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("createdAt") + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("voteWeightedAverage") + public Float getVoteWeightedAverage() { + return voteWeightedAverage; + } + + public void setVoteWeightedAverage(Float voteWeightedAverage) { + this.voteWeightedAverage = voteWeightedAverage; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("voteAverage") + public Float getVoteAverage() { + return voteAverage; + } + + public void setVoteAverage(Float voteAverage) { + this.voteAverage = voteAverage; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("word") + public String getWord() { + return word; + } + + public void setWord(String word) { + this.word = word; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AudioFile {\n"); + + sb.append(" attributionUrl: ").append(attributionUrl).append("\n"); + sb.append(" commentCount: ").append(commentCount).append("\n"); + sb.append(" voteCount: ").append(voteCount).append("\n"); + sb.append(" fileUrl: ").append(fileUrl).append("\n"); + sb.append(" audioType: ").append(audioType).append("\n"); + sb.append(" id: ").append(id).append("\n"); + sb.append(" duration: ").append(duration).append("\n"); + sb.append(" attributionText: ").append(attributionText).append("\n"); + sb.append(" createdBy: ").append(createdBy).append("\n"); + sb.append(" description: ").append(description).append("\n"); + sb.append(" createdAt: ").append(createdAt).append("\n"); + sb.append(" voteWeightedAverage: ").append(voteWeightedAverage).append("\n"); + sb.append(" voteAverage: ").append(voteAverage).append("\n"); + sb.append(" word: ").append(word).append("\n"); + sb.append("}\n"); + return sb.toString(); + } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java index c8ce06c0efd..6456cb53904 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java @@ -1,50 +1,51 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class AudioType { - - private Integer id = null; - private String name = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("id") - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(required = false, 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 AudioType {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class AudioType { + + private Integer id = null; + private String name = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(required = false, 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 AudioType {\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/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java index d047965b23f..f9d59b3a467 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java @@ -1,64 +1,66 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class AuthenticationToken { - - private String token = null; - private Long userId = null; - private String userSignature = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("token") - public String getToken() { - return token; - } - public void setToken(String token) { - this.token = token; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("userId") - public Long getUserId() { - return userId; - } - public void setUserId(Long userId) { - this.userId = userId; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("userSignature") - public String getUserSignature() { - return userSignature; - } - public void setUserSignature(String userSignature) { - this.userSignature = userSignature; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AuthenticationToken {\n"); - - sb.append(" token: ").append(token).append("\n"); - sb.append(" userId: ").append(userId).append("\n"); - sb.append(" userSignature: ").append(userSignature).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class AuthenticationToken { + + private String token = null; + private Long userId = null; + private String userSignature = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("token") + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("userId") + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("userSignature") + public String getUserSignature() { + return userSignature; + } + + public void setUserSignature(String userSignature) { + this.userSignature = userSignature; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AuthenticationToken {\n"); + + sb.append(" token: ").append(token).append("\n"); + sb.append(" userId: ").append(userId).append("\n"); + sb.append(" userSignature: ").append(userSignature).append("\n"); + sb.append("}\n"); + return sb.toString(); + } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java index d864b73c02e..0465c2816cc 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java @@ -1,92 +1,96 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class Bigram { - - private Long count = null; - private String gram2 = null; - private String gram1 = null; - private Double wlmi = null; - private Double mi = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("count") - public Long getCount() { - return count; - } - public void setCount(Long count) { - this.count = count; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("gram2") - public String getGram2() { - return gram2; - } - public void setGram2(String gram2) { - this.gram2 = gram2; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("gram1") - public String getGram1() { - return gram1; - } - public void setGram1(String gram1) { - this.gram1 = gram1; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("wlmi") - public Double getWlmi() { - return wlmi; - } - public void setWlmi(Double wlmi) { - this.wlmi = wlmi; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("mi") - public Double getMi() { - return mi; - } - public void setMi(Double mi) { - this.mi = mi; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Bigram {\n"); - - sb.append(" count: ").append(count).append("\n"); - sb.append(" gram2: ").append(gram2).append("\n"); - sb.append(" gram1: ").append(gram1).append("\n"); - sb.append(" wlmi: ").append(wlmi).append("\n"); - sb.append(" mi: ").append(mi).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class Bigram { + + private Long count = null; + private String gram2 = null; + private String gram1 = null; + private Double wlmi = null; + private Double mi = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("count") + public Long getCount() { + return count; + } + + public void setCount(Long count) { + this.count = count; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("gram2") + public String getGram2() { + return gram2; + } + + public void setGram2(String gram2) { + this.gram2 = gram2; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("gram1") + public String getGram1() { + return gram1; + } + + public void setGram1(String gram1) { + this.gram1 = gram1; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("wlmi") + public Double getWlmi() { + return wlmi; + } + + public void setWlmi(Double wlmi) { + this.wlmi = wlmi; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("mi") + public Double getMi() { + return mi; + } + + public void setMi(Double mi) { + this.mi = mi; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Bigram {\n"); + + sb.append(" count: ").append(count).append("\n"); + sb.append(" gram2: ").append(gram2).append("\n"); + sb.append(" gram1: ").append(gram1).append("\n"); + sb.append(" wlmi: ").append(wlmi).append("\n"); + sb.append(" mi: ").append(mi).append("\n"); + sb.append("}\n"); + return sb.toString(); + } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java index 3a7a84f89bb..5ceadd985e2 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java @@ -1,50 +1,51 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class Category { - - private Long id = null; - private String name = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("id") - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(required = false, 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(); - } +public class Category { + + private Long id = null; + private String name = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("id") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(required = false, 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/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java index f696895e6b5..7f636dc7e02 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java @@ -1,50 +1,51 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class Citation { - - private String cite = null; - private String source = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("cite") - public String getCite() { - return cite; - } - public void setCite(String cite) { - this.cite = cite; - } - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("source") - public String getSource() { - return source; - } - public void setSource(String source) { - this.source = source; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Citation {\n"); - - sb.append(" cite: ").append(cite).append("\n"); - sb.append(" source: ").append(source).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class Citation { + + private String cite = null; + private String source = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("cite") + public String getCite() { + return cite; + } + + public void setCite(String cite) { + this.cite = cite; + } + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("source") + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Citation {\n"); + + sb.append(" cite: ").append(cite).append("\n"); + sb.append(" source: ").append(source).append("\n"); + sb.append("}\n"); + return sb.toString(); + } } diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java index a069dad1a9f..9b56335411d 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java @@ -1,50 +1,51 @@ package io.swagger.client.model; -import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; @ApiModel(description = "") -public class ContentProvider { - - private Integer id = null; - private String name = null; - - - /** - **/ - @ApiModelProperty(required = false, value = "") - @JsonProperty("id") - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - - - /** - **/ - @ApiModelProperty(required = false, 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 ContentProvider {\n"); - - sb.append(" id: ").append(id).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append("}\n"); - return sb.toString(); - } +public class ContentProvider { + + private Integer id = null; + private String name = null; + + + /** + **/ + @ApiModelProperty(required = false, value = "") + @JsonProperty("id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + + /** + **/ + @ApiModelProperty(required = false, 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 ContentProvider {\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/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java index e2e799d8b56..ea0e6463ad7 100644 --- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java +++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java @@ -1,253 +1,269 @@ package io.swagger.client.model; -import io.swagger.client.model.Related; -import io.swagger.client.model.Note; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.wordnik.swagger.annotations.*; +import io.swagger.client.model.Citation; +import io.swagger.client.model.ExampleUsage; import io.swagger.client.model.Label; +import io.swagger.client.model.Note; +import io.swagger.client.model.Related; import io.swagger.client.model.TextPron; -import io.swagger.client.model.ExampleUsage; -import java.util.*; -import io.swagger.client.model.Citation; -import com.wordnik.swagger.annotations.*; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; @ApiModel(description = "") -public class Definition { - - private String extendedText = null; - private String text = null; - private String sourceDictionary = null; - private List citations = new ArrayList() ; - private List