refactor

Author: pjfanning

common/src/main/java/org/apache/drill/common/util/JacksonUtils.java

@@ -57,7 +57,7 @@ public static JsonMapper.Builder createJsonMapperBuilder() {
     // org.apache.drill.metastore.statistics.StatisticsHolder replaces this with
     // a polymorphicTypeValidator that allows only the types it needs
     return JsonMapper.builder()
-        .polymorphicTypeValidator(BasicPolymorphicTypeValidator.builder().build());
+        .polymorphicTypeValidator(createPolymorphicTypeValidator());
   }
 
   /**
@@ -66,34 +66,7 @@ public static JsonMapper.Builder createJsonMapperBuilder() {
    * @return an {@link JsonMapper.Builder} instance
    */
   public static JsonMapper.Builder createJsonMapperBuilder(final JsonFactory factory) {
-    // it is deliberate to have polymorphicTypeValidator that allows nothing
-    // for security reasons
-    // org.apache.drill.metastore.statistics.StatisticsHolder replaces this with
-    // a polymorphicTypeValidator that allows only the types it needs
     return JsonMapper.builder(factory)
-        .polymorphicTypeValidator(BasicPolymorphicTypeValidator.builder().build());
-  }
-
-  /**
-   * Creates a new instance of the Jackson {@link JsonMapper.Builder} that has a
-   * <code>PolymorphicTypeValidator</code> applied that allows a curated set of classes
-   * that can be loaded.
-   * @return an {@link JsonMapper.Builder} instance
-   */
-  public static JsonMapper.Builder createJsonMapperBuilderWithPolymorphicTypeValidator() {
-    return createJsonMapperBuilder()
-        .polymorphicTypeValidator(createPolymorphicTypeValidator());
-  }
-
-  /**
-   * Creates a new instance of the Jackson {@link JsonMapper.Builder} that has a
-   * <code>PolymorphicTypeValidator</code> applied that allows a curated set of classes
-   * that can be loaded.
-   * @param factory a {@link JsonFactory} instance
-   * @return an {@link JsonMapper.Builder} instance
-   */
-  public static JsonMapper.Builder createJsonMapperBuilderWithPolymorphicTypeValidator(JsonFactory factory) {
-    return createJsonMapperBuilder(factory)
         .polymorphicTypeValidator(createPolymorphicTypeValidator());
   }
 

exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillStatsTable.java

@@ -470,7 +470,7 @@ public static ObjectMapper getMapper() {
         .addSerializer(TypeProtos.MajorType.class, new MajorTypeSerDe.Se())
         .addDeserializer(TypeProtos.MajorType.class, new MajorTypeSerDe.De())
         .addDeserializer(SchemaPath.class, new SchemaPath.De());
-    ObjectMapper mapper = JacksonUtils.createJsonMapperBuilderWithPolymorphicTypeValidator()
+    ObjectMapper mapper = JacksonUtils.createJsonMapperBuilder()
         .addModule(deModule)
         .build();
     mapper.registerSubtypes(new NamedType(NumericEquiDepthHistogram.class, "numeric-equi-depth"));

exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillValuesRelBase.java

@@ -51,8 +51,7 @@
  */
 public abstract class DrillValuesRelBase extends Values implements DrillRelNode {
 
-  private static final ObjectMapper MAPPER =
-      JacksonUtils.createJsonMapperBuilderWithPolymorphicTypeValidator().build();
+  private static final ObjectMapper MAPPER = JacksonUtils.createObjectMapper();
 
   protected final String content;
 

exec/java-exec/src/main/java/org/apache/drill/exec/store/DrillbitPluginRegistryContext.java

@@ -45,7 +45,7 @@ public DrillbitPluginRegistryContext(DrillbitContext drillbitContext) {
     // to handle HOCON format in the override file
     LogicalPlanPersistence persistence = new LogicalPlanPersistence(drillbitContext.getConfig(),
         drillbitContext.getClasspathScan(),
-        JacksonUtils.createJsonMapperBuilderWithPolymorphicTypeValidator(new HoconFactory()).build());
+        JacksonUtils.createJsonMapperBuilder(new HoconFactory()).build());
     hoconMapper = persistence.getMapper();
   }
 

logical/src/main/java/org/apache/drill/common/config/LogicalPlanPersistence.java

@@ -46,7 +46,7 @@ public class LogicalPlanPersistence {
   private final ObjectMapper mapper;
 
   public LogicalPlanPersistence(DrillConfig conf, ScanResult scanResult) {
-    this(conf, scanResult, JacksonUtils.createJsonMapperBuilderWithPolymorphicTypeValidator().build());
+    this(conf, scanResult, JacksonUtils.createObjectMapper());
   }
 
   public LogicalPlanPersistence(DrillConfig conf, ScanResult scanResult, ObjectMapper mapper) {

metastore/metastore-api/src/main/java/org/apache/drill/metastore/statistics/ColumnStatistics.java

@@ -68,7 +68,7 @@
 public class ColumnStatistics<T> {
 
   private static final ObjectMapper MAPPER =
-      JacksonUtils.createJsonMapperBuilderWithPolymorphicTypeValidator()
+      JacksonUtils.createJsonMapperBuilder()
         .addModule(new JodaModule())
         .build();
 

metastore/metastore-api/src/main/java/org/apache/drill/metastore/statistics/StatisticsHolder.java

@@ -39,8 +39,7 @@
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class StatisticsHolder<T> {
 
-  private static final ObjectMapper OBJECT_MAPPER =
-      JacksonUtils.createJsonMapperBuilderWithPolymorphicTypeValidator().build();
+  private static final ObjectMapper OBJECT_MAPPER = JacksonUtils.createObjectMapper();
   private static final ObjectWriter OBJECT_WRITER = OBJECT_MAPPER.writerFor(StatisticsHolder.class);
   private static final ObjectReader OBJECT_READER = OBJECT_MAPPER.readerFor(StatisticsHolder.class);