Skip to content
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.

Sign up for GitHub

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

[allure-jsonunit] Deprecate AllureConfigurableJsonMatcher in favor of ConfigurableJsonMatcher #1060

Merged
merged 1 commit into from
Jul 5, 2024
Merged

[allure-jsonunit] Deprecate AllureConfigurableJsonMatcher in favor of ConfigurableJsonMatcher #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
import org.hamcrest.Matcher;

import net.javacrumbs.jsonunit.core.Configuration;
import net.javacrumbs.jsonunit.core.ConfigurationWhen.ApplicableForPath;
import net.javacrumbs.jsonunit.core.ConfigurationWhen.PathsParam;
import net.javacrumbs.jsonunit.core.Option;
import net.javacrumbs.jsonunit.core.internal.Diff;
import net.javacrumbs.jsonunit.core.internal.Options;
import net.javacrumbs.jsonunit.core.listener.DifferenceListener;

/**
* Сontains basic matcher functionality and implementation of methods for matching configuration.
* Contains basic matcher functionality and implementation of methods for matching configuration.
*
* @param <T> the type
*/
Expand Down Expand Up @@ -54,6 +56,11 @@ public T when(final Option first, final Option... next) {
return (T) this;
}

public T when(final PathsParam pathsParam, final ApplicableForPath... applicableForPaths) {
this.configuration = this.configuration.when(pathsParam, applicableForPaths);
return (T) this;
}

public T withOptions(final Options options) {
this.configuration = configuration.withOptions(options);
return (T) this;
Expand Down
2 changes: 2 additions & 0 deletions allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
/**
* @param <T> the type of matcher
* @see net.javacrumbs.jsonunit.ConfigurableJsonMatcher
* @deprecated Use {@link net.javacrumbs.jsonunit.ConfigurableJsonMatcher}
*/
@Deprecated
public interface AllureConfigurableJsonMatcher<T> extends Matcher<T> {

AllureConfigurableJsonMatcher<T> withTolerance(BigDecimal tolerance);
Expand Down
7 changes: 4 additions & 3 deletions allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import io.qameta.allure.attachment.DefaultAttachmentProcessor;
import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
import net.javacrumbs.jsonunit.ConfigurableJsonMatcher;
import net.javacrumbs.jsonunit.core.listener.DifferenceListener;

import org.hamcrest.Description;
Expand All @@ -28,16 +29,16 @@
* @param <T> the type
*/
@SuppressWarnings("unused")
public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<AllureConfigurableJsonMatcher<T>>
implements AllureConfigurableJsonMatcher<T> {
public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<ConfigurableJsonMatcher<T>>
implements ConfigurableJsonMatcher<T> {

private final Object expected;

private JsonPatchMatcher(final Object expected) {
this.expected = expected;
}

public static <T> AllureConfigurableJsonMatcher<T> jsonEquals(final Object expected) {
public static <T> ConfigurableJsonMatcher<T> jsonEquals(final Object expected) {
return new JsonPatchMatcher<T>(expected);
}

Expand Down
Loading