Clean up generics

Author: joschi

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

@@ -22,7 +22,7 @@ public ContentDiff(OpenApiDiff openApiDiff) {
   }
 
   public DeferredChanged<ChangedContent> diff(Content left, Content right, DiffContext context) {
-    DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
+    DeferredBuilder<Changed> builder = new DeferredBuilder<>();
 
     MapKeyDiff<String, MediaType> mediaTypeDiff = MapKeyDiff.diff(left, right);
     List<String> sharedMediaTypes = mediaTypeDiff.getSharedKey();

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

@@ -10,7 +10,7 @@ public interface ExtensionDiff {
 
   String getName();
 
-  Changed diff(Change extension, DiffContext context);
+  Changed diff(Change<?> extension, DiffContext context);
 
   default boolean isParentApplicable(
       Change.Type type, Object object, Object extension, DiffContext context) {

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

@@ -79,7 +79,8 @@ public Optional<ChangedExtensions> diff(
     return isChanged(changedExtensions);
   }
 
-  private Optional<Changed> executeExtensionDiff(String name, Change change, DiffContext context) {
+  private Optional<Changed> executeExtensionDiff(
+      String name, Change<?> change, DiffContext context) {
     return executeExtension(name, diff -> diff.setOpenApiDiff(openApiDiff).diff(change, context));
   }
 }

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

@@ -42,7 +42,7 @@ protected DeferredChanged<ChangedHeader> computeDiff(
     left = refPointer.resolveRef(leftComponents, left, left.get$ref());
     right = refPointer.resolveRef(rightComponents, right, right.get$ref());
 
-    DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
+    DeferredBuilder<Changed> builder = new DeferredBuilder<>();
     ChangedHeader changedHeader =
         new ChangedHeader(left, right, context)
             .setRequired(getBooleanDiff(left.getRequired(), right.getRequired()))

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

@@ -9,16 +9,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.openapitools.openapidiff.core.model.*;
+import org.openapitools.openapidiff.core.model.ChangedExtensions;
+import org.openapitools.openapidiff.core.model.ChangedOpenApi;
+import org.openapitools.openapidiff.core.model.ChangedOperation;
+import org.openapitools.openapidiff.core.model.ChangedPath;
+import org.openapitools.openapidiff.core.model.ChangedPaths;
+import org.openapitools.openapidiff.core.model.Endpoint;
 import org.openapitools.openapidiff.core.model.deferred.DeferredChanged;
 import org.openapitools.openapidiff.core.model.deferred.DeferredSchemaCache;
 import org.openapitools.openapidiff.core.utils.EndpointUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class OpenApiDiff {
-  public static final String SWAGGER_VERSION_V2 = "2.0";
-  private static final Logger logger = LoggerFactory.getLogger(OpenApiDiff.class);
   private PathsDiff pathsDiff;
   private PathDiff pathDiff;
   private SchemaDiff schemaDiff;

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

@@ -6,11 +6,13 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import org.openapitools.openapidiff.core.model.Changed;
 import org.openapitools.openapidiff.core.model.ChangedOperation;
 import org.openapitools.openapidiff.core.model.ChangedParameters;
+import org.openapitools.openapidiff.core.model.ComposedChanged;
 import org.openapitools.openapidiff.core.model.DiffContext;
 import org.openapitools.openapidiff.core.model.deferred.DeferredBuilder;
 import org.openapitools.openapidiff.core.model.deferred.DeferredChanged;
@@ -100,10 +102,10 @@ public DeferredChanged<ChangedOperation> diff(
                         + changedOperation.getHttpMethod()
                         + " setting api responses "
                         + responses.getChangedElements().stream()
-                            .filter(c -> c != null)
-                            .map(c -> c.isChanged())
-                            .filter(c -> c != null)
-                            .map(c -> c.toString())
+                            .filter(Objects::nonNull)
+                            .map(Changed::isChanged)
+                            .filter(Objects::nonNull)
+                            .map(Enum::toString)
                             .collect(Collectors.joining(",")));
                 changedOperation.setApiResponses(responses);
               });
@@ -136,7 +138,7 @@ public DeferredChanged<ChangedOperation> diff(
                       + " "
                       + changedOperation.getHttpMethod()
                       + " changed: "
-                      + changed.map(c -> c.isChanged()).orElse(null));
+                      + changed.map(ComposedChanged::isChanged).orElse(null));
               return changed;
             });
   }

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

@@ -53,7 +53,7 @@ public static boolean same(Parameter left, Parameter right) {
   public DeferredChanged<ChangedParameters> diff(
       List<Parameter> left, List<Parameter> right, DiffContext context) {
 
-    DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
+    DeferredBuilder<Changed> builder = new DeferredBuilder<>();
     ChangedParameters changedParameters =
         new ChangedParameters(left, right != null ? new ArrayList<>(right) : null, context);
     if (null == left) left = new ArrayList<>();

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

@@ -23,7 +23,7 @@ public DeferredChanged<ChangedPath> diff(PathItem left, PathItem right, DiffCont
     MapKeyDiff<PathItem.HttpMethod, Operation> operationsDiff =
         MapKeyDiff.diff(oldOperationMap, newOperationMap);
     List<PathItem.HttpMethod> sharedMethods = operationsDiff.getSharedKey();
-    DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
+    DeferredBuilder<Changed> builder = new DeferredBuilder<>();
 
     ChangedPath changedPath =
         new ChangedPath(context.getUrl(), left, right, context)

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

@@ -12,7 +12,7 @@
 import org.openapitools.openapidiff.core.model.deferred.DeferredChanged;
 
 public class PathsDiff {
-  private static final String REGEX_PATH = "\\{([^/]+)\\}";
+  private static final String REGEX_PATH = "\\{([^/]+)}";
   private final OpenApiDiff openApiDiff;
 
   public PathsDiff(OpenApiDiff openApiDiff) {
@@ -35,7 +35,7 @@ private static List<String> extractParameters(String path) {
 
   public DeferredChanged<ChangedPaths> diff(
       final Map<String, PathItem> left, final Map<String, PathItem> right) {
-    DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
+    DeferredBuilder<Changed> builder = new DeferredBuilder<>();
 
     ChangedPaths changedPaths = new ChangedPaths(left, right);
     changedPaths.getIncreased().putAll(right);

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

@@ -38,7 +38,7 @@ public DeferredChanged<ChangedRequestBody> diff(
   @Override
   protected DeferredChanged<ChangedRequestBody> computeDiff(
       HashSet<String> refSet, RequestBody left, RequestBody right, DiffContext context) {
-    DeferredBuilder<Changed> builder = new DeferredBuilder<Changed>();
+    DeferredBuilder<Changed> builder = new DeferredBuilder<>();
 
     Content oldRequestContent = new Content();
     Content newRequestContent = new Content();