forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/master' into 2.3.0
This commit is contained in:
commit
e7561a11f4
@ -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;
|
||||
|
||||
|
18
.travis/settings.xml
Normal file
18
.travis/settings.xml
Normal file
@ -0,0 +1,18 @@
|
||||
<settings>
|
||||
<localRepository/>
|
||||
<interactiveMode/>
|
||||
<usePluginRegistry/>
|
||||
<offline/>
|
||||
<pluginGroups/>
|
||||
<servers>
|
||||
<server>
|
||||
<id>sonatype-nexus-snapshots</id>
|
||||
<username>${env.SONATYPE_USERNAME}</username>
|
||||
<password>${env.SONATYPE_PASSWORD}</password>
|
||||
</server>
|
||||
</servers>
|
||||
<mirrors/>
|
||||
<proxies/>
|
||||
<profiles/>
|
||||
<activeProfiles/>
|
||||
</settings>
|
31
bin/apache2-petstore-config.sh
Normal file
31
bin/apache2-petstore-config.sh
Normal file
@ -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
|
10
bin/windows/apache2-petstore-config.bat
Normal file
10
bin/windows/apache2-petstore-config.bat
Normal file
@ -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%
|
@ -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<String, CodegenType> names = new HashMap<String, CodegenType>();
|
||||
|
||||
|
@ -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();
|
||||
|
@ -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<String, Object> postProcessOperations(Map<String, Object> objs) {
|
||||
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
|
||||
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
|
||||
List<CodegenOperation> newOpList = new ArrayList<CodegenOperation>();
|
||||
for (CodegenOperation op : operationList) {
|
||||
String path = new String(op.path);
|
||||
|
||||
String[] items = path.split("/", -1);
|
||||
List<String> splitPath = new ArrayList<String>();
|
||||
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<CodegenOperation> currentOtherMethodList = (List<CodegenOperation>) op1.vendorExtensions.get("x-codegen-otherMethods");
|
||||
if (currentOtherMethodList == null) {
|
||||
currentOtherMethodList = new ArrayList<CodegenOperation>();
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
@ -263,7 +263,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<feign-version>9.4.0</feign-version>
|
||||
<feign-form-version>2.1.0</feign-form-version>
|
||||
<jackson-version>2.8.7</jackson-version>
|
||||
|
@ -119,7 +119,7 @@
|
||||
</repositories>
|
||||
<properties>
|
||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||
<swagger-inflector-version>1.0.12</swagger-inflector-version>
|
||||
<swagger-inflector-version>1.0.14</swagger-inflector-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<logback-version>1.0.1</logback-version>
|
||||
<junit-version>4.8.2</junit-version>
|
||||
|
@ -178,7 +178,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -229,7 +229,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -191,7 +191,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey-version>1.19.1</jersey-version>
|
||||
<jackson-version>2.8.7</jackson-version>
|
||||
|
@ -188,7 +188,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<jackson-version>2.8.7</jackson-version>
|
||||
|
@ -174,7 +174,7 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<resteasy-version>3.0.11.Final</resteasy-version>
|
||||
<slf4j-version>1.6.3</slf4j-version>
|
||||
|
@ -164,7 +164,7 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<resteasy-version>3.0.11.Final</resteasy-version>
|
||||
<slf4j-version>1.6.3</slf4j-version>
|
||||
|
@ -9,7 +9,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
</properties>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
@ -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
|
||||
|
@ -75,7 +75,7 @@
|
||||
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -216,7 +216,7 @@
|
||||
<akka-version>2.3.9</akka-version>
|
||||
<joda-version>1.2</joda-version>
|
||||
<joda-time-version>2.2</joda-time-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<maven-plugin.version>1.0.0</maven-plugin.version>
|
||||
|
||||
<junit-version>4.8.1</junit-version>
|
||||
|
@ -145,7 +145,7 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<gson-version>2.3.1</gson-version>
|
||||
<junit-version>4.8.1</junit-version>
|
||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||
|
@ -0,0 +1,44 @@
|
||||
{{#operations}}
|
||||
{{#operation}}
|
||||
<Location "{{basePathWithoutHost}}{{path}}">
|
||||
{{>authConf}}
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
{{#hasAuthMethods}}
|
||||
{{#authMethods}}
|
||||
{{#isOAuth}}
|
||||
<Limit {{httpMethod}}>
|
||||
{{#scopes}}
|
||||
Require group {{scope}}
|
||||
{{/scopes}}
|
||||
</Limit>
|
||||
{{/isOAuth}}
|
||||
{{/authMethods}}
|
||||
{{/hasAuthMethods}}
|
||||
{{^hasAuthMethods}}
|
||||
<Limit {{httpMethod}}>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
{{/hasAuthMethods}}
|
||||
{{#vendorExtensions.x-codegen-otherMethods}}
|
||||
{{#hasAuthMethods}}
|
||||
{{#authMethods}}
|
||||
{{#isOAuth}}
|
||||
<Limit {{httpMethod}}>
|
||||
{{#scopes}}
|
||||
Require group {{scope}}
|
||||
{{/scopes}}
|
||||
</Limit>
|
||||
{{/isOAuth}}
|
||||
{{/authMethods}}
|
||||
{{/hasAuthMethods}}
|
||||
{{^hasAuthMethods}}
|
||||
<Limit {{httpMethod}}>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
{{/hasAuthMethods}}
|
||||
{{/vendorExtensions.x-codegen-otherMethods}}
|
||||
</Location>
|
||||
{{/operation}}
|
||||
{{/operations}}
|
@ -0,0 +1,5 @@
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "{{vendorExtensions.x-codegen-userInfoPath}}htpwd"
|
||||
AuthGroupFile "{{vendorExtensions.x-codegen-userInfoPath}}groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
@ -220,7 +220,7 @@
|
||||
<joda-version>1.2</joda-version>
|
||||
<joda-time-version>2.2</joda-time-version>
|
||||
<jersey-version>1.19</jersey-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jersey-async-version>1.0.5</jersey-async-version>
|
||||
<maven-plugin.version>1.0.0</maven-plugin.version>
|
||||
<jackson-version>2.4.2</jackson-version>
|
||||
|
@ -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;
|
||||
}
|
||||
|
4
pom.xml
4
pom.xml
@ -888,10 +888,10 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-parser-version>1.0.29</swagger-parser-version>
|
||||
<swagger-parser-version>1.0.30</swagger-parser-version>
|
||||
<scala-version>2.11.1</scala-version>
|
||||
<felix-version>3.3.0</felix-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<commons-io-version>2.4</commons-io-version>
|
||||
<commons-cli-version>1.2</commons-cli-version>
|
||||
<junit-version>4.8.1</junit-version>
|
||||
|
@ -900,7 +900,7 @@
|
||||
<swagger-parser-version>1.0.28</swagger-parser-version>
|
||||
<scala-version>2.11.1</scala-version>
|
||||
<felix-version>3.3.0</felix-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<commons-io-version>2.4</commons-io-version>
|
||||
<commons-cli-version>1.2</commons-cli-version>
|
||||
<junit-version>4.8.1</junit-version>
|
||||
|
@ -206,7 +206,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<okhttp-version>2.7.5</okhttp-version>
|
||||
<gson-version>2.6.2</gson-version>
|
||||
<jodatime-version>2.9.3</jodatime-version>
|
||||
|
@ -215,7 +215,7 @@
|
||||
<joda-version>1.2</joda-version>
|
||||
<joda-time-version>2.2</joda-time-version>
|
||||
<jersey-version>1.19</jersey-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jersey-async-version>1.0.5</jersey-async-version>
|
||||
<maven-plugin.version>1.0.0</maven-plugin.version>
|
||||
<jackson-version>2.4.2</jackson-version>
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -216,7 +216,7 @@
|
||||
<akka-version>2.3.9</akka-version>
|
||||
<joda-version>1.2</joda-version>
|
||||
<joda-time-version>2.2</joda-time-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<maven-plugin.version>1.0.0</maven-plugin.version>
|
||||
|
||||
<junit-version>4.8.1</junit-version>
|
||||
|
@ -145,7 +145,7 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<gson-version>2.3.1</gson-version>
|
||||
<junit-version>4.8.1</junit-version>
|
||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||
|
@ -247,7 +247,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<feign-version>9.4.0</feign-version>
|
||||
<feign-form-version>2.1.0</feign-form-version>
|
||||
<jackson-version>2.8.7</jackson-version>
|
||||
|
@ -184,7 +184,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -162,7 +162,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -220,7 +220,7 @@
|
||||
<joda-version>1.2</joda-version>
|
||||
<joda-time-version>2.2</joda-time-version>
|
||||
<jersey-version>1.19</jersey-version>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jersey-async-version>1.0.5</jersey-async-version>
|
||||
<maven-plugin.version>1.0.0</maven-plugin.version>
|
||||
<jackson-version>2.4.2</jackson-version>
|
||||
|
@ -9,7 +9,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
</properties>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
23
samples/config/petstore/apache2/.swagger-codegen-ignore
Normal file
23
samples/config/petstore/apache2/.swagger-codegen-ignore
Normal file
@ -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
|
1
samples/config/petstore/apache2/.swagger-codegen/VERSION
Normal file
1
samples/config/petstore/apache2/.swagger-codegen/VERSION
Normal file
@ -0,0 +1 @@
|
||||
2.2.3-SNAPSHOT
|
78
samples/config/petstore/apache2/PetApi.conf
Normal file
78
samples/config/petstore/apache2/PetApi.conf
Normal file
@ -0,0 +1,78 @@
|
||||
<Location "/v2/pet">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit POST>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
<Limit PUT>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/pet/*">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit DELETE>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
<Limit POST>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/pet/findByStatus">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit GET>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/pet/findByTags">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit GET>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/pet/*/uploadImage">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit POST>
|
||||
Require group write:pets
|
||||
Require group read:pets
|
||||
</Limit>
|
||||
</Location>
|
39
samples/config/petstore/apache2/StoreApi.conf
Normal file
39
samples/config/petstore/apache2/StoreApi.conf
Normal file
@ -0,0 +1,39 @@
|
||||
<Location "/v2/store/order/*">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit DELETE>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
<Limit GET>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/store/inventory">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
</Location>
|
||||
<Location "/v2/store/order">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit POST>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
84
samples/config/petstore/apache2/UserApi.conf
Normal file
84
samples/config/petstore/apache2/UserApi.conf
Normal file
@ -0,0 +1,84 @@
|
||||
<Location "/v2/user">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit POST>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/user/createWithArray">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit POST>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/user/createWithList">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit POST>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/user/*">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit DELETE>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
<Limit GET>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
<Limit PUT>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/user/login">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit GET>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
||||
<Location "/v2/user/logout">
|
||||
AuthBasicProvider file
|
||||
AuthUserFile "/var/www/html/htpwd"
|
||||
AuthGroupFile "/var/www/html/groups"
|
||||
AuthType basic
|
||||
AuthName "api"
|
||||
<LimitExcept GET POST PUT DELETE>
|
||||
Require valid-user
|
||||
</LimitExcept>
|
||||
<Limit GET>
|
||||
Require valid-user
|
||||
</Limit>
|
||||
</Location>
|
@ -119,7 +119,11 @@
|
||||
</repositories>
|
||||
<properties>
|
||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||
<<<<<<< HEAD
|
||||
<swagger-inflector-version>1.0.12</swagger-inflector-version>
|
||||
=======
|
||||
<swagger-inflector-version>1.0.14</swagger-inflector-version>
|
||||
>>>>>>> origin/master
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<logback-version>1.0.1</logback-version>
|
||||
<junit-version>4.8.2</junit-version>
|
||||
|
@ -92,7 +92,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -184,7 +184,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
@ -163,7 +163,7 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<resteasy-version>3.0.11.Final</resteasy-version>
|
||||
<slf4j-version>1.6.3</slf4j-version>
|
||||
|
@ -158,7 +158,7 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
<properties>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<resteasy-version>3.0.11.Final</resteasy-version>
|
||||
<slf4j-version>1.6.3</slf4j-version>
|
||||
|
@ -189,7 +189,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey-version>1.19.1</jersey-version>
|
||||
<jackson-version>2.8.7</jackson-version>
|
||||
|
@ -173,7 +173,7 @@
|
||||
<java.version>1.7</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<swagger-core-version>1.5.12</swagger-core-version>
|
||||
<swagger-core-version>1.5.15</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||
<jersey2-version>2.22.2</jersey2-version>
|
||||
<jackson-version>2.8.7</jackson-version>
|
||||
|
Loading…
x
Reference in New Issue
Block a user