Skip to content

Commit 7734db0

Browse files
Devon Stewartjoschi
Devon Stewart
authored andcommitted
Adding oapi 2.x compatibility
1 parent 72eaac9 commit 7734db0

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
<artifactId>swagger-parser-v3</artifactId>
6666
<version>2.0.17</version>
6767
</dependency>
68+
<dependency>
69+
<groupId>io.swagger.parser.v3</groupId>
70+
<artifactId>swagger-parser</artifactId>
71+
<version>2.0.17</version>
72+
</dependency>
6873
<dependency>
6974
<groupId>com.j2html</groupId>
7075
<artifactId>j2html</artifactId>

src/main/java/com/qdesrame/openapi/diff/OpenApiCompare.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import com.qdesrame.openapi.diff.compare.OpenApiDiff;
44
import com.qdesrame.openapi.diff.model.ChangedOpenApi;
5+
import io.swagger.parser.OpenAPIParser;
56
import io.swagger.v3.oas.models.OpenAPI;
6-
import io.swagger.v3.parser.OpenAPIV3Parser;
77
import io.swagger.v3.parser.core.models.AuthorizationValue;
88
import io.swagger.v3.parser.core.models.ParseOptions;
99
import java.io.File;
1010
import java.util.List;
1111

1212
public class OpenApiCompare {
1313

14-
private static OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
14+
private static OpenAPIParser openApiParser = new OpenAPIParser();
1515
private static ParseOptions options = new ParseOptions();
1616

1717
static {
@@ -113,6 +113,6 @@ private static OpenAPI readContent(String content, List<AuthorizationValue> auth
113113
}
114114

115115
private static OpenAPI readLocation(String location, List<AuthorizationValue> auths) {
116-
return openApiParser.read(location, auths, options);
116+
return openApiParser.readLocation(location, auths, options).getOpenAPI();
117117
}
118118
}

src/main/java/com/qdesrame/openapi/diff/model/ChangedParameters.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ public DiffResult isCoreChanged() {
3939
if (increased.isEmpty() && missing.isEmpty()) {
4040
return DiffResult.NO_CHANGES;
4141
}
42-
if (increased.stream().noneMatch(Parameter::getRequired) && missing.isEmpty()) {
42+
if (increased
43+
.stream()
44+
.noneMatch(
45+
p -> {
46+
return p.getRequired() != null && p.getRequired();
47+
})
48+
&& missing.isEmpty()) {
4349
return DiffResult.COMPATIBLE;
4450
}
4551
return DiffResult.INCOMPATIBLE;

0 commit comments

Comments
 (0)