Skip to content

Commit 84c6c3c

Browse files
committed
Minor fix to int->long for MapperFeatures change
1 parent 842597e commit 84c6c3c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/main/java/com/fasterxml/jackson/databind/MapperFeature.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ public enum MapperFeature implements ConfigFeature
577577
private final long _mask;
578578

579579
// @since 2.13
580-
public static int collectLongDefaults() {
581-
int flags = 0;
580+
public static long collectLongDefaults() {
581+
long flags = 0;
582582
for (MapperFeature value : MapperFeature.values()) {
583583
if (value.enabledByDefault()) {
584584
flags |= value.getLongMask();

src/test/java/com/fasterxml/jackson/databind/mixins/MapperMixinsCopy1998Test.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public MyChildB(String name) {
8888
}
8989
}
9090

91+
@SuppressWarnings("deprecation")
9192
public void testB_KO() throws Exception
9293
{
9394
final ObjectMapper DEFAULT = defaultMapper();

src/test/java/com/fasterxml/jackson/databind/module/TestDuplicateRegistration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ public void setupModule(SetupContext context) {
2828
}
2929
}
3030

31+
@SuppressWarnings("deprecation")
3132
public void testDuplicateRegistration() throws Exception
3233
{
3334
// by default, duplicate registration should be prevented
34-
ObjectMapper mapper = new ObjectMapper();
35+
ObjectMapper mapper = newJsonMapper();
3536
assertTrue(mapper.isEnabled(MapperFeature.IGNORE_DUPLICATE_MODULE_REGISTRATIONS));
3637
MyModule module = new MyModule();
3738
mapper.registerModule(module);

0 commit comments

Comments
 (0)