Skip to content

Fix reader deprecations #686

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

Merged
baev merged 3 commits into from
Nov 30, 2021
Merged

Fix reader deprecations #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97693d6
fix reader deprecations
baev Nov 29, 2021
b13ee95
fix build
baev Nov 30, 2021
11bc4ee
fix it
baev Nov 30, 2021
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
5 changes: 4 additions & 1 deletion allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
import java.util.stream.Stream;

/**
* @author charlie (Dmitry Baev).
* @param <T> the enum's type
* @author charlie (Dmitry Baev).
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
*/
@Deprecated
/* package-private */ abstract class AllureEnumDeserializer<T extends Enum<T>> extends StdDeserializer<T> {

private final Class<T> type;
Expand Down
18 changes: 8 additions & 10 deletions allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import io.qameta.allure.model.Parameter;
import io.qameta.allure.model.Stage;
import io.qameta.allure.model.Status;
import com.fasterxml.jackson.databind.json.JsonMapper;

/**
* @author charlie (Dmitry Baev).
Expand All @@ -33,14 +30,15 @@ private AllureObjectMapperFactory() {
}

public static ObjectMapper createMapper() {
return new ObjectMapper()
return JsonMapper.builder()
.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
.registerModule(new SimpleModule()
.addDeserializer(Status.class, new StatusDeserializer())
.addDeserializer(Stage.class, new StageDeserializer())
.addDeserializer(Parameter.Mode.class, new ParameterModeDeserializer())
);
.disable(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES)
.disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
.disable(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)
.build();
}
}
3 changes: 3 additions & 0 deletions allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

/**
* @author charlie (Dmitry Baev).
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
*/
@Deprecated
public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
public ParameterModeDeserializer() {
super(Parameter.Mode.class);
Expand Down
3 changes: 3 additions & 0 deletions allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

/**
* @author charlie (Dmitry Baev).
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
*/
@Deprecated
public class StageDeserializer extends AllureEnumDeserializer<Stage> {
public StageDeserializer() {
super(Stage.class);
Expand Down
3 changes: 3 additions & 0 deletions allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

/**
* @author charlie (Dmitry Baev).
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
*/
@Deprecated
public class StatusDeserializer extends AllureEnumDeserializer<Status> {
public StatusDeserializer() {
super(Status.class);
Expand Down