Skip to content

Commit 20c1ecc

Browse files
joschijoschi
committed
Clean up generics
1 parent 406f3ec commit 20c1ecc

31 files changed

+199
-170
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public ContentDiff(OpenApiDiff openApiDiff) {
2222
}
2323

2424
public DeferredChanged<ChangedContent> diff(Content left, Content right, DiffContext context) {
25-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
25+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
2626

2727
MapKeyDiff<String, MediaType> mediaTypeDiff = MapKeyDiff.diff(left, right);
2828
List<String> sharedMediaTypes = mediaTypeDiff.getSharedKey();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public interface ExtensionDiff {
1010

1111
String getName();
1212

13-
Changed diff(Change extension, DiffContext context);
13+
Changed diff(Change<?> extension, DiffContext context);
1414

1515
default boolean isParentApplicable(
1616
Change.Type type, Object object, Object extension, DiffContext context) {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ public Optional<ChangedExtensions> diff(
7979
return isChanged(changedExtensions);
8080
}
8181

82-
private Optional<Changed> executeExtensionDiff(String name, Change change, DiffContext context) {
82+
private Optional<Changed> executeExtensionDiff(
83+
String name, Change<?> change, DiffContext context) {
8384
return executeExtension(name, diff -> diff.setOpenApiDiff(openApiDiff).diff(change, context));
8485
}
8586
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected DeferredChanged<ChangedHeader> computeDiff(
4242
left = refPointer.resolveRef(leftComponents, left, left.get$ref());
4343
right = refPointer.resolveRef(rightComponents, right, right.get$ref());
4444

45-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
45+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
4646
ChangedHeader changedHeader =
4747
new ChangedHeader(left, right, context)
4848
.setRequired(getBooleanDiff(left.getRequired(), right.getRequired()))

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
import java.util.List;
1010
import java.util.Map;
1111
import java.util.stream.Collectors;
12-
import org.openapitools.openapidiff.core.model.*;
12+
import org.openapitools.openapidiff.core.model.ChangedExtensions;
13+
import org.openapitools.openapidiff.core.model.ChangedOpenApi;
14+
import org.openapitools.openapidiff.core.model.ChangedOperation;
15+
import org.openapitools.openapidiff.core.model.ChangedPath;
16+
import org.openapitools.openapidiff.core.model.ChangedPaths;
17+
import org.openapitools.openapidiff.core.model.Endpoint;
1318
import org.openapitools.openapidiff.core.model.deferred.DeferredChanged;
1419
import org.openapitools.openapidiff.core.model.deferred.DeferredSchemaCache;
1520
import org.openapitools.openapidiff.core.utils.EndpointUtils;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
1821

1922
public class OpenApiDiff {
20-
public static final String SWAGGER_VERSION_V2 = "2.0";
21-
private static final Logger logger = LoggerFactory.getLogger(OpenApiDiff.class);
2223
private PathsDiff pathsDiff;
2324
private PathDiff pathDiff;
2425
private SchemaDiff schemaDiff;

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
import io.swagger.v3.oas.models.parameters.Parameter;
77
import java.util.List;
88
import java.util.Map;
9+
import java.util.Objects;
910
import java.util.Optional;
1011
import java.util.stream.Collectors;
1112
import org.openapitools.openapidiff.core.model.Changed;
1213
import org.openapitools.openapidiff.core.model.ChangedOperation;
1314
import org.openapitools.openapidiff.core.model.ChangedParameters;
15+
import org.openapitools.openapidiff.core.model.ComposedChanged;
1416
import org.openapitools.openapidiff.core.model.DiffContext;
1517
import org.openapitools.openapidiff.core.model.deferred.DeferredBuilder;
1618
import org.openapitools.openapidiff.core.model.deferred.DeferredChanged;
@@ -100,10 +102,10 @@ public DeferredChanged<ChangedOperation> diff(
100102
+ changedOperation.getHttpMethod()
101103
+ " setting api responses "
102104
+ responses.getChangedElements().stream()
103-
.filter(c -> c != null)
104-
.map(c -> c.isChanged())
105-
.filter(c -> c != null)
106-
.map(c -> c.toString())
105+
.filter(Objects::nonNull)
106+
.map(Changed::isChanged)
107+
.filter(Objects::nonNull)
108+
.map(Enum::toString)
107109
.collect(Collectors.joining(",")));
108110
changedOperation.setApiResponses(responses);
109111
});
@@ -136,7 +138,7 @@ public DeferredChanged<ChangedOperation> diff(
136138
+ " "
137139
+ changedOperation.getHttpMethod()
138140
+ " changed: "
139-
+ changed.map(c -> c.isChanged()).orElse(null));
141+
+ changed.map(ComposedChanged::isChanged).orElse(null));
140142
return changed;
141143
});
142144
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static boolean same(Parameter left, Parameter right) {
5353
public DeferredChanged<ChangedParameters> diff(
5454
List<Parameter> left, List<Parameter> right, DiffContext context) {
5555

56-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
56+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
5757
ChangedParameters changedParameters =
5858
new ChangedParameters(left, right != null ? new ArrayList<>(right) : null, context);
5959
if (null == left) left = new ArrayList<>();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public DeferredChanged<ChangedPath> diff(PathItem left, PathItem right, DiffCont
2323
MapKeyDiff<PathItem.HttpMethod, Operation> operationsDiff =
2424
MapKeyDiff.diff(oldOperationMap, newOperationMap);
2525
List<PathItem.HttpMethod> sharedMethods = operationsDiff.getSharedKey();
26-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
26+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
2727

2828
ChangedPath changedPath =
2929
new ChangedPath(context.getUrl(), left, right, context)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.openapitools.openapidiff.core.model.deferred.DeferredChanged;
1313

1414
public class PathsDiff {
15-
private static final String REGEX_PATH = "\\{([^/]+)\\}";
15+
private static final String REGEX_PATH = "\\{([^/]+)}";
1616
private final OpenApiDiff openApiDiff;
1717

1818
public PathsDiff(OpenApiDiff openApiDiff) {
@@ -35,7 +35,7 @@ private static List<String> extractParameters(String path) {
3535

3636
public DeferredChanged<ChangedPaths> diff(
3737
final Map<String, PathItem> left, final Map<String, PathItem> right) {
38-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
38+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
3939

4040
ChangedPaths changedPaths = new ChangedPaths(left, right);
4141
changedPaths.getIncreased().putAll(right);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public DeferredChanged<ChangedRequestBody> diff(
3838
@Override
3939
protected DeferredChanged<ChangedRequestBody> computeDiff(
4040
HashSet<String> refSet, RequestBody left, RequestBody right, DiffContext context) {
41-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
41+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
4242

4343
Content oldRequestContent = new Content();
4444
Content newRequestContent = new Content();

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
public class SchemaDiff {
3131

32-
private static final RefPointer<Schema> refPointer = new RefPointer<>(RefType.SCHEMAS);
32+
private static final RefPointer<Schema<?>> refPointer = new RefPointer<>(RefType.SCHEMAS);
3333
private static final Map<Class<? extends Schema>, Class<? extends SchemaDiffResult>>
3434
schemaDiffResultClassMap = new LinkedHashMap<>();
3535

@@ -80,12 +80,12 @@ public static SchemaDiffResult getSchemaDiffResult(
8080
}
8181
}
8282

83-
protected static Schema resolveComposedSchema(Components components, Schema schema) {
83+
protected static Schema<?> resolveComposedSchema(Components components, Schema<?> schema) {
8484
if (schema instanceof ComposedSchema) {
8585
ComposedSchema composedSchema = (ComposedSchema) schema;
8686
List<Schema> allOfSchemaList = composedSchema.getAllOf();
8787
if (allOfSchemaList != null) {
88-
for (Schema allOfSchema : allOfSchemaList) {
88+
for (Schema<?> allOfSchema : allOfSchemaList) {
8989
allOfSchema = refPointer.resolveRef(components, allOfSchema, allOfSchema.get$ref());
9090
allOfSchema = resolveComposedSchema(components, allOfSchema);
9191
schema = addSchema(schema, allOfSchema);
@@ -96,7 +96,7 @@ protected static Schema resolveComposedSchema(Components components, Schema sche
9696
return schema;
9797
}
9898

99-
protected static Schema addSchema(Schema<?> schema, Schema<?> fromSchema) {
99+
protected static Schema<?> addSchema(Schema<?> schema, Schema<?> fromSchema) {
100100
if (fromSchema.getProperties() != null) {
101101
if (schema.getProperties() == null) {
102102
schema.setProperties(new LinkedHashMap<>());
@@ -234,7 +234,7 @@ protected static Schema addSchema(Schema<?> schema, Schema<?> fromSchema) {
234234
}
235235
if (fromSchema.getNot() != null) {
236236
if (schema.getNot() == null) {
237-
schema.setNot(addSchema(new Schema(), fromSchema.getNot()));
237+
schema.setNot(addSchema(new Schema<>(), fromSchema.getNot()));
238238
} else {
239239
addSchema(schema.getNot(), fromSchema.getNot());
240240
}
@@ -273,7 +273,7 @@ protected static Schema addSchema(Schema<?> schema, Schema<?> fromSchema) {
273273
return schema;
274274
}
275275

276-
private static String getSchemaRef(Schema schema) {
276+
private static String getSchemaRef(Schema<?> schema) {
277277
return ofNullable(schema).map(Schema::get$ref).orElse(null);
278278
}
279279

@@ -307,7 +307,7 @@ public DeferredChanged<ChangedSchema> getTypeChangedSchema(
307307
}
308308

309309
protected DeferredChanged<ChangedSchema> computeDeferredDiff(
310-
RecursiveSchemaSet refSet, Schema left, Schema right, DiffContext context) {
310+
RecursiveSchemaSet refSet, Schema<?> left, Schema<?> right, DiffContext context) {
311311

312312
CacheKey key = new CacheKey(getSchemaRef(left), getSchemaRef(right), context);
313313
if (key.getLeft() != null && key.getRight() != null) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private LinkedHashMap<String, List<String>> contains(
6464

6565
public DeferredChanged<ChangedSecurityRequirement> diff(
6666
SecurityRequirement left, SecurityRequirement right, DiffContext context) {
67-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
67+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
6868

6969
ChangedSecurityRequirement changedSecurityRequirement =
7070
new ChangedSecurityRequirement(left, right != null ? getCopy(right) : null);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private Pair<SecurityScheme.Type, SecurityScheme.In> getPair(SecurityScheme secu
8383
protected DeferredChanged<ChangedSecurityRequirements> diff(
8484
List<SecurityRequirement> left, List<SecurityRequirement> right, DiffContext context) {
8585

86-
DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
86+
DeferredBuilder<Changed> builder = new DeferredBuilder<>();
8787

8888
left = left == null ? new ArrayList<>() : left;
8989
right = right == null ? new ArrayList<>() : getCopy(right);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ protected DeferredChanged<ChangedSecurityScheme> computeDiff(
112112
.diff(leftSecurityScheme.getExtensions(), rightSecurityScheme.getExtensions(), context)
113113
.ifPresent(changedSecurityScheme::setExtensions);
114114

115-
return new RealizedChanged<ChangedSecurityScheme>(changedSecurityScheme);
115+
return new RealizedChanged<>(changedSecurityScheme);
116116
}
117117

118118
private ChangedSecurityScheme getCopyWithoutScopes(ChangedSecurityScheme original) {

‎core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/** Created by adarsh.sharma on 20/12/17. */
2626
public class ComposedSchemaDiffResult extends SchemaDiffResult {
27-
private static final RefPointer<Schema> refPointer = new RefPointer<>(RefType.SCHEMAS);
27+
private static final RefPointer<Schema<?>> refPointer = new RefPointer<>(RefType.SCHEMAS);
2828

2929
public ComposedSchemaDiffResult(OpenApiDiff openApiDiff) {
3030
super(openApiDiff);
@@ -74,9 +74,9 @@ public <T extends Schema<X>, X> DeferredChanged<ChangedSchema> diff(
7474
getSchema(rightComponents, rightMapping, rightComposedSchema));
7575
Map<String, ChangedSchema> changedMapping = new LinkedHashMap<>();
7676
for (String key : mappingDiff.getSharedKey()) {
77-
Schema leftSchema = new Schema();
77+
Schema<?> leftSchema = new Schema<>();
7878
leftSchema.set$ref(leftMapping.get(key));
79-
Schema rightSchema = new Schema();
79+
Schema<?> rightSchema = new Schema<>();
8080
rightSchema.set$ref(rightMapping.get(key));
8181
discriminatorChangedBuilder
8282
.with(
@@ -87,13 +87,12 @@ public <T extends Schema<X>, X> DeferredChanged<ChangedSchema> diff(
8787
}
8888

8989
discriminatorChangedBuilder.whenSet(
90-
(composedSchemas) -> {
91-
changedSchema.setOneOfSchema(
92-
new ChangedOneOfSchema(leftMapping, rightMapping, context)
93-
.setIncreased(mappingDiff.getIncreased())
94-
.setMissing(mappingDiff.getMissing())
95-
.setChanged(changedMapping));
96-
});
90+
(composedSchemas) ->
91+
changedSchema.setOneOfSchema(
92+
new ChangedOneOfSchema(leftMapping, rightMapping, context)
93+
.setIncreased(mappingDiff.getIncreased())
94+
.setMissing(mappingDiff.getMissing())
95+
.setChanged(changedMapping)));
9796
}
9897

9998
return discriminatorChangedBuilder
@@ -110,7 +109,7 @@ private Map<String, Schema> getSchema(
110109
Components components, Map<String, String> mapping, ComposedSchema composedSchema) {
111110
Map<String, Schema> result = new LinkedHashMap<>();
112111
mapping.forEach(
113-
(key, value) -> result.put(key, refPointer.resolveRef(components, new Schema(), value)));
112+
(key, value) -> result.put(key, refPointer.resolveRef(components, new Schema<>(), value)));
114113

115114
result.putAll(getUnnamedSchemas(composedSchema.getAllOf(), "all-of"));
116115
result.putAll(getUnnamedSchemas(composedSchema.getOneOf(), "one-of"));
@@ -120,7 +119,7 @@ private Map<String, Schema> getSchema(
120119

121120
private Map<String, String> getMapping(ComposedSchema composedSchema) {
122121
Map<String, String> reverseMapping = new LinkedHashMap<>();
123-
for (Schema schema : composedSchema.getOneOf()) {
122+
for (Schema<?> schema : composedSchema.getOneOf()) {
124123
String ref = schema.get$ref();
125124
if (ref == null) {
126125
continue;
@@ -151,7 +150,7 @@ private Map<String, Schema> getUnnamedSchemas(List<Schema> schemas, String name)
151150
}
152151

153152
for (int i = 0; i < schemas.size(); i++) {
154-
Schema schema = schemas.get(i);
153+
Schema<?> schema = schemas.get(i);
155154

156155
// If the ref is named, then we ignore it since getMapping will handle it.
157156
if (schema.get$ref() != null) {

‎core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/SchemaDiffResult.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ protected Optional<ChangedSchema> isApplicable(DiffContext context) {
107107
return isChanged(changedSchema);
108108
}
109109

110-
private Map<String, Schema> filterProperties(
110+
private Map<String, Schema<?>> filterProperties(
111111
Change.Type type, Map<String, Schema> properties, DiffContext context) {
112-
Map<String, Schema> result = new LinkedHashMap<>();
112+
Map<String, Schema<?>> result = new LinkedHashMap<>();
113113
for (Map.Entry<String, Schema> entry : properties.entrySet()) {
114114
if (isPropertyApplicable(entry.getValue(), context)
115115
&& openApiDiff
@@ -128,7 +128,7 @@ private Map<String, Schema> filterProperties(
128128
return result;
129129
}
130130

131-
private boolean isPropertyApplicable(Schema schema, DiffContext context) {
131+
private boolean isPropertyApplicable(Schema<?> schema, DiffContext context) {
132132
return !(context.isResponse() && Boolean.TRUE.equals(schema.getWriteOnly()))
133133
&& !(context.isRequest() && Boolean.TRUE.equals(schema.getReadOnly()));
134134
}
@@ -139,15 +139,15 @@ private DiffContext required(DiffContext context, String key, List<String> requi
139139

140140
private void compareAdditionalProperties(
141141
RecursiveSchemaSet refSet,
142-
Schema leftSchema,
143-
Schema rightSchema,
142+
Schema<?> leftSchema,
143+
Schema<?> rightSchema,
144144
DiffContext context,
145145
DeferredBuilder<Changed> builder) {
146146
Object left = leftSchema.getAdditionalProperties();
147147
Object right = rightSchema.getAdditionalProperties();
148148
if (left instanceof Schema || right instanceof Schema) {
149-
Schema leftAdditionalSchema = left instanceof Schema ? (Schema) left : null;
150-
Schema rightAdditionalSchema = right instanceof Schema ? (Schema) right : null;
149+
Schema<?> leftAdditionalSchema = left instanceof Schema ? (Schema<?>) left : null;
150+
Schema<?> rightAdditionalSchema = right instanceof Schema ? (Schema<?>) right : null;
151151
ChangedSchema apChangedSchema =
152152
new ChangedSchema()
153153
.setContext(context)

0 commit comments

Comments
 (0)