From fba779f5acb0f616408d30163d193535fccd46aa Mon Sep 17 00:00:00 2001 From: rmarqmo Date: Thu, 26 Sep 2024 11:25:21 +0200 Subject: [PATCH 1/5] Remove calculateRequestOrder Function This PR removes the calculateRequestOrder function from the codebase and addresses the bug described in issue #19110. After a thorough review, it was determined that the function was unnecessary due to its redundant logic and lack of unique functionality. --- .../codegen/languages/K6ClientCodegen.java | 39 ++----------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index dcfb3333eed0..e18e3d19f4d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -21,6 +21,7 @@ import static org.openapitools.codegen.utils.StringUtils.dashize; import static org.openapitools.codegen.utils.StringUtils.underscore; +import java.lang.*; import java.io.File; import java.io.IOException; import java.io.Writer; @@ -707,10 +708,8 @@ public void preprocessOpenAPI(OpenAPI openAPI) { Optional 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, @@ -933,7 +932,7 @@ private void addOrUpdateRequestGroup(Map requestGroups existingHTTPRequestGroup.addRequests(requests); existingHTTPRequestGroup.addVariables(variables); } else { - requestGroups.put(groupName, new HTTPRequestGroup(groupName, variables, requests)); + requestGroups.putIfAbsent(groupName, new HTTPRequestGroup(groupName, variables, requests)); } } @@ -1127,36 +1126,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 From 9cec247810c796b6d8853c17eb2fae90127822cc Mon Sep 17 00:00:00 2001 From: rmarqmo Date: Thu, 26 Sep 2024 11:32:44 +0200 Subject: [PATCH 2/5] delete import java.lang.*; --- .../java/org/openapitools/codegen/languages/K6ClientCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index e18e3d19f4d3..fc24fcc1f9ff 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -21,7 +21,6 @@ import static org.openapitools.codegen.utils.StringUtils.dashize; import static org.openapitools.codegen.utils.StringUtils.underscore; -import java.lang.*; import java.io.File; import java.io.IOException; import java.io.Writer; From 3ea1bb637ff4e9d7908b7e594a0a78f52ef06954 Mon Sep 17 00:00:00 2001 From: DevMrRober Date: Thu, 26 Sep 2024 11:32:44 +0200 Subject: [PATCH 3/5] delete import java.lang.*; --- .../java/org/openapitools/codegen/languages/K6ClientCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index e18e3d19f4d3..fc24fcc1f9ff 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -21,7 +21,6 @@ import static org.openapitools.codegen.utils.StringUtils.dashize; import static org.openapitools.codegen.utils.StringUtils.underscore; -import java.lang.*; import java.io.File; import java.io.IOException; import java.io.Writer; From 09b6e3d3dfedc091dc00038bcfd819cc49bd8449 Mon Sep 17 00:00:00 2001 From: DevMrRober Date: Thu, 26 Sep 2024 11:25:21 +0200 Subject: [PATCH 4/5] Remove calculateRequestOrder Function This PR removes the calculateRequestOrder function from the codebase and addresses the bug described in issue #19110. After a thorough review, it was determined that the function was unnecessary due to its redundant logic and lack of unique functionality. --- .../codegen/languages/K6ClientCodegen.java | 39 ++----------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index dcfb3333eed0..e18e3d19f4d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -21,6 +21,7 @@ import static org.openapitools.codegen.utils.StringUtils.dashize; import static org.openapitools.codegen.utils.StringUtils.underscore; +import java.lang.*; import java.io.File; import java.io.IOException; import java.io.Writer; @@ -707,10 +708,8 @@ public void preprocessOpenAPI(OpenAPI openAPI) { Optional 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, @@ -933,7 +932,7 @@ private void addOrUpdateRequestGroup(Map requestGroups existingHTTPRequestGroup.addRequests(requests); existingHTTPRequestGroup.addVariables(variables); } else { - requestGroups.put(groupName, new HTTPRequestGroup(groupName, variables, requests)); + requestGroups.putIfAbsent(groupName, new HTTPRequestGroup(groupName, variables, requests)); } } @@ -1127,36 +1126,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 From 462394233b8a01b6c66dd0c981565f1165edf83e Mon Sep 17 00:00:00 2001 From: DevMrRober Date: Thu, 26 Sep 2024 11:32:44 +0200 Subject: [PATCH 5/5] delete import java.lang.*; --- .../java/org/openapitools/codegen/languages/K6ClientCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index e18e3d19f4d3..fc24fcc1f9ff 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -21,7 +21,6 @@ import static org.openapitools.codegen.utils.StringUtils.dashize; import static org.openapitools.codegen.utils.StringUtils.underscore; -import java.lang.*; import java.io.File; import java.io.IOException; import java.io.Writer;