fix reader deprecations

allure-framework · Nov 29, 2021 · a20b42a · a20b42a
1 parent d27d555
commit a20b42a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
@@ -17,16 +17,21 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import java.io.IOException;
 import java.util.Objects;
 import java.util.stream.Stream;
 
 /**
- * @author charlie (Dmitry Baev).
  * @param <T> the enum's type
+ * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link 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;

diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
@@ -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).
@@ -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();
     }
 }
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
@@ -15,11 +15,16 @@
  */
 package io.qameta.allure.reader;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import io.qameta.allure.model.Parameter;
 
 /**
  * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
     public ParameterModeDeserializer() {
         super(Parameter.Mode.class);

diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
@@ -15,11 +15,16 @@
  */
 package io.qameta.allure.reader;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import io.qameta.allure.model.Stage;
 
 /**
  * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 public class StageDeserializer extends AllureEnumDeserializer<Stage> {
     public StageDeserializer() {
         super(Stage.class);

diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
@@ -15,11 +15,16 @@
  */
 package io.qameta.allure.reader;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import io.qameta.allure.model.Status;
 
 /**
  * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 public class StatusDeserializer extends AllureEnumDeserializer<Status> {
     public StatusDeserializer() {
         super(Status.class);