Skip to content

Commit c6359e3

Browse files
authored
[ JSTEP-10 ] Migrate protobuf module tests to JUnit 5 (#552)
1 parent d42fad9 commit c6359e3

File tree

53 files changed

+306
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+306
-144
lines changed

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ByteAccumulator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.fasterxml.jackson.dataformat.protobuf;
22

3-
import java.io.*;
3+
import java.io.IOException;
4+
import java.io.OutputStream;
45

56
/**
67
* Helper object used for buffering content for cases where we need (byte-)length prefixes

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import com.fasterxml.jackson.core.*;
77
import com.fasterxml.jackson.core.format.InputAccessor;
88
import com.fasterxml.jackson.core.format.MatchStrength;
9-
import com.fasterxml.jackson.core.io.IOContext;
109
import com.fasterxml.jackson.core.io.ContentReference;
10+
import com.fasterxml.jackson.core.io.IOContext;
1111
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
1212

1313
public class ProtobufFactory extends JsonFactory

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufGenerator.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.fasterxml.jackson.dataformat.protobuf;
22

3-
import java.io.*;
3+
import java.io.IOException;
4+
import java.io.OutputStream;
45
import java.math.BigDecimal;
56
import java.math.BigInteger;
67
import java.nio.charset.Charset;
@@ -10,11 +11,7 @@
1011
import com.fasterxml.jackson.core.io.IOContext;
1112
import com.fasterxml.jackson.core.json.JsonWriteContext;
1213
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
13-
import com.fasterxml.jackson.dataformat.protobuf.schema.FieldType;
14-
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufField;
15-
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufMessage;
16-
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
17-
import com.fasterxml.jackson.dataformat.protobuf.schema.WireType;
14+
import com.fasterxml.jackson.dataformat.protobuf.schema.*;
1815

1916
public class ProtobufGenerator extends GeneratorBase
2017
{

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufMapper.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
package com.fasterxml.jackson.dataformat.protobuf;
22

3-
import java.io.File;
4-
import java.io.IOException;
5-
import java.io.InputStream;
3+
import java.io.*;
64
import java.net.URL;
75
import java.util.concurrent.locks.ReentrantLock;
86

97
import com.fasterxml.jackson.core.Version;
108
import com.fasterxml.jackson.core.type.TypeReference;
11-
import com.fasterxml.jackson.databind.JavaType;
12-
import com.fasterxml.jackson.databind.JsonMappingException;
13-
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.*;
1410
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
15-
import com.fasterxml.jackson.dataformat.protobuf.schema.DescriptorLoader;
16-
import com.fasterxml.jackson.dataformat.protobuf.schema.FileDescriptorSet;
17-
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
18-
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
11+
import com.fasterxml.jackson.dataformat.protobuf.schema.*;
1912
import com.fasterxml.jackson.dataformat.protobuf.schemagen.ProtobufSchemaGenerator;
2013

2114
public class ProtobufMapper extends ObjectMapper

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
import com.fasterxml.jackson.core.base.ParserMinimalBase;
99
import com.fasterxml.jackson.core.io.IOContext;
1010
import com.fasterxml.jackson.core.io.NumberInput;
11-
import com.fasterxml.jackson.core.util.ByteArrayBuilder;
12-
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
13-
import com.fasterxml.jackson.core.util.TextBuffer;
14-
import com.fasterxml.jackson.core.util.VersionUtil;
15-
11+
import com.fasterxml.jackson.core.util.*;
1612
import com.fasterxml.jackson.dataformat.protobuf.schema.*;
1713

1814
public class ProtobufParser extends ParserMinimalBase

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufReadContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.fasterxml.jackson.dataformat.protobuf;
22

3-
import com.fasterxml.jackson.core.*;
3+
import com.fasterxml.jackson.core.JsonLocation;
4+
import com.fasterxml.jackson.core.JsonStreamContext;
45
import com.fasterxml.jackson.core.io.CharTypes;
56
import com.fasterxml.jackson.core.io.ContentReference;
67
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufField;

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/DescriptorLoader.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.fasterxml.jackson.dataformat.protobuf.schema;
22

3-
import java.io.File;
4-
import java.io.IOException;
5-
import java.io.InputStream;
6-
import java.io.Reader;
3+
import java.io.*;
74
import java.net.URL;
85

96
import com.fasterxml.jackson.databind.ObjectMapper;

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FieldLookup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.fasterxml.jackson.dataformat.protobuf.schema;
22

3-
import java.util.*;
3+
import java.util.Arrays;
44

55
/**
66
* Helper class used for cases where {@link ProtobufField} instances

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FieldTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.fasterxml.jackson.dataformat.protobuf.schema;
22

3-
import java.util.*;
3+
import java.util.EnumMap;
44

55
import com.squareup.protoparser.DataType;
66

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FileDescriptorSet.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
import java.util.EnumMap;
44
import java.util.Map;
55

6-
import com.squareup.protoparser.DataType;
7-
import com.squareup.protoparser.EnumConstantElement;
8-
import com.squareup.protoparser.EnumElement;
9-
import com.squareup.protoparser.FieldElement;
10-
import com.squareup.protoparser.MessageElement;
11-
import com.squareup.protoparser.OptionElement;
12-
import com.squareup.protoparser.ProtoFile;
6+
import com.squareup.protoparser.*;
137

148
/**
159
* @since 2.9

0 commit comments

Comments
 (0)