Skip to content

Commit 623e6a5

Browse files
committed
Code refactoring
1 parent 537bfd6 commit 623e6a5

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/main/java/com/qdesrame/openapi/diff/compare/OpenApiDiff.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.qdesrame.openapi.diff.utils.EndpointUtils;
66
import io.swagger.v3.oas.models.OpenAPI;
77
import io.swagger.v3.oas.models.PathItem;
8-
import io.swagger.v3.oas.models.Paths;
98
import io.swagger.v3.oas.models.security.SecurityRequirement;
109
import io.swagger.v3.parser.OpenAPIV3Parser;
1110
import io.swagger.v3.parser.core.models.AuthorizationValue;
@@ -19,6 +18,8 @@
1918
import java.util.Optional;
2019
import java.util.stream.Collectors;
2120

21+
import static com.qdesrame.openapi.diff.compare.PathsDiff.valOrEmpty;
22+
2223
public class OpenApiDiff {
2324

2425
public static final String SWAGGER_VERSION_V2 = "2.0";
@@ -132,9 +133,7 @@ private OpenApiDiff(OpenAPI oldSpecOpenApi, OpenAPI newSpecOpenApi) {
132133
private ChangedOpenApi compare() {
133134
preProcess(oldSpecOpenApi);
134135
preProcess(newSpecOpenApi);
135-
Paths oldPaths = oldSpecOpenApi.getPaths() == null? new Paths(): oldSpecOpenApi.getPaths();
136-
Paths newPaths = newSpecOpenApi.getPaths() == null? new Paths(): newSpecOpenApi.getPaths();
137-
Optional<ChangedPaths> paths = this.pathsDiff.diff(oldPaths, newPaths);
136+
Optional<ChangedPaths> paths = this.pathsDiff.diff(valOrEmpty(oldSpecOpenApi.getPaths()), valOrEmpty(newSpecOpenApi.getPaths()));
138137
this.newEndpoints = new ArrayList<>();
139138
this.missingEndpoints = new ArrayList<>();
140139
this.changedOperations = new ArrayList<>();

src/main/java/com/qdesrame/openapi/diff/compare/PathsDiff.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.qdesrame.openapi.diff.model.ChangedPaths;
44
import io.swagger.v3.oas.models.PathItem;
5+
import io.swagger.v3.oas.models.Paths;
56

67
import java.util.*;
78
import java.util.regex.Matcher;
@@ -53,4 +54,11 @@ public Optional<ChangedPaths> diff(final Map<String, PathItem> left, final Map<S
5354
});
5455
return changedPaths.isDiff() ? Optional.of(changedPaths) : Optional.empty();
5556
}
57+
58+
public static Paths valOrEmpty(Paths path) {
59+
if (path == null) {
60+
path = new Paths();
61+
}
62+
return path;
63+
}
5664
}

0 commit comments

Comments
 (0)