Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

v2 generate component parameters #101

Merged
merged 14 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/configs/python.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
generatorName: python
outputDir: samples/openapi3/client/petstore/python
inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore_customized.yaml
templateDir: modules/openapi-json-schema-generator/src/main/resources/python
additionalProperties:
packageName: petstore_api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.headers.Header;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.security.SecurityScheme;
Expand Down Expand Up @@ -88,6 +89,10 @@ public interface CodegenConfig {

String headerDocFileFolder();

String parameterFileFolder();

String parameterDocFileFolder();

String modelPackage();

String packageName();
Expand Down Expand Up @@ -180,6 +185,10 @@ public interface CodegenConfig {

Map<String, String> headerDocTemplateFiles();

Map<String, String> parameterTemplateFiles();

Map<String, String> parameterDocTemplateFiles();

Map<String, String> pathEndpointTemplateFiles();

Set<String> pathEndpointTestTemplateFiles();
Expand Down Expand Up @@ -244,9 +253,11 @@ public interface CodegenConfig {

String toHeaderFilename(String componentName);

String toPathFileName(String path);
String toPathFilename(String path);

String toParameterFilename(String baseName);

String toParameterFileName(String baseName);
String toParameterDocFilename(String componentName);

String toModelImport(String refClass);

Expand Down Expand Up @@ -403,4 +414,6 @@ public interface CodegenConfig {
CodegenResponse fromResponse(ApiResponse response, String sourceJsonPath);

CodegenHeader fromHeader(Header parameter, String sourceJsonPath);

CodegenParameter fromParameter(Parameter parameter, String sourceJsonPath);
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ public class CodegenConstants {

public static final String HEADERS = "headers";
public static final String HEADER_DOCS = "headerDocs";

public static final String PARAMETERS = "parameters";

public static final String PARAMETER_DOCS = "parameterDocs";
public static final String SUPPORTING_FILES = "supportingFiles";
public static final String MODEL_TESTS = "modelTests";
public static final String MODEL_DOCS = "modelDocs";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public class CodegenOperation {
public List<CodegenParameter> queryParams = new ArrayList<CodegenParameter>();
public List<CodegenParameter> headerParams = new ArrayList<CodegenParameter>();
public List<CodegenParameter> implicitHeadersParams = new ArrayList<CodegenParameter>();
public List<CodegenParameter> formParams = new ArrayList<CodegenParameter>();
public List<CodegenParameter> cookieParams = new ArrayList<CodegenParameter>();
public List<CodegenParameter> requiredParams = new ArrayList<CodegenParameter>();
public List<CodegenParameter> optionalParams = new ArrayList<CodegenParameter>();
Expand Down Expand Up @@ -121,22 +120,13 @@ public boolean getHasPathParams() {
return nonEmpty(pathParams);
}

/**
* Check if there's at least one form parameter
*
* @return true if any form parameter exists, false otherwise
*/
public boolean getHasFormParams() {
return nonEmpty(formParams);
}

/**
* Check if there's at least one body parameter or at least one form parameter
*
* @return true if body or form parameter exists, false otherwise
*/
public boolean getHasBodyOrFormParams() {
return getHasBodyParam() || getHasFormParams();
return getHasBodyParam();
}

/**
Expand Down Expand Up @@ -341,7 +331,6 @@ public String toString() {
sb.append(", pathParams=").append(pathParams);
sb.append(", queryParams=").append(queryParams);
sb.append(", headerParams=").append(headerParams);
sb.append(", formParams=").append(formParams);
sb.append(", cookieParams=").append(cookieParams);
sb.append(", requiredParams=").append(requiredParams);
sb.append(", optionalParams=").append(optionalParams);
Expand Down Expand Up @@ -407,7 +396,6 @@ public boolean equals(Object o) {
Objects.equals(pathParams, that.pathParams) &&
Objects.equals(queryParams, that.queryParams) &&
Objects.equals(headerParams, that.headerParams) &&
Objects.equals(formParams, that.formParams) &&
Objects.equals(cookieParams, that.cookieParams) &&
Objects.equals(requiredParams, that.requiredParams) &&
Objects.equals(optionalParams, that.optionalParams) &&
Expand Down Expand Up @@ -440,7 +428,7 @@ public int hashCode() {
isRestful, isDeprecated, isCallbackRequest, uniqueItems, path, operationId, httpMethod,
summary, unescapedNotes, notes, baseName, defaultResponse,
consumes, produces, prioritizedContentTypes, servers, requestBody, allParams, bodyParams,
pathParams, queryParams, headerParams, formParams, cookieParams, requiredParams, optionalParams,
pathParams, queryParams, headerParams, cookieParams, requiredParams, optionalParams,
authMethods, tags, responses, callbacks, imports, examples, requestBodyExamples, externalDocs,
vendorExtensions, nickname, operationIdOriginal, operationIdLowerCase, operationIdCamelCase,
operationIdSnakeCase, statusCodeResponses, wildcardCodeResponses,
Expand Down
Loading