loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-03 06:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove localVariablePrefix (#6588)

Browse Source
This commit is contained in:
William Cheng 2020-06-10 17:22:06 +08:00 committed by GitHub
parent 5c893d5664
commit 104a2a39b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java
View File

@ -322,8 +322,6 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
protected File testDataControlFile = null; protected File testDataControlFile = null;
protected String localVariablePrefix = "";
public JavaCXFExtServerCodegen() { public JavaCXFExtServerCodegen() {
super(); super();
@ -444,9 +442,9 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
Collection<String> localVars, Map<String, CodegenModel> models) { Collection<String> localVars, Map<String, CodegenModel> models) {
// Ensure that we're using a unique local variable name (to avoid typing and overwriting conflicts). // Ensure that we're using a unique local variable name (to avoid typing and overwriting conflicts).
String localVar = localVariablePrefix + var.name; String localVar = var.name;
for (int i = 2; localVars.contains(localVar); i++) for (int i = 2; localVars.contains(localVar); i++)
localVar = localVariablePrefix + var.name + i; localVar = var.name + i;
localVars.add(localVar); localVars.add(localVar);
if (!loadTestDataFromFile) if (!loadTestDataFromFile)

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
View File

@ -184,7 +184,6 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
protected String invokerPackage; protected String invokerPackage;
protected String sourceFolder = ""; protected String sourceFolder = "";
protected String localVariablePrefix = "";
private String modelPropertyNaming = "camelCase"; private String modelPropertyNaming = "camelCase";
protected boolean preserveLeadingParamChar = false; protected boolean preserveLeadingParamChar = false;

8
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache vendored
View File

@ -173,12 +173,12 @@ public class {{classname}} {
public class API{{operationId}}Request { public class API{{operationId}}Request {
{{#allParams}} {{#allParams}}
private {{#isRequired}}final {{/isRequired}}{{{dataType}}} {{localVariablePrefix}}{{paramName}}; private {{#isRequired}}final {{/isRequired}}{{{dataType}}} {{paramName}};
{{/allParams}} {{/allParams}}
private API{{operationId}}Request({{#pathParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) { private API{{operationId}}Request({{#pathParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) {
{{#pathParams}} {{#pathParams}}
this.{{localVariablePrefix}}{{paramName}} = {{paramName}}; this.{{paramName}} = {{paramName}};
{{/pathParams}} {{/pathParams}}
} }
{{#allParams}} {{#allParams}}
@ -190,7 +190,7 @@ public class {{classname}} {
* @return API{{operationId}}Request * @return API{{operationId}}Request
*/ */
public API{{operationId}}Request {{paramName}}({{{dataType}}} {{paramName}}) { public API{{operationId}}Request {{paramName}}({{{dataType}}} {{paramName}}) {
this.{{localVariablePrefix}}{{paramName}} = {{paramName}}; this.{{paramName}} = {{paramName}};
return this; return this;
} }
{{/isPathParam}} {{/isPathParam}}
@ -236,7 +236,7 @@ public class {{classname}} {
@Deprecated @Deprecated
{{/isDeprecated}} {{/isDeprecated}}
public ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> executeWithHttpInfo() throws ApiException { public ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> executeWithHttpInfo() throws ApiException {
return {{operationId}}WithHttpInfo({{#allParams}}{{localVariablePrefix}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); return {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
} }
} }

42
modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache vendored
View File

@ -22,22 +22,22 @@ import java.util.Map;
{{>generatedAnnotation}} {{>generatedAnnotation}}
{{#operations}} {{#operations}}
public class {{classname}} { public class {{classname}} {
private ApiClient {{localVariablePrefix}}apiClient; private ApiClient apiClient;
public {{classname}}() { public {{classname}}() {
this(Configuration.getDefaultApiClient()); this(Configuration.getDefaultApiClient());
} }
public {{classname}}(ApiClient apiClient) { public {{classname}}(ApiClient apiClient) {
this.{{localVariablePrefix}}apiClient = apiClient; this.apiClient = apiClient;
} }
public ApiClient getApiClient() { public ApiClient getApiClient() {
return {{localVariablePrefix}}apiClient; return apiClient;
} }
public void setApiClient(ApiClient apiClient) { public void setApiClient(ApiClient apiClient) {
this.{{localVariablePrefix}}apiClient = apiClient; this.apiClient = apiClient;
} }
{{#operation}} {{#operation}}
@ -53,7 +53,7 @@ public class {{classname}} {
* @throws ApiException if fails to make API call * @throws ApiException if fails to make API call
*/ */
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException { public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
{{#allParams}}{{#required}} {{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set // verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) { if ({{paramName}} == null) {
@ -61,43 +61,43 @@ public class {{classname}} {
} }
{{/required}}{{/allParams}} {{/required}}{{/allParams}}
// create path and map variables // create path and map variables
String {{localVariablePrefix}}localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}} String localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
.replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; .replaceAll("\\{" + "{{baseName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
// query params // query params
{{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>(); {{javaUtilPrefix}}List<Pair> localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
{{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>(); {{javaUtilPrefix}}Map<String, String> localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();
{{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>(); {{javaUtilPrefix}}Map<String, Object> localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();
{{#queryParams}} {{#queryParams}}
{{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}})); localVarQueryParams.addAll(apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
{{/queryParams}} {{/queryParams}}
{{#headerParams}}if ({{paramName}} != null) {{#headerParams}}if ({{paramName}} != null)
{{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}})); localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));
{{/headerParams}} {{/headerParams}}
{{#formParams}}if ({{paramName}} != null) {{#formParams}}if ({{paramName}} != null)
{{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}}); localVarFormParams.put("{{baseName}}", {{paramName}});
{{/formParams}} {{/formParams}}
final String[] {{localVariablePrefix}}localVarAccepts = { final String[] localVarAccepts = {
{{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
}; };
final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts); final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
final String[] {{localVariablePrefix}}localVarContentTypes = { final String[] localVarContentTypes = {
{{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
}; };
final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes); final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
{{#returnType}} {{#returnType}}
GenericType<{{{returnType}}}> {{localVariablePrefix}}localVarReturnType = new GenericType<{{{returnType}}}>() {}; GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};
return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, {{localVariablePrefix}}localVarReturnType); return apiClient.invokeAPI(localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
{{/returnType}}{{^returnType}} {{/returnType}}{{^returnType}}
{{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, null); apiClient.invokeAPI(localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
{{/returnType}} {{/returnType}}
} }
{{/operation}} {{/operation}}

3
modules/openapi-generator/src/test/resources/sampleConfig.json
View File

@ -29,6 +29,5 @@
"importMappings" : { "importMappings" : {
"type1" : "import1" "type1" : "import1"
}, },
"languageSpecificPrimitives" : [ "rolex" ], "languageSpecificPrimitives" : [ "rolex" ]
"localVariablePrefix" : "_"
} }