From 49223ee13fbb0d8030dbf5d999f2ad11fb073501 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 4 Jan 2021 21:16:04 -0800 Subject: [PATCH] Small fixes wrt lgtm.com's suggestions --- .../jackson/dataformat/avro/AvroTypeIdResolver.java | 8 +++++--- .../dataformat/avro/deser/JacksonAvroParserImpl.java | 2 +- .../com/fasterxml/jackson/dataformat/cbor/CBORParser.java | 2 +- .../jackson/dataformat/protobuf/ProtobufUtil.java | 3 --- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java index b7dfa03be..8b03fd9b6 100644 --- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java +++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java @@ -23,7 +23,9 @@ public class AvroTypeIdResolver extends ClassNameIdResolver { private final Map> _idTypes = new HashMap<>(); - private final Map, String> _typeIds = new HashMap<>(); + // 04-Jan-2021, tatu: Not sure why this is being kept around, not used as of + // 2.12; commenting out may be removed from 2.13 +// private final Map, String> _typeIds = new HashMap<>(); public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory, PolymorphicTypeValidator ptv, @@ -44,12 +46,12 @@ public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory, @Override public void registerSubtype(Class type, String name) { _idTypes.put(name, type); - _typeIds.put(type, name); +// _typeIds.put(type, name); } @Override protected JavaType _typeFromId(String id, DatabindContext ctxt) throws IOException { - // base types don't have subclasses + // primitive types don't have subclasses if (_baseType.isPrimitive()) { return _baseType; } diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java index c4954845b..c64218316 100644 --- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java +++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java @@ -452,7 +452,7 @@ private long _decodeLongSlow2(long lo) throws IOException i = b & 0x7F; if (b < 0) { b = _nextByteGuaranteed(); - if (i < 0) { + if (b < 0) { _reportInvalidNegative(b); } i |= (b << 7); diff --git a/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java b/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java index 2104159b1..7a21179cc 100644 --- a/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java +++ b/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java @@ -2867,7 +2867,7 @@ protected void _skipIncomplete() throws IOException // Either String or byte[] if (type != CBORConstants.MAJOR_TYPE_TEXT - && type == CBORConstants.MAJOR_TYPE_TEXT) { + && type != CBORConstants.MAJOR_TYPE_BYTES) { _throwInternal(); } final int lowBits = _typeByte & 0x1F; diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufUtil.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufUtil.java index 0a401de7b..a1e55e0a3 100644 --- a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufUtil.java +++ b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufUtil.java @@ -48,9 +48,6 @@ public static int lengthLength(int len) { if (len <= 0x1FFFFF) { // 21 bytes return 3; } - if (len <= 0x1FFFFF) { // 21 bytes - return 3; - } if (len <= 0x0FFFFFFF) { // 28 bytes return 4; }