Skip to content

Commit 77ef153

Browse files
author
Endre Czirbesz
committed
Fix for #7007: remove null operations
1 parent 6a53b60 commit 77ef153

File tree

1 file changed

+15
-10
lines changed
  • modules/swagger-codegen/src/main/java/io/swagger/codegen/utils

1 file changed

+15
-10
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/utils/ModelUtils.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.swagger.codegen.utils;
22

3-
import io.swagger.codegen.CodegenConfig;
43
import io.swagger.codegen.CodegenModel;
54
import io.swagger.codegen.CodegenProperty;
65
import io.swagger.v3.oas.models.Operation;
@@ -12,6 +11,9 @@
1211
import java.util.HashMap;
1312
import java.util.List;
1413
import java.util.Map;
14+
import java.util.Objects;
15+
import java.util.stream.Collectors;
16+
import java.util.stream.Stream;
1517

1618
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
1719
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
@@ -46,15 +48,18 @@ public static CodegenModel getModelByName(final String name, final Map<String, O
4648
}
4749

4850
public static Operation[] createOperationArray (PathItem pathItem) {
49-
return new Operation[]{
50-
pathItem.getGet(),
51-
pathItem.getPost(),
52-
pathItem.getDelete(),
53-
pathItem.getHead(),
54-
pathItem.getPut(),
55-
pathItem.getPatch(),
56-
pathItem.getOptions()
57-
};
51+
return Stream.of(
52+
pathItem.getGet(),
53+
pathItem.getPost(),
54+
pathItem.getDelete(),
55+
pathItem.getHead(),
56+
pathItem.getPut(),
57+
pathItem.getPatch(),
58+
pathItem.getOptions()
59+
)
60+
.filter(Objects::nonNull)
61+
.collect(Collectors.toSet())
62+
.toArray(new Operation[]{});
5863
}
5964

6065
public static void processCodegenModels(Map<String, CodegenModel> allModels) {

0 commit comments

Comments
 (0)