Skip to content

Commit 9bfcce3

Browse files
committed
Changes report: GroupedOpenApi.builder addOpenApiCustomiser execution order is reversed #1633
1 parent 520591d commit 9bfcce3

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/GroupedOpenApi.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.ArrayList;
2828
import java.util.Arrays;
2929
import java.util.Collection;
30-
import java.util.Collections;
3130
import java.util.List;
3231
import java.util.Objects;
3332

@@ -54,12 +53,12 @@ public class GroupedOpenApi {
5453
/**
5554
* The Open api customisers.
5655
*/
57-
private final List<OpenApiCustomizer> openApiCustomizers;
56+
private List<OpenApiCustomizer> openApiCustomizers;
5857

5958
/**
6059
* The Operation customizers.
6160
*/
62-
private final List<OperationCustomizer> operationCustomizers;
61+
private List<OperationCustomizer> operationCustomizers;
6362

6463
/**
6564
* The Paths to match.
@@ -99,7 +98,7 @@ public class GroupedOpenApi {
9998
/**
10099
* The method filters to use.
101100
*/
102-
private final List<OpenApiMethodFilter> openApiMethodFilters;
101+
private List<OpenApiMethodFilter> openApiMethodFilters;
103102

104103
/**
105104
* The Display name.
@@ -475,8 +474,10 @@ public GroupedOpenApi build() {
475474
* @return the grouped open api
476475
*/
477476
public GroupedOpenApi addAllOpenApiCustomizer(Collection<? extends OpenApiCustomizer> openApiCustomizerCollection) {
478-
this.openApiCustomizers.addAll(openApiCustomizerCollection);
479-
Collections.reverse(openApiCustomizers);
477+
List<OpenApiCustomizer> result = new ArrayList<>();
478+
result.addAll(openApiCustomizerCollection);
479+
result.addAll(openApiCustomizerCollection);
480+
openApiCustomizers = result;
480481
return this;
481482
}
482483

@@ -487,8 +488,10 @@ public GroupedOpenApi addAllOpenApiCustomizer(Collection<? extends OpenApiCustom
487488
* @return the grouped open api
488489
*/
489490
public GroupedOpenApi addAllOperationCustomizer(Collection<? extends OperationCustomizer> operationCustomizerCollection) {
490-
this.operationCustomizers.addAll(operationCustomizerCollection);
491-
Collections.reverse(operationCustomizers);
491+
List<OperationCustomizer> result = new ArrayList<>();
492+
result.addAll(operationCustomizerCollection);
493+
result.addAll(operationCustomizers);
494+
operationCustomizers = result;
492495
return this;
493496
}
494497

@@ -499,8 +502,10 @@ public GroupedOpenApi addAllOperationCustomizer(Collection<? extends OperationCu
499502
* @return the grouped open api
500503
*/
501504
public GroupedOpenApi addAllOpenApiMethodFilter(Collection<? extends OpenApiMethodFilter> openApiMethodFilterCollection) {
502-
this.openApiMethodFilters.addAll(openApiMethodFilterCollection);
503-
Collections.reverse(openApiMethodFilters);
505+
List<OpenApiMethodFilter> result = new ArrayList<>();
506+
result.addAll(openApiMethodFilterCollection);
507+
result.addAll(openApiMethodFilters);
508+
openApiMethodFilters = result;
504509
return this;
505510
}
506511

0 commit comments

Comments
 (0)