From deb6826de6c70fd074bf86206ac09b98088da231 Mon Sep 17 00:00:00 2001 From: Tim Gee Date: Mon, 5 Dec 2022 22:35:26 +0000 Subject: [PATCH] Update for checkstyle --- pom.xml | 4 +- .../core/api/json/AbstractJsonAssert.java | 53 ++++++++++--------- .../trickl/assertj/core/internal/Json.java | 4 +- .../core/util/diff/PostComparisonAction.java | 3 +- .../assertj/util/diff/JsonFieldDelta.java | 6 ++- .../assertj/util/diff/JsonRootDelta.java | 17 +++--- 6 files changed, 47 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index c09708b..a601cf5 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.8.0 1.8 1.8 @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.2.0 com.puppycrawl.tools diff --git a/src/main/java/com/trickl/assertj/core/api/json/AbstractJsonAssert.java b/src/main/java/com/trickl/assertj/core/api/json/AbstractJsonAssert.java index 6284cbf..d3984ab 100644 --- a/src/main/java/com/trickl/assertj/core/api/json/AbstractJsonAssert.java +++ b/src/main/java/com/trickl/assertj/core/api/json/AbstractJsonAssert.java @@ -1,11 +1,9 @@ package com.trickl.assertj.core.api.json; -import static org.skyscreamer.jsonassert.JSONCompareMode.NON_EXTENSIBLE; import com.trickl.assertj.core.internal.Json; import com.trickl.assertj.core.util.diff.PostComparisonAction; import com.trickl.assertj.core.util.diff.WriteOnFailureAction; - import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -27,17 +25,17 @@ public abstract class AbstractJsonAssert> extends AbstractAssert { @VisibleForTesting Json json = Json.instance(); - + private boolean extensible = false; - + private boolean strictOrder = true; - + private boolean writeActualOnFailure = false; - + private Path actualPathOnFailure = null; - + private boolean writeExpectedOnFailure = false; - + private Path expectedPathOnFailure = null; public AbstractJsonAssert(JsonContainer actual, Class selfType) { @@ -59,25 +57,26 @@ public S isSameJsonAs(String expected) { /** * Check if the supplied JSON is the same as expected. + * * @param expected The expected JSON * @return the assertion */ public S isSameJsonAs(JsonContainer expected) { - JSONComparator comparator = new DefaultComparator( - JSONCompareMode.STRICT - .withExtensible(extensible) - .withStrictOrdering(strictOrder)); - + JSONComparator comparator = + new DefaultComparator( + JSONCompareMode.STRICT.withExtensible(extensible).withStrictOrdering(strictOrder)); + PostComparisonAction postComparisonAction = null; if (writeActualOnFailure || writeExpectedOnFailure) { - postComparisonAction = new WriteOnFailureAction( - info, - writeActualOnFailure, - actualPathOnFailure, - writeExpectedOnFailure, - expectedPathOnFailure); + postComparisonAction = + new WriteOnFailureAction( + info, + writeActualOnFailure, + actualPathOnFailure, + writeExpectedOnFailure, + expectedPathOnFailure); } - + json.assertSameJsonAs(info, actual, expected, comparator, postComparisonAction); return myself; } @@ -91,17 +90,19 @@ public S allowingAnyArrayOrdering() { strictOrder = false; return myself; } - + /** * Write the actual output to a temporary file on failure. + * * @return Updated assertion object */ public S writeActualToFileOnFailure() { return writeActualToFileOnFailure(null); } - + /** * Write the actual output to a file on failure. + * * @param path The file path, if null, a temporary file is used * @return Updated assertion object */ @@ -110,17 +111,19 @@ public S writeActualToFileOnFailure(Path path) { actualPathOnFailure = path; return myself; } - + /** * Write the expected output to a temporary file on failure. + * * @return Updated assertion object */ public S writeExpectedToFileOnFailure() { return writeExpectedToFileOnFailure(null); } - + /** * Write the expected output to a file on failure. + * * @param path The file path, if null, a temporary file is used * @return Updated assertion object */ @@ -128,5 +131,5 @@ public S writeExpectedToFileOnFailure(Path path) { writeExpectedOnFailure = true; expectedPathOnFailure = path; return myself; - } + } } diff --git a/src/main/java/com/trickl/assertj/core/internal/Json.java b/src/main/java/com/trickl/assertj/core/internal/Json.java index 6bc1e7a..f01230a 100644 --- a/src/main/java/com/trickl/assertj/core/internal/Json.java +++ b/src/main/java/com/trickl/assertj/core/internal/Json.java @@ -2,7 +2,6 @@ import com.trickl.assertj.core.api.json.JsonContainer; import com.trickl.assertj.core.util.diff.PostComparisonAction; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -34,7 +33,8 @@ public static Json instance() { @VisibleForTesting Failures failures = Failures.instance(); @VisibleForTesting - Json() {} + Json() { + } /** * Asserts that the given JSON structures have same content. diff --git a/src/main/java/com/trickl/assertj/core/util/diff/PostComparisonAction.java b/src/main/java/com/trickl/assertj/core/util/diff/PostComparisonAction.java index 656fe90..3a0b01f 100644 --- a/src/main/java/com/trickl/assertj/core/util/diff/PostComparisonAction.java +++ b/src/main/java/com/trickl/assertj/core/util/diff/PostComparisonAction.java @@ -1,10 +1,9 @@ package com.trickl.assertj.core.util.diff; import java.util.List; - import org.assertj.core.util.diff.Delta; @FunctionalInterface public interface PostComparisonAction { void apply(List> diffs, String actual, String expected); -} \ No newline at end of file +} diff --git a/src/main/java/com/trickl/assertj/util/diff/JsonFieldDelta.java b/src/main/java/com/trickl/assertj/util/diff/JsonFieldDelta.java index 0402280..8ad5909 100644 --- a/src/main/java/com/trickl/assertj/util/diff/JsonFieldDelta.java +++ b/src/main/java/com/trickl/assertj/util/diff/JsonFieldDelta.java @@ -33,10 +33,12 @@ public JsonFieldDelta(FieldComparisonFailure failure, TYPE type) { } @Override - public void applyTo(List target) throws IllegalStateException {} + public void applyTo(List target) throws IllegalStateException { + } @Override - public void verify(List target) throws IllegalStateException {} + public void verify(List target) throws IllegalStateException { + } @Override public String toString() { diff --git a/src/main/java/com/trickl/assertj/util/diff/JsonRootDelta.java b/src/main/java/com/trickl/assertj/util/diff/JsonRootDelta.java index 574fb9a..c600205 100644 --- a/src/main/java/com/trickl/assertj/util/diff/JsonRootDelta.java +++ b/src/main/java/com/trickl/assertj/util/diff/JsonRootDelta.java @@ -25,11 +25,12 @@ public class JsonRootDelta extends Delta { @Getter private final TYPE type = TYPE.CHANGE; /** - * Create a delta for a JSON document. - * @param expected the expected element - * @param actual the actual element - * @param message the optional descriptive message - */ + * Create a delta for a JSON document. + * + * @param expected the expected element + * @param actual the actual element + * @param message the optional descriptive message + */ public JsonRootDelta(String expected, String actual, String message) { super(new Chunk(0, Collections.EMPTY_LIST), new Chunk(0, Collections.EMPTY_LIST)); this.expected = expected; @@ -38,10 +39,12 @@ public JsonRootDelta(String expected, String actual, String message) { } @Override - public void applyTo(List target) throws IllegalStateException {} + public void applyTo(List target) throws IllegalStateException { + } @Override - public void verify(List target) throws IllegalStateException {} + public void verify(List target) throws IllegalStateException { + } @Override public String toString() {