Skip to content

Commit 6bce0e4

Browse files
committed
Clean up changes
1 parent 8458bc4 commit 6bce0e4

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
usage seems to benefit from actually specifying version here in case
8181
it is dependent on transitively
8282
-->
83-
<version>2.16.0-SNAPSHOT-joohyukkim</version>
83+
<version>${jackson.version.annotations}</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>com.fasterxml.jackson.core</groupId>

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class StdTypeResolverBuilder
4747

4848
/**
4949
* Boolean value configured through {@link JsonTypeInfo#requireTypeIdForSubtypes}.
50-
* If not {@code null}, this value overrides the global configuration of
50+
* If this value is not {@code null}, this value overrides the global configuration of
5151
* {@link com.fasterxml.jackson.databind.MapperFeature#REQUIRE_TYPE_ID_FOR_SUBTYPES}.
5252
*
5353
* @since 2.16
@@ -419,9 +419,9 @@ protected boolean allowPrimitiveTypes(MapperConfig<?> config,
419419

420420
/**
421421
* Determines whether strict type ID handling should be used for this type or not.
422-
* This will return as configured by {@link JsonTypeInfo#requireTypeIdForSubtypes()}
423-
* if the value is not {@code OptBoolean.DEFAULT}.
424-
* Otherwise,This will be enabled when either the type has type resolver annotations or if
422+
* This will be enabld as configured by {@link JsonTypeInfo#requireTypeIdForSubtypes()}
423+
* unless its value is {@code OptBoolean.DEFAULT}. Otherwise,
424+
* this will be enabled when either the type has type resolver annotations or if
425425
* {@link com.fasterxml.jackson.databind.MapperFeature#REQUIRE_TYPE_ID_FOR_SUBTYPES}
426426
* is enabled.
427427
*
@@ -431,7 +431,7 @@ protected boolean allowPrimitiveTypes(MapperConfig<?> config,
431431
* @return {@code true} if the class has type resolver annotations, or the strict
432432
* handling feature is enabled, {@code false} otherwise.
433433
*
434-
* @since 2.16
434+
* @since 2.15
435435
*/
436436
protected boolean _strictTypeIdHandling(DeserializationConfig config, JavaType baseType) {
437437
// [databind#3877]: allow configuration of per-type strict type handling

src/test/java/com/fasterxml/jackson/databind/jsontype/OverrideStrictTypeInfoHandling3877Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void testMissingTypeId() throws Exception {
7676
verifySuccessWithNonNullAndType("{}", DoDefaultCommand.class, DISABLED_MAPPER);
7777
}
7878

79-
public void testSuccessWithTypeId() throws Exception {
79+
public void testSuccessWhenTypeIdIsProvided() throws Exception {
8080
verifySuccessWithNonNullAndType(a2q("{'@type': 'do-false'}"), FalseCommand.class, ENABLED_MAPPER);
8181
verifySuccessWithNonNullAndType(a2q("{'@type': 'do-false'}"), FalseCommand.class, DEFAULT_MAPPER);
8282
verifySuccessWithNonNullAndType(a2q("{'@type': 'do-false'}"), FalseCommand.class, DISABLED_MAPPER);

0 commit comments

Comments
 (0)