Skip to content

Fix Jackson deprecation warnings in MessagePackFactory #903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2025
Merged

Fix Jackson deprecation warnings in MessagePackFactory #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f453da8
Fix Jackson deprecation warnings in MessagePackFactory
xerial Jul 19, 2025
5380279
Fix Jackson deprecation warnings in MessagePackParserTest
xerial Jul 19, 2025
48271bd
Fix all remaining Jackson deprecation warnings
xerial Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.io.ContentReference;
import com.fasterxml.jackson.core.io.IOContext;
import org.msgpack.core.MessagePack;
import org.msgpack.core.annotations.VisibleForTesting;
Expand Down Expand Up @@ -111,15 +112,15 @@ public JsonGenerator createGenerator(Writer w)
public JsonParser createParser(byte[] data)
throws IOException
{
IOContext ioContext = _createContext(data, false);
IOContext ioContext = _createContext(ContentReference.rawReference(data), false);
return _createParser(data, 0, data.length, ioContext);
}

@Override
public JsonParser createParser(InputStream in)
throws IOException
{
IOContext ioContext = _createContext(in, false);
IOContext ioContext = _createContext(ContentReference.rawReference(in), false);
return _createParser(in, ioContext);
}

Expand Down
10 changes: 8 additions & 2 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.core.SerializableString;
import com.fasterxml.jackson.core.base.GeneratorBase;
import com.fasterxml.jackson.core.io.ContentReference;
import com.fasterxml.jackson.core.io.IOContext;
import com.fasterxml.jackson.core.io.SerializedString;
import com.fasterxml.jackson.core.json.JsonWriteContext;
import com.fasterxml.jackson.core.util.BufferRecycler;
import org.msgpack.core.MessagePack;
import org.msgpack.core.MessagePacker;
import org.msgpack.core.annotations.Nullable;
Expand Down Expand Up @@ -185,21 +189,23 @@ else if (value instanceof NodeArray) {
}

// This is an internal constructor for nested serialization.
@SuppressWarnings("deprecation")
private MessagePackGenerator(
int features,
ObjectCodec codec,
OutputStream out,
MessagePack.PackerConfig packerConfig,
boolean supportIntegerKeys)
{
super(features, codec);
super(features, codec, new IOContext(new BufferRecycler(), ContentReference.rawReference(out), false), JsonWriteContext.createRootContext(null));
this.output = out;
this.messagePacker = packerConfig.newPacker(out);
this.packerConfig = packerConfig;
this.nodes = new ArrayList<>();
this.supportIntegerKeys = supportIntegerKeys;
}

@SuppressWarnings("deprecation")
public MessagePackGenerator(
int features,
ObjectCodec codec,
Expand All @@ -209,7 +215,7 @@ public MessagePackGenerator(
boolean supportIntegerKeys)
throws IOException
{
super(features, codec);
super(features, codec, new IOContext(new BufferRecycler(), ContentReference.rawReference(out), false), JsonWriteContext.createRootContext(null));
this.output = out;
this.messagePacker = packerConfig.newPacker(getMessageBufferOutputForOutputStream(out, reuseResourceInGenerator));
this.packerConfig = packerConfig;
Expand Down
21 changes: 18 additions & 3 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private MessagePackParser(IOContext ctxt,
boolean reuseResourceInParser)
throws IOException
{
super(features);
super(features, ctxt.streamReadConstraints());

this.codec = objectCodec;
ioContext = ctxt;
Expand Down Expand Up @@ -583,15 +583,29 @@ public JsonStreamContext getParsingContext()
}

@Override
public JsonLocation currentTokenLocation()
{
return new JsonLocation(ioContext.contentReference(), tokenPosition, -1, -1);
}

@Override
public JsonLocation currentLocation()
{
return new JsonLocation(ioContext.contentReference(), currentPosition, -1, -1);
}

@Override
@Deprecated
public JsonLocation getTokenLocation()
{
return new JsonLocation(ioContext.getSourceReference(), tokenPosition, -1, -1, (int) tokenPosition);
return currentTokenLocation();
}

@Override
@Deprecated
public JsonLocation getCurrentLocation()
{
return new JsonLocation(ioContext.getSourceReference(), currentPosition, -1, -1, (int) currentPosition);
return currentLocation();
}

@Override
Expand Down Expand Up @@ -627,6 +641,7 @@ public boolean isCurrentFieldId()
}

@Override
@Deprecated
public String getCurrentName()
throws IOException
{
Expand Down
9 changes: 9 additions & 0 deletions ...ck-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackSerializerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
package org.msgpack.jackson.dataformat;

import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializationConfig;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig;
import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;

Expand All @@ -43,6 +45,13 @@ public MessagePackSerializerFactory(SerializerFactoryConfig config)
}

@Override
public JsonSerializer<Object> createKeySerializer(SerializerProvider prov, JavaType keyType, JsonSerializer<Object> defaultImpl) throws JsonMappingException
{
return new MessagePackKeySerializer();
}

@Override
@Deprecated
public JsonSerializer<Object> createKeySerializer(SerializationConfig config, JavaType keyType, JsonSerializer<Object> defaultImpl)
{
return new MessagePackKeySerializer();
Expand Down
38 changes: 19 additions & 19 deletions msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,43 +317,43 @@ public void testMessagePackParserDirectly()

JsonToken jsonToken = parser.nextToken();
assertEquals(JsonToken.START_OBJECT, jsonToken);
assertEquals(-1, parser.getTokenLocation().getLineNr());
assertEquals(0, parser.getTokenLocation().getColumnNr());
assertEquals(-1, parser.getCurrentLocation().getLineNr());
assertEquals(1, parser.getCurrentLocation().getColumnNr());
assertEquals(-1, parser.currentTokenLocation().getLineNr());
assertEquals(0, parser.currentTokenLocation().getColumnNr());
assertEquals(-1, parser.currentLocation().getLineNr());
assertEquals(1, parser.currentLocation().getColumnNr());

jsonToken = parser.nextToken();
assertEquals(JsonToken.FIELD_NAME, jsonToken);
assertEquals("zero", parser.getCurrentName());
assertEquals(1, parser.getTokenLocation().getColumnNr());
assertEquals(6, parser.getCurrentLocation().getColumnNr());
assertEquals("zero", parser.currentName());
assertEquals(1, parser.currentTokenLocation().getColumnNr());
assertEquals(6, parser.currentLocation().getColumnNr());

jsonToken = parser.nextToken();
assertEquals(JsonToken.VALUE_NUMBER_INT, jsonToken);
assertEquals(0, parser.getIntValue());
assertEquals(6, parser.getTokenLocation().getColumnNr());
assertEquals(7, parser.getCurrentLocation().getColumnNr());
assertEquals(6, parser.currentTokenLocation().getColumnNr());
assertEquals(7, parser.currentLocation().getColumnNr());

jsonToken = parser.nextToken();
assertEquals(JsonToken.FIELD_NAME, jsonToken);
assertEquals("one", parser.getCurrentName());
assertEquals(7, parser.getTokenLocation().getColumnNr());
assertEquals(11, parser.getCurrentLocation().getColumnNr());
assertEquals("one", parser.currentName());
assertEquals(7, parser.currentTokenLocation().getColumnNr());
assertEquals(11, parser.currentLocation().getColumnNr());
parser.overrideCurrentName("two");
assertEquals("two", parser.getCurrentName());
assertEquals("two", parser.currentName());

jsonToken = parser.nextToken();
assertEquals(JsonToken.VALUE_NUMBER_FLOAT, jsonToken);
assertEquals(1.0f, parser.getIntValue(), 0.001f);
assertEquals(11, parser.getTokenLocation().getColumnNr());
assertEquals(16, parser.getCurrentLocation().getColumnNr());
assertEquals(11, parser.currentTokenLocation().getColumnNr());
assertEquals(16, parser.currentLocation().getColumnNr());

jsonToken = parser.nextToken();
assertEquals(JsonToken.END_OBJECT, jsonToken);
assertEquals(-1, parser.getTokenLocation().getLineNr());
assertEquals(16, parser.getTokenLocation().getColumnNr());
assertEquals(-1, parser.getCurrentLocation().getLineNr());
assertEquals(16, parser.getCurrentLocation().getColumnNr());
assertEquals(-1, parser.currentTokenLocation().getLineNr());
assertEquals(16, parser.currentTokenLocation().getColumnNr());
assertEquals(-1, parser.currentLocation().getLineNr());
assertEquals(16, parser.currentLocation().getColumnNr());

parser.close();
parser.close(); // Intentional
Expand Down
Loading