Skip to content
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