Merge branch '2.19' into joohyukkim/2.19/547-migrate-avro-module

Author: cowtowncoder

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

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.protobuf;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * 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

@@ -6,8 +6,8 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.format.InputAccessor;
 import com.fasterxml.jackson.core.format.MatchStrength;
-import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.ContentReference;
+import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
 
 public class ProtobufFactory extends JsonFactory

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

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.protobuf;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.Charset;
@@ -10,11 +11,7 @@
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.json.JsonWriteContext;
 import com.fasterxml.jackson.core.util.JacksonFeatureSet;
-import com.fasterxml.jackson.dataformat.protobuf.schema.FieldType;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufField;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufMessage;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
-import com.fasterxml.jackson.dataformat.protobuf.schema.WireType;
+import com.fasterxml.jackson.dataformat.protobuf.schema.*;
 
 public class ProtobufGenerator extends GeneratorBase
 {

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

@@ -1,21 +1,14 @@
 package com.fasterxml.jackson.dataformat.protobuf;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
-import com.fasterxml.jackson.dataformat.protobuf.schema.DescriptorLoader;
-import com.fasterxml.jackson.dataformat.protobuf.schema.FileDescriptorSet;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
+import com.fasterxml.jackson.dataformat.protobuf.schema.*;
 import com.fasterxml.jackson.dataformat.protobuf.schemagen.ProtobufSchemaGenerator;
 
 public class ProtobufMapper extends ObjectMapper

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

@@ -8,11 +8,7 @@
 import com.fasterxml.jackson.core.base.ParserMinimalBase;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.NumberInput;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.fasterxml.jackson.core.util.JacksonFeatureSet;
-import com.fasterxml.jackson.core.util.TextBuffer;
-import com.fasterxml.jackson.core.util.VersionUtil;
-
+import com.fasterxml.jackson.core.util.*;
 import com.fasterxml.jackson.dataformat.protobuf.schema.*;
 
 public class ProtobufParser extends ParserMinimalBase

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

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.protobuf;
 
-import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonLocation;
+import com.fasterxml.jackson.core.JsonStreamContext;
 import com.fasterxml.jackson.core.io.CharTypes;
 import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufField;

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

@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.protobuf.schema;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
+import java.io.*;
 import java.net.URL;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

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

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.dataformat.protobuf.schema;
 
-import java.util.*;
+import java.util.Arrays;
 
 /**
  * Helper class used for cases where {@link ProtobufField} instances

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

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.dataformat.protobuf.schema;
 
-import java.util.*;
+import java.util.EnumMap;
 
 import com.squareup.protoparser.DataType;
 

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

@@ -3,13 +3,7 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-import com.squareup.protoparser.DataType;
-import com.squareup.protoparser.EnumConstantElement;
-import com.squareup.protoparser.EnumElement;
-import com.squareup.protoparser.FieldElement;
-import com.squareup.protoparser.MessageElement;
-import com.squareup.protoparser.OptionElement;
-import com.squareup.protoparser.ProtoFile;
+import com.squareup.protoparser.*;
 
 /**
  * @since 2.9