Skip to content

Remove calculateRequestOrder Function and fix bug #19685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 8, 2024
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -707,10 +707,8 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
Optional<DataExtractSubstituteParameter> dataExtract = getDataExtractSubstituteParameter(
dataExtractSubstituteParams, operationId);

// calculate order for this current request
Integer requestOrder = calculateRequestOrder(operationGroupingOrder, requests.size());

requests.put(requestOrder, new HTTPRequest(
// create requests
requests.putIfAbsent(requests.size(), new HTTPRequest(
operationId,
method.toString().toLowerCase(Locale.ROOT),
path,
Expand Down Expand Up @@ -933,7 +931,7 @@ private void addOrUpdateRequestGroup(Map<String, HTTPRequestGroup> requestGroups
existingHTTPRequestGroup.addRequests(requests);
existingHTTPRequestGroup.addVariables(variables);
} else {
requestGroups.put(groupName, new HTTPRequestGroup(groupName, variables, requests));
requestGroups.putIfAbsent(groupName, new HTTPRequestGroup(groupName, variables, requests));
}
}

Expand Down Expand Up @@ -1127,36 +1125,6 @@ private void extractRequestBodyExample(RequestBody requestBody, String contentTy
}
}

/**
* Calculate order for this current request
*
* @param operationGroupingOrder
* @param requestsSize
* @return request order
*/
private Integer calculateRequestOrder(OptionalInt operationGroupingOrder, int requestsSize) {
int requestOrder;

if (operationGroupingOrder.isPresent()) {
requestOrder = operationGroupingOrder.getAsInt() - 1;

} else {
switch (requestsSize) {
case 0:
case 1:
requestOrder = requestsSize;
break;

default:
requestOrder = (requestsSize - 1);
break;
}
}

return requestOrder;
}

//

/**
* Any variables not defined yet but used for subsequent data extraction must be
Expand Down
Loading