Skip to content

Extension: find changes when nothing changed #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import com.qdesrame.openapi.diff.model.Changed;
import com.qdesrame.openapi.diff.model.DiffContext;

import java.util.Optional;

public interface ExtensionDiff {

ExtensionDiff setOpenApiDiff(OpenApiDiff openApiDiff);

String getName();

Optional<Changed> diff(Change extension, DiffContext context);
Changed diff(Change extension, DiffContext context);

default boolean isParentApplicable(Change.Type type, Object object, Object extension, DiffContext context) {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import com.qdesrame.openapi.diff.model.Change;
import com.qdesrame.openapi.diff.model.Changed;
import com.qdesrame.openapi.diff.model.CompatibleChanged;
import com.qdesrame.openapi.diff.model.DiffContext;
import com.qdesrame.openapi.diff.model.schema.ChangedExtensions;

import java.util.*;
import java.util.function.Function;

import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
import static com.qdesrame.openapi.diff.utils.Copy.copyMap;

public class ExtensionsDiff {
private final OpenApiDiff openApiDiff;
Expand Down Expand Up @@ -51,27 +51,29 @@ public Optional<ChangedExtensions> diff(Map<String, Object> left, Map<String, Ob
}

public Optional<ChangedExtensions> diff(Map<String, Object> left, Map<String, Object> right, DiffContext context) {
if (null == left) left = new LinkedHashMap<>();
if (null == right) right = new LinkedHashMap<>();
ChangedExtensions changedExtensions = new ChangedExtensions(left, new LinkedHashMap<>(right), context);
left = copyMap(left);
right = copyMap(right);
ChangedExtensions changedExtensions = new ChangedExtensions(left, copyMap(right), context);
for (String key : left.keySet()) {
Object leftValue = left.get(key);
if (right.containsKey(key)) {
Object rightValue = right.remove(key);
executeExtensionDiff(key, Change.changed(leftValue, rightValue), context)
.filter(Changed::isDifferent)
.ifPresent(changed -> changedExtensions.getChanged().put(key, changed));
} else {
executeExtensionDiff(key, Change.removed(leftValue), context)
.filter(Changed::isDifferent)
.ifPresent(changed -> changedExtensions.getMissing().put(key, changed));
}
}
right.forEach((key, value) -> executeExtensionDiff(key, Change.added(value), context)
.filter(Changed::isDifferent)
.ifPresent(changed -> changedExtensions.getIncreased().put(key, changed)));
return isChanged(changedExtensions);
}

private Optional<Changed> executeExtensionDiff(String name, Change change, DiffContext context) {
return executeExtension(name, diff -> diff.setOpenApiDiff(openApiDiff).diff(change, context))
.orElse(Optional.of(CompatibleChanged.compatible(change)));
return executeExtension(name, diff -> diff.setOpenApiDiff(openApiDiff).diff(change, context));
}
}
14 changes: 14 additions & 0 deletions src/main/java/com/qdesrame/openapi/diff/utils/Copy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.qdesrame.openapi.diff.utils;

import java.util.LinkedHashMap;
import java.util.Map;

public class Copy {
public static <K, V> Map<K, V> copyMap(Map<K, V> map) {
if (map == null) {
return new LinkedHashMap<>();
} else {
return new LinkedHashMap<>(map);
}
}
}