Skip to content

Commit d35fb9d

Browse files
authored
fix reader deprecations (via #686)
1 parent f7be472 commit d35fb9d

File tree

5 files changed

+21
-11
lines changed

5 files changed

+21
-11
lines changed

allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@
2424
import java.util.stream.Stream;
2525

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

3235
private final Class<T> type;

allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
import com.fasterxml.jackson.databind.DeserializationFeature;
1919
import com.fasterxml.jackson.databind.MapperFeature;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import com.fasterxml.jackson.databind.module.SimpleModule;
22-
import io.qameta.allure.model.Parameter;
23-
import io.qameta.allure.model.Stage;
24-
import io.qameta.allure.model.Status;
21+
import com.fasterxml.jackson.databind.json.JsonMapper;
2522

2623
/**
2724
* @author charlie (Dmitry Baev).
@@ -33,14 +30,15 @@ private AllureObjectMapperFactory() {
3330
}
3431

3532
public static ObjectMapper createMapper() {
36-
return new ObjectMapper()
33+
return JsonMapper.builder()
3734
.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
3835
.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
36+
.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
37+
.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)
3938
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
40-
.registerModule(new SimpleModule()
41-
.addDeserializer(Status.class, new StatusDeserializer())
42-
.addDeserializer(Stage.class, new StageDeserializer())
43-
.addDeserializer(Parameter.Mode.class, new ParameterModeDeserializer())
44-
);
39+
.disable(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES)
40+
.disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
41+
.disable(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)
42+
.build();
4543
}
4644
}

allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
/**
2121
* @author charlie (Dmitry Baev).
22+
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
23+
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
2224
*/
25+
@Deprecated
2326
public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
2427
public ParameterModeDeserializer() {
2528
super(Parameter.Mode.class);

allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
/**
2121
* @author charlie (Dmitry Baev).
22+
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
23+
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
2224
*/
25+
@Deprecated
2326
public class StageDeserializer extends AllureEnumDeserializer<Stage> {
2427
public StageDeserializer() {
2528
super(Stage.class);

allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
/**
2121
* @author charlie (Dmitry Baev).
22+
* @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
23+
* and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
2224
*/
25+
@Deprecated
2326
public class StatusDeserializer extends AllureEnumDeserializer<Status> {
2427
public StatusDeserializer() {
2528
super(Status.class);

0 commit comments

Comments
 (0)