Skip to content

Commit d9fff61

Browse files
joschijoschi
committed
Pacify SonarCloud
1 parent 52198b0 commit d9fff61

31 files changed

+145
-178
lines changed

‎core/src/main/java/org/openapitools/openapidiff/core/OpenApiCompare.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
import org.openapitools.openapidiff.core.model.ChangedOpenApi;
1111

1212
public class OpenApiCompare {
13-
14-
private static final OpenAPIParser openApiParser = new OpenAPIParser();
15-
private static final ParseOptions options = new ParseOptions();
13+
private static final OpenAPIParser PARSER = new OpenAPIParser();
14+
private static final ParseOptions OPTIONS = new ParseOptions();
1615

1716
static {
18-
options.setResolve(true);
17+
OPTIONS.setResolve(true);
1918
}
2019

20+
private OpenApiCompare() {}
21+
2122
/**
2223
* compare two openapi doc
2324
*
@@ -109,10 +110,10 @@ private static OpenAPI notNull(OpenAPI spec, String type) {
109110
}
110111

111112
private static OpenAPI readContent(String content, List<AuthorizationValue> auths) {
112-
return openApiParser.readContents(content, auths, options).getOpenAPI();
113+
return PARSER.readContents(content, auths, OPTIONS).getOpenAPI();
113114
}
114115

115116
private static OpenAPI readLocation(String location, List<AuthorizationValue> auths) {
116-
return openApiParser.readLocation(location, auths, options).getOpenAPI();
117+
return PARSER.readLocation(location, auths, OPTIONS).getOpenAPI();
117118
}
118119
}

‎core/src/main/java/org/openapitools/openapidiff/core/compare/ContentDiff.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public DeferredChanged<ChangedContent> diff(Content left, Content right, DiffCon
3030

3131
sharedMediaTypes.stream()
3232
.forEach(
33-
(mediaTypeKey) -> {
33+
mediaTypeKey -> {
3434
MediaType oldMediaType = left.get(mediaTypeKey);
3535
MediaType newMediaType = right.get(mediaTypeKey);
3636

@@ -46,7 +46,7 @@ public DeferredChanged<ChangedContent> diff(Content left, Content right, DiffCon
4646
newMediaType.getSchema(),
4747
context.copyWithRequired(true)))
4848
.ifPresent(
49-
(value) -> {
49+
value -> {
5050
changedMediaType.setSchema(value);
5151
if (!isUnchanged(changedMediaType)) {
5252
changedMediaTypes.put(mediaTypeKey, changedMediaType);
@@ -57,7 +57,7 @@ public DeferredChanged<ChangedContent> diff(Content left, Content right, DiffCon
5757
return builder
5858
.build()
5959
.mapOptional(
60-
(value) ->
60+
value ->
6161
isChanged(
6262
new ChangedContent(left, right, context)
6363
.setIncreased(mediaTypeDiff.getIncreased())

‎core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionsDiff.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,16 @@ public Optional<ChangedExtensions> diff(
5858
left = copyMap(left);
5959
right = copyMap(right);
6060
ChangedExtensions changedExtensions = new ChangedExtensions(left, copyMap(right), context);
61-
for (String key : left.keySet()) {
62-
Object leftValue = left.get(key);
63-
if (right.containsKey(key)) {
64-
Object rightValue = right.remove(key);
65-
executeExtensionDiff(key, Change.changed(leftValue, rightValue), context)
61+
for (Map.Entry<String, Object> entry : left.entrySet()) {
62+
if (right.containsKey(entry.getKey())) {
63+
Object rightValue = right.remove(entry.getKey());
64+
executeExtensionDiff(entry.getKey(), Change.changed(entry.getValue(), rightValue), context)
6665
.filter(Changed::isDifferent)
67-
.ifPresent(changed -> changedExtensions.getChanged().put(key, changed));
66+
.ifPresent(changed -> changedExtensions.getChanged().put(entry.getKey(), changed));
6867
} else {
69-
executeExtensionDiff(key, Change.removed(leftValue), context)
68+
executeExtensionDiff(entry.getKey(), Change.removed(entry.getValue()), context)
7069
.filter(Changed::isDifferent)
71-
.ifPresent(changed -> changedExtensions.getMissing().put(key, changed));
70+
.ifPresent(changed -> changedExtensions.getMissing().put(entry.getKey(), changed));
7271
}
7372
}
7473
right.forEach(

‎core/src/main/java/org/openapitools/openapidiff/core/compare/HeadersDiff.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public DeferredChanged<ChangedHeaders> diff(
3636
return builder
3737
.build()
3838
.mapOptional(
39-
(value) ->
39+
value ->
4040
isChanged(
4141
new ChangedHeaders(left, right, context)
4242
.setIncreased(headerMapDiff.getIncreased())

‎core/src/main/java/org/openapitools/openapidiff/core/compare/ListDiff.java

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

55
public class ListDiff {
66

7+
private ListDiff() {}
8+
79
public static <K extends ChangedList<X>, X> K diff(K instance) {
810
if (instance.getOldValue() == null && instance.getNewValue() == null) {
911
return instance;

‎core/src/main/java/org/openapitools/openapidiff/core/compare/MetadataDiff.java

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,12 @@
22

33
import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged;
44

5-
import io.swagger.v3.oas.models.Components;
65
import java.util.Optional;
76
import org.openapitools.openapidiff.core.model.ChangedMetadata;
87
import org.openapitools.openapidiff.core.model.DiffContext;
98

109
public class MetadataDiff {
11-
12-
private final Components leftComponents;
13-
private final Components rightComponents;
14-
private final OpenApiDiff openApiDiff;
15-
16-
public MetadataDiff(OpenApiDiff openApiDiff) {
17-
this.openApiDiff = openApiDiff;
18-
this.leftComponents =
19-
openApiDiff.getOldSpecOpenApi() != null
20-
? openApiDiff.getOldSpecOpenApi().getComponents()
21-
: null;
22-
this.rightComponents =
23-
openApiDiff.getNewSpecOpenApi() != null
24-
? openApiDiff.getNewSpecOpenApi().getComponents()
25-
: null;
26-
}
10+
public MetadataDiff(OpenApiDiff openApiDiff) {}
2711

2812
public Optional<ChangedMetadata> diff(String left, String right, DiffContext context) {
2913
return isChanged(new ChangedMetadata().setLeft(left).setRight(right));

‎core/src/main/java/org/openapitools/openapidiff/core/compare/OperationDiff.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public DeferredChanged<ChangedOperation> diff(
9393
newOperation.getResponses(),
9494
context.copyAsResponse()))
9595
.ifPresent(
96-
(responses) -> {
96+
responses -> {
9797
log.debug(
9898
"operation "
9999
+ changedOperation.getPathUrl()
@@ -129,7 +129,7 @@ public DeferredChanged<ChangedOperation> diff(
129129
return builder
130130
.build()
131131
.mapOptional(
132-
(value) -> {
132+
value -> {
133133
Optional<ChangedOperation> changed = isChanged(changedOperation);
134134
log.debug(
135135
"Is changed operation "

‎core/src/main/java/org/openapitools/openapidiff/core/compare/RequestBodyDiff.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ private static Map<String, Object> getExtensions(RequestBody body) {
2929

3030
public DeferredChanged<ChangedRequestBody> diff(
3131
RequestBody left, RequestBody right, DiffContext context) {
32-
String leftRef = left != null ? left.get$ref() : null,
33-
rightRef = right != null ? right.get$ref() : null;
32+
String leftRef = left != null ? left.get$ref() : null;
33+
String rightRef = right != null ? right.get$ref() : null;
3434
return cachedDiff(new HashSet<>(), left, right, leftRef, rightRef, context);
3535
}
3636

‎core/src/main/java/org/openapitools/openapidiff/core/compare/ResponseDiff.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public ResponseDiff(OpenApiDiff openApiDiff) {
3434
public DeferredChanged<ChangedResponse> diff(
3535
ApiResponse left, ApiResponse right, DiffContext context) {
3636
if (left == null && right == null) {
37-
return new RealizedChanged(Optional.empty());
37+
return new RealizedChanged<>(Optional.empty());
3838
}
3939
if ((left == null && right != null) || (left != null && right == null)) {
40-
return new RealizedChanged(Optional.of(new ChangedResponse(left, right, context)));
40+
return new RealizedChanged<>(Optional.of(new ChangedResponse(left, right, context)));
4141
}
4242
return cachedDiff(new HashSet<>(), left, right, left.get$ref(), right.get$ref(), context);
4343
}

‎core/src/main/java/org/openapitools/openapidiff/core/compare/SchemaDiff.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.swagger.v3.oas.models.media.Schema;
1111
import io.swagger.v3.oas.models.media.XML;
1212
import java.util.ArrayList;
13-
import java.util.HashSet;
1413
import java.util.LinkedHashMap;
1514
import java.util.List;
1615
import java.util.Map;

0 commit comments

Comments
 (0)