Skip to content

Commit 5e9bd2c

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.19'
2 parents f27a877 + c6359e3 commit 5e9bd2c

Some content is hidden

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

49 files changed

+286
-102
lines changed

‎protobuf/src/main/java/tools/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 tools.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/tools/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 tools.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;
@@ -11,11 +12,7 @@
1112
import tools.jackson.core.io.IOContext;
1213

1314
import tools.jackson.core.util.JacksonFeatureSet;
14-
import tools.jackson.dataformat.protobuf.schema.FieldType;
15-
import tools.jackson.dataformat.protobuf.schema.ProtobufField;
16-
import tools.jackson.dataformat.protobuf.schema.ProtobufMessage;
17-
import tools.jackson.dataformat.protobuf.schema.ProtobufSchema;
18-
import tools.jackson.dataformat.protobuf.schema.WireType;
15+
import tools.jackson.dataformat.protobuf.schema.*;
1916

2017
public class ProtobufGenerator extends GeneratorBase
2118
{

‎protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufParser.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
import tools.jackson.core.io.IOContext;
1111
import tools.jackson.core.io.NumberInput;
1212
import tools.jackson.core.sym.PropertyNameMatcher;
13-
import tools.jackson.core.util.ByteArrayBuilder;
14-
import tools.jackson.core.util.JacksonFeatureSet;
15-
import tools.jackson.core.util.TextBuffer;
16-
import tools.jackson.core.util.VersionUtil;
13+
import tools.jackson.core.util.*;
1714

1815
import tools.jackson.dataformat.protobuf.schema.*;
1916

‎protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufReadContext.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import tools.jackson.core.*;
44
import tools.jackson.core.io.CharTypes;
55
import tools.jackson.core.io.ContentReference;
6+
67
import tools.jackson.dataformat.protobuf.schema.ProtobufField;
78
import tools.jackson.dataformat.protobuf.schema.ProtobufMessage;
89

‎protobuf/src/main/java/tools/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 tools.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 tools.jackson.databind.ObjectMapper;

‎protobuf/src/main/java/tools/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 tools.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/tools/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 tools.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/tools/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

‎protobuf/src/main/java/tools/jackson/dataformat/protobuf/schema/ProtobufField.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package tools.jackson.dataformat.protobuf.schema;
22

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

5-
import tools.jackson.core.SerializableString;
6-
import tools.jackson.core.util.InternCache;
75
import com.squareup.protoparser.FieldElement;
86
import com.squareup.protoparser.OptionElement;
97

8+
import tools.jackson.core.SerializableString;
9+
import tools.jackson.core.util.InternCache;
10+
1011
public class ProtobufField
1112
// sorted in increasing order
1213
implements Comparable<ProtobufField>

‎protobuf/src/main/java/tools/jackson/dataformat/protobuf/schema/ProtobufMessage.java‎

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

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

55
import tools.jackson.core.SerializableString;
66

0 commit comments

Comments
 (0)