Skip to content

Fix exceptions in HTML and Markdown renderers with removed property #8

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
Jun 24, 2020
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 @@ -269,7 +269,16 @@ private void properties(
Map<String, Schema> properties,
DiffContext context) {
if (properties != null) {
properties.forEach((key, value) -> property(output, propPrefix + key, title, resolve(value)));
properties.forEach((key, value) -> resolveProperty(output, propPrefix, key, value, title));
}
}

private void resolveProperty(
ContainerTag output, String propPrefix, String key, Schema value, String title) {
try {
property(output, propPrefix + key, title, resolve(value));
} catch (Exception e) {
property(output, propPrefix + key, title, type(value));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ protected String properties(
if (properties != null) {
properties.forEach(
(key, value) -> {
sb.append(property(deepness, title, key, resolve(value)));
sb.append(resolveProperty(deepness, value, key, title));
if (showContent) {
sb.append(schema(deepness + 1, resolve(value), context));
}
Expand All @@ -390,6 +390,14 @@ protected String properties(
return sb.toString();
}

private String resolveProperty(int deepness, Schema value, String key, String title) {
try {
return property(deepness, title, key, resolve(value));
} catch (Exception e) {
return property(deepness, title, key, type(value), "");
}
}

protected String property(int deepness, String name, ChangedSchema schema) {
StringBuilder sb = new StringBuilder();
String type = type(schema.getNewSchema());
Expand Down
18 changes: 18 additions & 0 deletions core/src/test/java/com/qdesrame/openapi/test/HtmlRenderTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.qdesrame.openapi.test;

import static org.assertj.core.api.Assertions.assertThat;

import com.qdesrame.openapi.diff.core.OpenApiCompare;
import com.qdesrame.openapi.diff.core.model.ChangedOpenApi;
import com.qdesrame.openapi.diff.core.output.HtmlRender;
import org.junit.jupiter.api.Test;

public class HtmlRenderTest {
@Test
public void renderDoesNotFailWhenPropertyHasBeenRemoved() {
HtmlRender render = new HtmlRender();
ChangedOpenApi diff =
OpenApiCompare.fromLocations("missing_property_1.yaml", "missing_property_2.yaml");
assertThat(render.render(diff)).isNotBlank();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.qdesrame.openapi.test;

import static org.assertj.core.api.Assertions.assertThat;

import com.qdesrame.openapi.diff.core.OpenApiCompare;
import com.qdesrame.openapi.diff.core.model.ChangedOpenApi;
import com.qdesrame.openapi.diff.core.output.MarkdownRender;
import org.junit.jupiter.api.Test;

public class MarkdownRenderTest {
@Test
public void renderDoesNotFailWhenPropertyHasBeenRemoved() {
MarkdownRender render = new MarkdownRender();
ChangedOpenApi diff =
OpenApiCompare.fromLocations("missing_property_1.yaml", "missing_property_2.yaml");
assertThat(render.render(diff)).isNotBlank();
}
}