Demote isEnabled(DatatypeFeature) in MapperConfig

FasterXML · Feb 9, 2023 · 6c8c151 · 6c8c151
1 parent 4fca162
commit 6c8c151
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationConfig.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationConfig.java
@@ -889,17 +889,11 @@ public final boolean requiresFullValue() {
  *
  * @since 2.14
  */
+ @Override
  public final boolean isEnabled(DatatypeFeature feature) {
  return _datatypeFeatures.isEnabled(feature);
  }
 
- /**
- * @since 2.15
- */
- public final DatatypeFeatures getDatatypeFeatures() {
- return _datatypeFeatures;
- }
-
  /*
  /**********************************************************
  /* Other configuration

diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java b/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java
@@ -863,17 +863,11 @@ public final int getSerializationFeatures() {
  *
  * @since 2.14
  */
+ @Override
  public final boolean isEnabled(DatatypeFeature feature) {
  return _datatypeFeatures.isEnabled(feature);
  }
 
- /**
- * @since 2.15
- */
- public final DatatypeFeatures getDatatypeFeatures() {
- return _datatypeFeatures;
- }
-
  /**
  * Method for getting provider used for locating filters given
  * id (which is usually provided with filter annotations).

diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java
@@ -163,6 +163,23 @@ public final boolean hasMapperFeatures(int featureMask) {
  return (_mapperFeatures & featureMask) == featureMask;
  }
 
+ /**
+ * Accessor for checking whether give {@link DatatypeFeature}
+ * is enabled or not.
+ *
+ * @param feature Feature to check
+ *
+ * @return True if feature is enabled; false otherwise
+ *
+ * @since 2.15
+ */
+ public abstract boolean isEnabled(DatatypeFeature feature);
+
+ /**
+ * @since 2.15
+ */
+ public abstract DatatypeFeatures getDatatypeFeatures();
+
  /**
  * Method for determining whether annotation processing is enabled or not
  * (default settings are typically that it is enabled; must explicitly disable).

diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java
@@ -673,6 +673,11 @@ public T withRootName(String rootName) {
  /**********************************************************************
  */
 
+ @Override
+ public final DatatypeFeatures getDatatypeFeatures() {
+ return _datatypeFeatures;
+ }
+
  /**
  * Accessor for object used for finding out all reachable subtypes
  * for supertypes; needed when a logical type name is used instead

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java b/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
@@ -15,7 +15,6 @@
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.introspect.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
@@ -874,8 +873,8 @@ public void depositSchemaProperty(ObjectNode propertiesNode,
  ser = provider.findValueSerializer(getType(), this);
  }
  boolean isOptional = !isRequired();
- if (ser instanceof SchemaAware) {
- schemaNode = ((SchemaAware) ser).getSchema(provider, hint,
+ if (ser instanceof com.fasterxml.jackson.databind.jsonschema.SchemaAware) {
+ schemaNode = ((com.fasterxml.jackson.databind.jsonschema.SchemaAware) ser).getSchema(provider, hint,
  isOptional);
  } else {
  schemaNode = com.fasterxml.jackson.databind.jsonschema.JsonSchema