diff --git a/.travis.yml b/.travis.yml index 361733f2817..5694414f3ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,3 +99,9 @@ script: env: - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli + +after_success: + - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then + mvn clean deploy --settings .travis/settings.xml; + fi; + diff --git a/.travis/settings.xml b/.travis/settings.xml new file mode 100644 index 00000000000..7fd9d3e7014 --- /dev/null +++ b/.travis/settings.xml @@ -0,0 +1,18 @@ + + + + + + + + + sonatype-nexus-snapshots + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + + + + diff --git a/bin/apache2-petstore-config.sh b/bin/apache2-petstore-config.sh new file mode 100644 index 00000000000..e0c04ba2cc5 --- /dev/null +++ b/bin/apache2-petstore-config.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +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 -l apache2 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/config/petstore/apache2" + +java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/apache2-petstore-config.bat b/bin/windows/apache2-petstore-config.bat new file mode 100644 index 00000000000..5e61f95586d --- /dev/null +++ b/bin/windows/apache2-petstore-config.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l apache2 -o samples\config\petstore\apache2\ + +java %JAVA_OPTS% -jar %executable% %ags% 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 index 8d65290e8f8..5d348b946b6 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; public enum CodegenType { - CLIENT, SERVER, DOCUMENTATION, OTHER; + CLIENT, SERVER, DOCUMENTATION, CONFIG, OTHER; private static Map names = new HashMap(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 1e030af9bf1..35688ec366c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1123,8 +1123,6 @@ public class DefaultCodegen { String datatype = null; if (p instanceof StringProperty && "number".equals(p.getFormat())) { datatype = "BigDecimal"; - } else if (p instanceof StringProperty) { - datatype = "string"; } else if (p instanceof ByteArrayProperty) { datatype = "ByteArray"; } else if (p instanceof BinaryProperty) { @@ -1163,6 +1161,8 @@ public class DefaultCodegen { datatype = "Object"; LOGGER.error(e.getMessage(), e); } + } else if (p instanceof StringProperty) { + datatype = "string"; } else { if (p != null) { datatype = p.getType(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java new file mode 100644 index 00000000000..0027e6920cf --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java @@ -0,0 +1,106 @@ +package io.swagger.codegen.languages; + +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 io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; + +public class Apache2ConfigCodegen extends DefaultCodegen implements CodegenConfig { + public static final String USER_INFO_PATH = "userInfoPath"; + protected String userInfoPath = "/var/www/html/"; + + @Override + public CodegenType getTag() { + return CodegenType.CONFIG; + } + + @Override + public String getName() { + return "apache2"; + } + + @Override + public String getHelp() { + return "Generates an Apache2 Config file with the permissions"; + } + + public Apache2ConfigCodegen() { + super(); + apiTemplateFiles.put("apache-config.mustache", ".conf"); + + embeddedTemplateDir = templateDir = "apache2"; + + cliOptions.add(new CliOption(USER_INFO_PATH, "Path to the user and group files")); + } + + + @Override + public void processOpts() { + if (additionalProperties.containsKey(USER_INFO_PATH)) { + userInfoPath = additionalProperties.get(USER_INFO_PATH).toString(); + } + } + + @Override + public String escapeQuotationMark(String input) { + // remove " to avoid code injection + return input.replace("\"", ""); + } + + @Override + public String escapeUnsafeCharacters(String input) { + return input.replace("*/", "*_/").replace("/*", "/_*"); + } + + @SuppressWarnings("unchecked") + @Override + public Map postProcessOperations(Map objs) { + Map operations = (Map) objs.get("operations"); + List operationList = (List) operations.get("operation"); + List newOpList = new ArrayList(); + for (CodegenOperation op : operationList) { + String path = new String(op.path); + + String[] items = path.split("/", -1); + List splitPath = new ArrayList(); + for (String item: items) { + if (item.matches("^\\{(.*)\\}$")) { + item = "*"; + } + splitPath.add(item); + } + op.path = String.join("/", splitPath); + op.vendorExtensions.put("x-codegen-userInfoPath", userInfoPath); + boolean foundInNewList = false; + for (CodegenOperation op1 : newOpList) { + if (!foundInNewList) { + if (op1.path.equals(op.path)) { + foundInNewList = true; + List currentOtherMethodList = (List) op1.vendorExtensions.get("x-codegen-otherMethods"); + if (currentOtherMethodList == null) { + currentOtherMethodList = new ArrayList(); + } + op.operationIdCamelCase = op1.operationIdCamelCase; + currentOtherMethodList.add(op); + op1.vendorExtensions.put("x-codegen-otherMethods", currentOtherMethodList); + } + } + } + if (!foundInNewList) { + newOpList.add(op); + } + } + operations.put("operation", newOpList); + return objs; + } +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache index c7d253ad685..32cb2e4302e 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache @@ -263,7 +263,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.4.0 2.1.0 2.8.7 diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache index 1cc0f3f440b..15fc98b2cb6 100644 --- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache @@ -119,7 +119,7 @@ 1.0.0 - 1.0.12 + 1.0.14 9.2.9.v20150224 1.0.1 4.8.2 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache index 328511bdf55..6f5a46a6f7d 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -178,7 +178,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 5a2ed782474..e7e0e19e569 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -229,7 +229,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index 4ac349ef1f0..bf58a208a1f 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -191,7 +191,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 1.19.1 2.8.7 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index a28823d5858..b0f5c23bb01 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -188,7 +188,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 2.8.7 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index 7b7107f197a..3f855bd2eda 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -174,7 +174,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache index ac1215cff2d..6111e483b20 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -164,7 +164,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache index 2aa9f4e809c..3a3dce18f25 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache @@ -9,7 +9,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 org.springframework.boot diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig index 5c1f059ff0c..f5cc7a52169 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -1,5 +1,6 @@ io.swagger.codegen.languages.AkkaScalaClientCodegen io.swagger.codegen.languages.AndroidClientCodegen +io.swagger.codegen.languages.Apache2ConfigCodegen io.swagger.codegen.languages.ApexClientCodegen io.swagger.codegen.languages.AspNetCoreServerCodegen io.swagger.codegen.languages.AsyncScalaClientCodegen diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache index 743aca536a8..2c890843eac 100644 --- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache @@ -75,7 +75,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 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 8e2790095b1..3a5c4d0e036 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache @@ -216,7 +216,7 @@ 2.3.9 1.2 2.2 - 1.5.12 + 1.5.15 1.0.0 4.8.1 diff --git a/modules/swagger-codegen/src/main/resources/android/pom.mustache b/modules/swagger-codegen/src/main/resources/android/pom.mustache index c4c4e3a5b9d..a7bb0ad4b30 100644 --- a/modules/swagger-codegen/src/main/resources/android/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/android/pom.mustache @@ -145,7 +145,7 @@ - 1.5.12 + 1.5.15 2.3.1 4.8.1 1.0.0 diff --git a/modules/swagger-codegen/src/main/resources/apache2/apache-config.mustache b/modules/swagger-codegen/src/main/resources/apache2/apache-config.mustache new file mode 100644 index 00000000000..92fad06e97d --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/apache2/apache-config.mustache @@ -0,0 +1,44 @@ +{{#operations}} +{{#operation}} + + {{>authConf}} + + Require valid-user + +{{#hasAuthMethods}} +{{#authMethods}} + {{#isOAuth}} + + {{#scopes}} + Require group {{scope}} + {{/scopes}} + + {{/isOAuth}} +{{/authMethods}} +{{/hasAuthMethods}} +{{^hasAuthMethods}} + + Require valid-user + +{{/hasAuthMethods}} +{{#vendorExtensions.x-codegen-otherMethods}} +{{#hasAuthMethods}} +{{#authMethods}} + {{#isOAuth}} + + {{#scopes}} + Require group {{scope}} + {{/scopes}} + + {{/isOAuth}} +{{/authMethods}} +{{/hasAuthMethods}} +{{^hasAuthMethods}} + + Require valid-user + +{{/hasAuthMethods}} +{{/vendorExtensions.x-codegen-otherMethods}} + +{{/operation}} +{{/operations}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/apache2/authConf.mustache b/modules/swagger-codegen/src/main/resources/apache2/authConf.mustache new file mode 100644 index 00000000000..27306808878 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/apache2/authConf.mustache @@ -0,0 +1,5 @@ +AuthBasicProvider file + AuthUserFile "{{vendorExtensions.x-codegen-userInfoPath}}htpwd" + AuthGroupFile "{{vendorExtensions.x-codegen-userInfoPath}}groups" + AuthType basic + AuthName "api" \ 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 d459d29a975..679d345347c 100644 --- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache @@ -220,7 +220,7 @@ 1.2 2.2 1.19 - 1.5.12 + 1.5.15 1.0.5 1.0.0 2.4.2 diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache index 46e03f00338..0e534b1e25d 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache @@ -334,6 +334,10 @@ export class {{classname}} { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: {{classname}}ApiKeys, value: string) { this.authentications[{{classname}}ApiKeys[key]].apiKey = value; } diff --git a/pom.xml b/pom.xml index a5b71298c67..fa3de66f46c 100644 --- a/pom.xml +++ b/pom.xml @@ -888,10 +888,10 @@ - 1.0.29 + 1.0.30 2.11.1 3.3.0 - 1.5.12 + 1.5.15 2.4 1.2 4.8.1 diff --git a/pom.xml.circleci b/pom.xml.circleci index 1091befa94c..47d656d1ccf 100644 --- a/pom.xml.circleci +++ b/pom.xml.circleci @@ -900,7 +900,7 @@ 1.0.28 2.11.1 3.3.0 - 1.5.12 + 1.5.15 2.4 1.2 4.8.1 diff --git a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml index 9ab87a8691c..dbd7942c973 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml +++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml @@ -206,7 +206,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 2.7.5 2.6.2 2.9.3 diff --git a/samples/client/petstore-security-test/scala/pom.xml b/samples/client/petstore-security-test/scala/pom.xml index a54aac0067d..53980f82fc1 100644 --- a/samples/client/petstore-security-test/scala/pom.xml +++ b/samples/client/petstore-security-test/scala/pom.xml @@ -215,7 +215,7 @@ 1.2 2.2 1.19 - 1.5.12 + 1.5.15 1.0.5 1.0.0 2.4.2 diff --git a/samples/client/petstore-security-test/typescript-node/api.ts b/samples/client/petstore-security-test/typescript-node/api.ts index e1474ccfad7..47fb8499ec1 100644 --- a/samples/client/petstore-security-test/typescript-node/api.ts +++ b/samples/client/petstore-security-test/typescript-node/api.ts @@ -257,6 +257,10 @@ export class FakeApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: FakeApiApiKeys, value: string) { this.authentications[FakeApiApiKeys[key]].apiKey = value; } diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index 38d1f45025b..406d9d6ea73 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -216,7 +216,7 @@ 2.3.9 1.2 2.2 - 1.5.12 + 1.5.15 1.0.0 4.8.1 diff --git a/samples/client/petstore/android/httpclient/pom.xml b/samples/client/petstore/android/httpclient/pom.xml index 75ef31f534d..caa541789be 100644 --- a/samples/client/petstore/android/httpclient/pom.xml +++ b/samples/client/petstore/android/httpclient/pom.xml @@ -145,7 +145,7 @@ - 1.5.12 + 1.5.15 2.3.1 4.8.1 1.0.0 diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index d21f1775565..c40bf36b6b3 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -247,7 +247,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.4.0 2.1.0 2.8.7 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index 4398ea01e8f..11737e1547a 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -184,7 +184,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/client/petstore/jaxrs-cxf/pom.xml b/samples/client/petstore/jaxrs-cxf/pom.xml index a530a3e6fb2..a61e8918261 100644 --- a/samples/client/petstore/jaxrs-cxf/pom.xml +++ b/samples/client/petstore/jaxrs-cxf/pom.xml @@ -162,7 +162,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index 02c83f264df..2ad1f31df4e 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -220,7 +220,7 @@ 1.2 2.2 1.19 - 1.5.12 + 1.5.15 1.0.5 1.0.0 2.4.2 diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index 80f9232eed3..f8763abcd83 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -9,7 +9,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 org.springframework.boot diff --git a/samples/client/petstore/typescript-node/default/api.ts b/samples/client/petstore/typescript-node/default/api.ts index a88f75abff6..89b6cfb6421 100644 --- a/samples/client/petstore/typescript-node/default/api.ts +++ b/samples/client/petstore/typescript-node/default/api.ts @@ -462,6 +462,10 @@ export class PetApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: PetApiApiKeys, value: string) { this.authentications[PetApiApiKeys[key]].apiKey = value; } @@ -964,6 +968,10 @@ export class StoreApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: StoreApiApiKeys, value: string) { this.authentications[StoreApiApiKeys[key]].apiKey = value; } @@ -1217,6 +1225,10 @@ export class UserApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: UserApiApiKeys, value: string) { this.authentications[UserApiApiKeys[key]].apiKey = value; } diff --git a/samples/client/petstore/typescript-node/npm/api.ts b/samples/client/petstore/typescript-node/npm/api.ts index a88f75abff6..89b6cfb6421 100644 --- a/samples/client/petstore/typescript-node/npm/api.ts +++ b/samples/client/petstore/typescript-node/npm/api.ts @@ -462,6 +462,10 @@ export class PetApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: PetApiApiKeys, value: string) { this.authentications[PetApiApiKeys[key]].apiKey = value; } @@ -964,6 +968,10 @@ export class StoreApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: StoreApiApiKeys, value: string) { this.authentications[StoreApiApiKeys[key]].apiKey = value; } @@ -1217,6 +1225,10 @@ export class UserApi { return this._basePath; } + public setDefaultAuthentication(auth: Authentication) { + this.authentications.default = auth; + } + public setApiKey(key: UserApiApiKeys, value: string) { this.authentications[UserApiApiKeys[key]].apiKey = value; } diff --git a/samples/config/petstore/apache2/.swagger-codegen-ignore b/samples/config/petstore/apache2/.swagger-codegen-ignore new file mode 100644 index 00000000000..c5fa491b4c5 --- /dev/null +++ b/samples/config/petstore/apache2/.swagger-codegen-ignore @@ -0,0 +1,23 @@ +# Swagger Codegen Ignore +# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/config/petstore/apache2/.swagger-codegen/VERSION b/samples/config/petstore/apache2/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/config/petstore/apache2/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/config/petstore/apache2/PetApi.conf b/samples/config/petstore/apache2/PetApi.conf new file mode 100644 index 00000000000..c92843e2610 --- /dev/null +++ b/samples/config/petstore/apache2/PetApi.conf @@ -0,0 +1,78 @@ + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require group write:pets + Require group read:pets + + + Require group write:pets + Require group read:pets + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require group write:pets + Require group read:pets + + + Require group write:pets + Require group read:pets + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require group write:pets + Require group read:pets + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require group write:pets + Require group read:pets + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require group write:pets + Require group read:pets + + diff --git a/samples/config/petstore/apache2/StoreApi.conf b/samples/config/petstore/apache2/StoreApi.conf new file mode 100644 index 00000000000..f0fb742f55a --- /dev/null +++ b/samples/config/petstore/apache2/StoreApi.conf @@ -0,0 +1,39 @@ + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + diff --git a/samples/config/petstore/apache2/UserApi.conf b/samples/config/petstore/apache2/UserApi.conf new file mode 100644 index 00000000000..b01bb509728 --- /dev/null +++ b/samples/config/petstore/apache2/UserApi.conf @@ -0,0 +1,84 @@ + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + + Require valid-user + + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + + + AuthBasicProvider file + AuthUserFile "/var/www/html/htpwd" + AuthGroupFile "/var/www/html/groups" + AuthType basic + AuthName "api" + + Require valid-user + + + Require valid-user + + diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml index 2fff1695b88..c0ff1a42251 100644 --- a/samples/server/petstore/java-inflector/pom.xml +++ b/samples/server/petstore/java-inflector/pom.xml @@ -119,7 +119,11 @@ 1.0.0 +<<<<<<< HEAD 1.0.12 +======= + 1.0.14 +>>>>>>> origin/master 9.2.9.v20150224 1.0.1 4.8.2 diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index b1145335c66..511883af0bd 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -92,7 +92,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 999c3123463..aad54511529 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -184,7 +184,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index 5a1e46c3fe4..0155af16b22 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -163,7 +163,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index 762c0ccf7b9..a760e1662ea 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -158,7 +158,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index feaca47dd95..b1516889769 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -189,7 +189,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 1.19.1 2.8.7 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 39125b0a9b2..287ab883220 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -173,7 +173,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 2.8.7