int,
* 8-byte for long and so on).
+ *+ * Default value is {@code true} meaning that minimal representation is used + * when encoding. */ WRITE_MINIMAL_INTS(true), diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java index e67073aef..90aa096ee 100644 --- a/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java +++ b/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java @@ -151,4 +151,12 @@ public void testNegativeBigIntegerWithoutLeadingZero() throws Exception { assertEquals(BigInteger.ONE, mapper2.readValue(encodedNegative, BigInteger.class)); } + + // [dataformats-binary#619] + @Test + void testFormatFeatureDefaults() { + CBORMapper mapper = CBORMapper.shared(); + assertTrue(mapper.isEnabled(CBORReadFeature.DECODE_USING_STANDARD_NEGATIVE_BIGINT_ENCODING)); + assertTrue(mapper.isEnabled(CBORWriteFeature.WRITE_MINIMAL_INTS)); + } } diff --git a/ion/src/main/java/tools/jackson/dataformat/ion/IonObjectMapper.java b/ion/src/main/java/tools/jackson/dataformat/ion/IonObjectMapper.java index 47992e4e1..29f48f872 100644 --- a/ion/src/main/java/tools/jackson/dataformat/ion/IonObjectMapper.java +++ b/ion/src/main/java/tools/jackson/dataformat/ion/IonObjectMapper.java @@ -27,6 +27,7 @@ import tools.jackson.databind.deser.DeserializationContextExt; import tools.jackson.databind.module.SimpleModule; import tools.jackson.databind.ser.SerializationContextExt; + import tools.jackson.dataformat.ion.ionvalue.IonValueModule; import com.amazon.ion.IonDatagram; @@ -276,6 +277,21 @@ public IonFactory tokenStreamFactory() { return (IonFactory) _streamFactory; } + /* + /********************************************************************** + /* Format-specific + /********************************************************************** + */ + + public boolean isEnabled(IonReadFeature f) { + return _deserializationConfig.hasFormatFeature(f); + } + + public boolean isEnabled(IonWriteFeature f) { + return _serializationConfig.hasFormatFeature(f); + } + + /* /************************************************************************ /* Additional convenience factory methods for parsers, generators diff --git a/ion/src/test/java/tools/jackson/dataformat/ion/misc/FeatureDefaultsTest.java b/ion/src/test/java/tools/jackson/dataformat/ion/misc/FeatureDefaultsTest.java new file mode 100644 index 000000000..01e5fd597 --- /dev/null +++ b/ion/src/test/java/tools/jackson/dataformat/ion/misc/FeatureDefaultsTest.java @@ -0,0 +1,18 @@ +package tools.jackson.dataformat.ion.misc; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +import tools.jackson.dataformat.ion.*; + +public class FeatureDefaultsTest +{ + // [dataformats-binary#619] + @Test + void testFormatFeatureDefaults() { + IonObjectMapper mapper = IonObjectMapper.shared(); + assertTrue(mapper.isEnabled(IonReadFeature.USE_NATIVE_TYPE_ID)); + assertTrue(mapper.isEnabled(IonWriteFeature.USE_NATIVE_TYPE_ID)); + } +} diff --git a/release-notes/CREDITS b/release-notes/CREDITS index 27f14275c..f4be9d990 100644 --- a/release-notes/CREDITS +++ b/release-notes/CREDITS @@ -15,6 +15,11 @@ Fawzi Essam (@iifawzi) * Contributed #582: Change defaults for `CBORReadFeature.DECODE_USING_STANDARD_NEGATIVE_BIGINT_ENCODING` and `CBORWriteFeature.ENCODE_USING_STANDARD_NEGATIVE_BIGINT_ENCODING` to `true` (enabled) (3.0.0) -* Contribited #591: Change `CBOR` Features defaults for 3.0 +* Contributed #591: Change `CBOR` Features defaults for 3.0 (3.0.0) +Andy Wilkinson (@wilkinsona) + +* Requested #619: (avro, cbor, ion, smile) Add `isEnabled()` methods for format-specific features + (like `CBORReadFeature` and `CBORWriteFeature`) to mappers + (3.1.0) diff --git a/release-notes/VERSION b/release-notes/VERSION index 35dc1b424..b0f66b7fd 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -14,6 +14,12 @@ implementations) === Releases === ------------------------------------------------------------------------ +3.1.0 (not yet released) + +#619: (avro, cbor, ion, smile) Add `isEnabled()` methods for format-specific features + (like `CBORReadFeature` and `CBORWriteFeature`) to mappers + (requested by Andy W) + 3.0.1 (21-Oct-2025) No changes since 3.0.0 diff --git a/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java b/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java index 55bbb107d..036401200 100644 --- a/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java +++ b/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java @@ -173,6 +173,20 @@ public SmileFactory tokenStreamFactory() { return (SmileFactory) _streamFactory; } + /* + /********************************************************************** + /* Format-specific + /********************************************************************** + */ + + public boolean isEnabled(SmileReadFeature f) { + return _deserializationConfig.hasFormatFeature(f); + } + + public boolean isEnabled(SmileWriteFeature f) { + return _serializationConfig.hasFormatFeature(f); + } + /* /********************************************************************** /* Helper class(es) diff --git a/smile/src/main/java/tools/jackson/dataformat/smile/SmileReadFeature.java b/smile/src/main/java/tools/jackson/dataformat/smile/SmileReadFeature.java index ea00d8489..1b9677187 100644 --- a/smile/src/main/java/tools/jackson/dataformat/smile/SmileReadFeature.java +++ b/smile/src/main/java/tools/jackson/dataformat/smile/SmileReadFeature.java @@ -14,6 +14,8 @@ public enum SmileReadFeature implements FormatFeature * or optional. If enabled, it means that only input that starts with the header * is accepted as valid; if disabled, header is optional. In latter case, * settings for content are assumed to be defaults. + *
+ * Feature is enabled by default. */ REQUIRE_HEADER(true) ; diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java index 63830fd4a..4904ebdc8 100644 --- a/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java +++ b/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java @@ -3,15 +3,15 @@ import org.junit.jupiter.api.Test; import tools.jackson.databind.*; -import tools.jackson.dataformat.smile.BaseTestForSmile; -import tools.jackson.dataformat.smile.SmileFactory; -import tools.jackson.dataformat.smile.SmileMapper; + +import tools.jackson.dataformat.smile.*; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MapperFeaturesTest extends BaseTestForSmile { - static class Bean { + public static class Bean { public int value; } @@ -35,4 +35,12 @@ public void testIndent() throws Exception Bean result = mapper.readValue(smile, 0, smile.length, Bean.class); assertEquals(42, result.value); } + + // [dataformats-binary#619] + @Test + void testFormatFeatureDefaults() { + SmileMapper mapper = SmileMapper.shared(); + assertTrue(mapper.isEnabled(SmileReadFeature.REQUIRE_HEADER)); + assertTrue(mapper.isEnabled(SmileWriteFeature.WRITE_HEADER)); + } }