Skip to content

Commit 7d26502

Browse files
committed
Merge pull request #23 from adarshsharma/adarsh_master
2 parents a27c99c + 623e6a5 commit 7d26502

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import java.util.Optional;
1515
import java.util.stream.Collectors;
1616

17+
import static com.qdesrame.openapi.diff.compare.PathsDiff.valOrEmpty;
18+
1719
public class OpenApiDiff {
1820

1921
public static final String SWAGGER_VERSION_V2 = "2.0";
@@ -87,7 +89,7 @@ private void initializeFields() {
8789
private ChangedOpenApi compare() {
8890
preProcess(oldSpecOpenApi);
8991
preProcess(newSpecOpenApi);
90-
Optional<ChangedPaths> paths = this.pathsDiff.diff(oldSpecOpenApi.getPaths(), newSpecOpenApi.getPaths());
92+
Optional<ChangedPaths> paths = this.pathsDiff.diff(valOrEmpty(oldSpecOpenApi.getPaths()), valOrEmpty(newSpecOpenApi.getPaths()));
9193
this.newEndpoints = new ArrayList<>();
9294
this.missingEndpoints = new ArrayList<>();
9395
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)