loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-31 14:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OpenAPITools/openapi-generator

Browse Source
This commit is contained in:
William Cheng 2019-02-18 22:28:08 +08:00
commit a3566cd34f
22 changed files with 153 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache vendored
View File

@ -671,6 +671,40 @@ public class ApiClient {
return params;
}
/**
* Formats the specified collection path parameter to a string value.
*
* @param collectionFormat The collection format of the parameter.
* @param value The value of the parameter.
* @return String representation of the parameter
*/
public String collectionPathParameterToString(String collectionFormat, Collection value) {
// create the value based on the collection format
if ("multi".equals(collectionFormat)) {
// not valid for path params
return parameterToString(value);
}
// collectionFormat is assumed to be "csv" by default
String delimiter = ",";
if ("ssv".equals(collectionFormat)) {
delimiter = " ";
} else if ("tsv".equals(collectionFormat)) {
delimiter = "\t";
} else if ("pipes".equals(collectionFormat)) {
delimiter = "|";
}
StringBuilder sb = new StringBuilder() ;
for (Object item : value) {
sb.append(delimiter);
sb.append(parameterToString(item));
}
return sb.substring(delimiter.length());
}
/**
* Sanitize filename by removing path.
* e.g. ../../sun.gif becomes sun.gif

2
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache vendored
View File

@ -86,7 +86,7 @@ public class {{classname}} {
// create path and map variables
String localVarPath = "{{{path}}}"{{#pathParams}}
.replaceAll("\\{" + "{{baseName}}" + "\\}", localVarApiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
.replaceAll("\\{" + "{{baseName}}" + "\\}", localVarApiClient.escapeString({{#collectionFormat}}localVarApiClient.collectionPathParameterToString("{{{collectionFormat}}}", {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}.toString(){{/collectionFormat}})){{/pathParams}};
{{javaUtilPrefix}}List<Pair> localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
{{javaUtilPrefix}}List<Pair> localVarCollectionQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();

3
modules/openapi-generator/src/main/resources/go/api.mustache vendored
View File

@ -236,6 +236,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
{{/hasBodyParam}}
{{#authMethods}}
{{#isApiKey}}
{{^isKeyInCookie}}
if ctx != nil {
// API Key Authentication
if auth, ok := ctx.Value(ContextAPIKey).(APIKey); ok {
@ -253,7 +254,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
{{/isKeyInQuery}}
}
}
{{/isKeyInCookie}}
{{/isApiKey}}
{{/authMethods}}
r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)

6
modules/openapi-generator/src/main/resources/typescript-angular/README.mustache vendored
View File

@ -31,13 +31,15 @@ _without publishing (not recommended):_
```
{{#useNgPackagr}}
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
{{/useNgPackagr}}
{{^useNgPackagr}}
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/{{npmName}}-{{npmVersion}}.tgz --save
{{/useNgPackagr}}
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
{{#useNgPackagr}}

3
modules/openapi-generator/src/main/resources/typescript-angular/package.mustache vendored
View File

@ -18,8 +18,7 @@
"module": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": {
"build": "ngc",
"postinstall": "npm run build"
"build": "ngc && npm pack"
},
{{/useNgPackagr}}
"peerDependencies": {

4
samples/client/petstore-security-test/typescript-angular/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

34
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -637,6 +637,40 @@ public class ApiClient {
return params;
}
/**
* Formats the specified collection path parameter to a string value.
*
* @param collectionFormat The collection format of the parameter.
* @param value The value of the parameter.
* @return String representation of the parameter
*/
public String collectionPathParameterToString(String collectionFormat, Collection value) {
// create the value based on the collection format
if ("multi".equals(collectionFormat)) {
// not valid for path params
return parameterToString(value);
}
// collectionFormat is assumed to be "csv" by default
String delimiter = ",";
if ("ssv".equals(collectionFormat)) {
delimiter = " ";
} else if ("tsv".equals(collectionFormat)) {
delimiter = "\t";
} else if ("pipes".equals(collectionFormat)) {
delimiter = "|";
}
StringBuilder sb = new StringBuilder() ;
for (Object item : value) {
sb.append(delimiter);
sb.append(parameterToString(item));
}
return sb.substring(delimiter.length());
}
/**
* Sanitize filename by removing path.
* e.g. ../../sun.gif becomes sun.gif

34
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -637,6 +637,40 @@ public class ApiClient {
return params;
}
/**
* Formats the specified collection path parameter to a string value.
*
* @param collectionFormat The collection format of the parameter.
* @param value The value of the parameter.
* @return String representation of the parameter
*/
public String collectionPathParameterToString(String collectionFormat, Collection value) {
// create the value based on the collection format
if ("multi".equals(collectionFormat)) {
// not valid for path params
return parameterToString(value);
}
// collectionFormat is assumed to be "csv" by default
String delimiter = ",";
if ("ssv".equals(collectionFormat)) {
delimiter = " ";
} else if ("tsv".equals(collectionFormat)) {
delimiter = "\t";
} else if ("pipes".equals(collectionFormat)) {
delimiter = "|";
}
StringBuilder sb = new StringBuilder() ;
for (Object item : value) {
sb.append(delimiter);
sb.append(parameterToString(item));
}
return sb.substring(delimiter.length());
}
/**
* Sanitize filename by removing path.
* e.g. ../../sun.gif becomes sun.gif

4
samples/client/petstore/typescript-angular-v2/default/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

4
samples/client/petstore/typescript-angular-v2/npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/angular2-typescript-petstore@0.0.1 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/@swagger/angular2-typescript-petstore-0.0.1.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

3
samples/client/petstore/typescript-angular-v2/npm/package.json
View File

@ -12,8 +12,7 @@
"module": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": {
"build": "ngc",
"postinstall": "npm run build"
"build": "ngc && npm pack"
},
"peerDependencies": {
"@angular/core": "^2.0.0",

4
samples/client/petstore/typescript-angular-v2/with-interfaces/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

4
samples/client/petstore/typescript-angular-v4.3/npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/angular2-typescript-petstore@0.0.1 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE/dist:

4
samples/client/petstore/typescript-angular-v4/npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/angular2-typescript-petstore@0.0.1 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE/dist:

4
samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

4
samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/typescript-angular-petstore@1.0.0 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE/dist:

4
samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

4
samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/typescript-angular-petstore@1.0.0 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE/dist:

4
samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

4
samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/typescript-angular-petstore@1.0.0 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE/dist:

4
samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
View File

@ -25,9 +25,11 @@ npm install @ --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE --save
npm install PATH_TO_GENERATED_PACKAGE/-.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE:

4
samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
View File

@ -25,9 +25,11 @@ npm install @swagger/typescript-angular-petstore@1.0.0 --save
_without publishing (not recommended):_
```
npm install PATH_TO_GENERATED_PACKAGE/dist --save
npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
```
_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
_using `npm link`:_
In PATH_TO_GENERATED_PACKAGE/dist: