Warnings cleanup (unneeded imports, synthetic accessors)

cowtowncoder · cowtowncoder · commit 82c377ebdbb2 · 2020-09-18T19:09:45.000-07:00
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AmbiguousUnionWriteTest.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AmbiguousUnionWriteTest.java
@@ -1,12 +1,8 @@
 package com.fasterxml.jackson.dataformat.avro;
 
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
-
-/* 23-Aug-2017, tatu: There was some confusion on whether potential ambiguity
- *   might be problematic (compared to actual one) -- this test verifies
- *   it should not be.
- */
+// 23-Aug-2017, tatu: There was some confusion on whether potential ambiguity
+//   might be problematic (compared to actual one) -- this test verifies
+//   it should not be.
 public class AmbiguousUnionWriteTest extends AvroTestBase
 {
     protected final String SCHEMA_WITH_AMBIGUITY = aposToQuotes("{\n"
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java
@@ -7,8 +7,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
 
 public class NestedMapTest extends AvroTestBase
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/RootEmptyRecord177Test.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/RootEmptyRecord177Test.java
@@ -2,9 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
-
 public class RootEmptyRecord177Test extends AvroTestBase
 {
     private final AvroMapper MAPPER = getMapper();
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/SerializeGeneratedTest.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/SerializeGeneratedTest.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 import com.fasterxml.jackson.dataformat.avro.gen.Event35;
 import com.fasterxml.jackson.dataformat.avro.gen.Event35Id;
 
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/SimpleGenerationTest.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/SimpleGenerationTest.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroFactory;
 
 public class SimpleGenerationTest extends AvroTestBase
 {
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/InteropTestBase.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/InteropTestBase.java
@@ -50,11 +50,11 @@ public static ParameterizedType type(Class<?> baseClass, Type... parameters) {
         return new ParameterizedTypeImpl(baseClass, parameters);
     }
 
-    private static class ParameterizedTypeImpl implements ParameterizedType {
+    static class ParameterizedTypeImpl implements ParameterizedType {
         private final Class<?> rawType;
         private final Type[]   typeBindings;
 
-        private ParameterizedTypeImpl(Class<?> rawType, Type[] typeBindings) {
+        ParameterizedTypeImpl(Class<?> rawType, Type[] typeBindings) {
             this.rawType = rawType;
             this.typeBindings = typeBindings;
         }
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroEncodeTest.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroEncodeTest.java
@@ -53,7 +53,7 @@ static class CustomComponent {
         public Long longValue;
 
         @AvroEncode(using = UuidAsBytesAvroEncoding.class)
-        private UUID uuidValue;
+        UUID uuidValue;
 
         protected CustomComponent() { }
     }
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonParserTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonParserTest.java
@@ -16,12 +16,9 @@
  
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.dataformat.ion.IonFactory;
-import com.fasterxml.jackson.dataformat.ion.IonParser;
 
 import org.junit.Assert;
 
-import com.amazon.ion.IonDecimal;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonValue;
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/PolymorphicRoundtripTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/PolymorphicRoundtripTest.java
@@ -40,7 +40,6 @@
 import com.fasterxml.jackson.databind.jsontype.impl.ClassNameIdResolver;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 import com.fasterxml.jackson.dataformat.ion.ionvalue.IonValueMapper;
 import com.fasterxml.jackson.dataformat.ion.polymorphism.IonAnnotationIntrospector;
 import com.fasterxml.jackson.dataformat.ion.polymorphism.IonAnnotationTypeResolverBuilder;
@@ -60,9 +59,9 @@ public class PolymorphicRoundtripTest {
      * ClassNameIonAnnotationIntrospector, and MultipleClassNameIdResolver (where they actually get used). I think
      * this is (a little) easier to understand.
      */
-    private boolean resolveAllTypes = false; // apply resolver under test to all types, not just annotated ones
-    private String preferredTypeId = null; // if asked to resolve from multiple ids, choose this one.
-    private IonSystem ionSystem = IonSystemBuilder.standard().build();
+    boolean resolveAllTypes = false; // apply resolver under test to all types, not just annotated ones
+    String preferredTypeId = null; // if asked to resolve from multiple ids, choose this one.
+    IonSystem ionSystem = IonSystemBuilder.standard().build();
     
     @Before
     public void reset() {
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializerWithClassNameAnnotationTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializerWithClassNameAnnotationTest.java
@@ -107,11 +107,11 @@ protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType base
         }
     }
 
-    private static class ClassA {
+    static class ClassA {
         public int value;
     }
 
-    private static class ClassB<T> {
+    static class ClassB<T> {
         public T content;
     }
 }
diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/EnumLookup.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/EnumLookup.java
@@ -82,7 +82,7 @@ static class Small1 extends EnumLookup
         protected final String key1;
         protected final int index1;
 
-        private Small1(String key, int index) {
+        Small1(String key, int index) {
             key1 = key;
             index1 = index;
         }
@@ -122,7 +122,7 @@ final static class Small2 extends EnumLookup
         protected final String key1, key2;
         protected final int index1, index2;
 
-        private Small2(String k1, int i1, String k2, int i2) {
+        Small2(String k1, int i1, String k2, int i2) {
             key1 = k1;
             index1 = i1;
             key2 = k2;
@@ -188,7 +188,7 @@ final static class Small3 extends EnumLookup
         protected final String key1, key2, key3;
         protected final int index1, index2, index3;
 
-        private Small3(String k1, int i1, String k2, int i2, String k3, int i3) {
+        Small3(String k1, int i1, String k2, int i2, String k3, int i3) {
             key1 = k1;
             index1 = i1;
             key2 = k2;
diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FieldLookup.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FieldLookup.java
@@ -50,7 +50,7 @@ static class Small1 extends FieldLookup
         protected final String key1;
         protected final ProtobufField field1;
 
-        private Small1(ProtobufField f) {
+        Small1(ProtobufField f) {
             key1 = f.name;
             field1 = f;
         }
@@ -69,7 +69,7 @@ final static class Small2 extends FieldLookup
         protected final String key1, key2;
         protected final ProtobufField field1, field2;
 
-        private Small2(ProtobufField f1, ProtobufField f2) {
+        Small2(ProtobufField f1, ProtobufField f2) {
             key1 = f1.name;
             field1 = f1;
             key2 = f2.name;
@@ -99,7 +99,7 @@ final static class Small3 extends FieldLookup
         protected final String key1, key2, key3;
         protected final ProtobufField field1, field2, field3;
 
-        private Small3(ProtobufField f1, ProtobufField f2, ProtobufField f3) {
+        Small3(ProtobufField f1, ProtobufField f2, ProtobufField f3) {
             key1 = f1.name;
             field1 = f1;
             key2 = f2.name;
diff --git a/protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/schema/SchemaGenTest.java b/protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/schema/SchemaGenTest.java
@@ -10,9 +10,6 @@
 
 import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
 import com.fasterxml.jackson.dataformat.protobuf.ProtobufTestBase;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufMessage;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
 import com.fasterxml.jackson.dataformat.protobuf.schemagen.ProtobufSchemaGenerator;
 
 public class SchemaGenTest extends ProtobufTestBase
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/SmileMapperTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/SmileMapperTest.java
@@ -30,7 +30,7 @@ public BytesBean() { }
 
     // [dataformats-binary#1711]
     static class ByteWrapper1711 {
-        private final byte[] val;
+        final byte[] val;
 
         @JsonCreator // (mode=JsonCreator.Mode.DELEGATING)
         public ByteWrapper1711(byte[] val) {

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonAutoDetect;`
`4`	`4`
`5`		`-import com.fasterxml.jackson.dataformat.avro.AvroMapper;`
`6`		`-import com.fasterxml.jackson.dataformat.avro.AvroSchema;`
`7`		`-`
`8`	`5`	`public class RootEmptyRecord177Test extends AvroTestBase`
`9`	`6`	`{`
`10`	`7`	`private final AvroMapper MAPPER = getMapper();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import com.fasterxml.jackson.core.JsonGenerator;`
`10`	`10`	`import com.fasterxml.jackson.databind.JsonMappingException;`
`11`	`11`	`import com.fasterxml.jackson.databind.ObjectMapper;`
`12`		`-import com.fasterxml.jackson.dataformat.avro.AvroFactory;`
`13`	`12`
`14`	`13`	`public class SimpleGenerationTest extends AvroTestBase`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ public static ParameterizedType type(Class<?> baseClass, Type... parameters) {`
`50`	`50`	`return new ParameterizedTypeImpl(baseClass, parameters);`
`51`	`51`	`}`
`52`	`52`
`53`		`- private static class ParameterizedTypeImpl implements ParameterizedType {`
	`53`	`+ static class ParameterizedTypeImpl implements ParameterizedType {`
`54`	`54`	`private final Class<?> rawType;`
`55`	`55`	`private final Type[] typeBindings;`
`56`	`56`
`57`		`- private ParameterizedTypeImpl(Class<?> rawType, Type[] typeBindings) {`
	`57`	`+ ParameterizedTypeImpl(Class<?> rawType, Type[] typeBindings) {`
`58`	`58`	`this.rawType = rawType;`
`59`	`59`	`this.typeBindings = typeBindings;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static class CustomComponent {`
`53`	`53`	`public Long longValue;`
`54`	`54`
`55`	`55`	`@AvroEncode(using = UuidAsBytesAvroEncoding.class)`
`56`		`- private UUID uuidValue;`
	`56`	`+ UUID uuidValue;`
`57`	`57`
`58`	`58`	`protected CustomComponent() { }`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType base`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- private static class ClassA {`
	`110`	`+ static class ClassA {`
`111`	`111`	`public int value;`
`112`	`112`	`}`
`113`	`113`
`114`		`- private static class ClassB<T> {`
	`114`	`+ static class ClassB<T> {`
`115`	`115`	`public T content;`
`116`	`116`	`}`
`117`	`117`	`}`