warnings cleanup

cowtowncoder · cowtowncoder · commit 344acb57bdd9 · 2020-08-22T14:32:45.000-07:00
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestBuilders.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestBuilders.java
@@ -25,7 +25,7 @@ public Thing build() {
     static class Thing {
         final String foo;
     
-        private Thing(String foo) {
+        Thing(String foo) {
             this.foo = foo;
         }
     }
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestCollectionDeser.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestCollectionDeser.java
@@ -10,7 +10,7 @@ public class TestCollectionDeser extends AfterburnerTestBase
     // [module-afterburner#36]
     static class CollectionBean
     {
-        private Collection<String> x = new TreeSet<String>();
+        Collection<String> x = new TreeSet<String>();
 
         public Collection<String> getStuff() { return x; }
     }
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestPolymorphic.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestPolymorphic.java
@@ -10,7 +10,7 @@ public class TestPolymorphic extends AfterburnerTestBase
 {
     static class Envelope {
         @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.EXTERNAL_PROPERTY, property="class")
-        private Object payload;
+        Object payload;
 
         public Envelope(@JsonProperty("payload") Object payload) {
             this.payload = payload;
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestPolymorphicCreators.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/TestPolymorphicCreators.java
@@ -54,7 +54,7 @@ abstract static class AbstractRoot
     {
         private final String opt;
 
-        private AbstractRoot(String opt) {
+        AbstractRoot(String opt) {
             this.opt = opt;
         }
 
@@ -75,7 +75,7 @@ public final String getOpt() {
     }
 
     static final class One extends AbstractRoot {
-        private One(String opt) {
+        One(String opt) {
             super(opt);
         }
 
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/merge/NodeMergeTest.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/merge/NodeMergeTest.java
@@ -9,7 +9,7 @@
 
 public class NodeMergeTest extends AfterburnerTestBase
 {
-    private final static ObjectMapper MAPPER = mapperBuilder()
+    final static ObjectMapper MAPPER = mapperBuilder()
             // 26-Oct-2016, tatu: Make sure we'll report merge problems by default
             .disable(MapperFeature.IGNORE_MERGE_FOR_UNMERGEABLE)
             .build();
diff --git a/guice/src/test/java/com/fasterxml/jackson/module/guice/ExtendInjectableTest.java b/guice/src/test/java/com/fasterxml/jackson/module/guice/ExtendInjectableTest.java
@@ -18,19 +18,18 @@
  */
 public class ExtendInjectableTest
 {
-
-    private final ConstructorDependency constructorInjected = new ConstructorDependency();
-    private final ConstructorDependency constructorInjectedWithCustomAnnotation = new ConstructorDependency();
-    private final ConstructorDependency constructorInjectedWithGuiceAnnotation = new ConstructorDependency();
-    private final ConstructorDependency constructorInjectedWithJavaAnnotation = new ConstructorDependency();
-    private final FieldDependency fieldInjected = new FieldDependency();
-    private final FieldDependency fieldInjectedWithCustomAnnotation = new FieldDependency();
-    private final FieldDependency fieldInjectedWithGuiceAnnotation = new FieldDependency();
-    private final FieldDependency fieldInjectedWithJavaAnnotation = new FieldDependency();
-    private final MethodDependency methodInjected = new MethodDependency();
-    private final MethodDependency methodInjectedWithCustomAnnotation = new MethodDependency();
-    private final MethodDependency methodInjectedWithGuiceAnnotation = new MethodDependency();
-    private final MethodDependency methodInjectedWithJavaAnnotation = new MethodDependency();
+    final ConstructorDependency constructorInjected = new ConstructorDependency();
+    final ConstructorDependency constructorInjectedWithCustomAnnotation = new ConstructorDependency();
+    final ConstructorDependency constructorInjectedWithGuiceAnnotation = new ConstructorDependency();
+    final ConstructorDependency constructorInjectedWithJavaAnnotation = new ConstructorDependency();
+    final FieldDependency fieldInjected = new FieldDependency();
+    final FieldDependency fieldInjectedWithCustomAnnotation = new FieldDependency();
+    final FieldDependency fieldInjectedWithGuiceAnnotation = new FieldDependency();
+    final FieldDependency fieldInjectedWithJavaAnnotation = new FieldDependency();
+    final MethodDependency methodInjected = new MethodDependency();
+    final MethodDependency methodInjectedWithCustomAnnotation = new MethodDependency();
+    final MethodDependency methodInjectedWithGuiceAnnotation = new MethodDependency();
+    final MethodDependency methodInjectedWithJavaAnnotation = new MethodDependency();
 
     @Test
     public void testModulesRegisteredThroughInjectionWithKey() throws Exception
@@ -96,9 +95,9 @@ private void verifyInjections(String message, InjectableBean injected)
     static class ReadableBean extends InjectableBean {
 
         @JsonProperty("field_value")
-        private String fieldValue;
-        private String methodValue;
-        private final String constructorValue;
+        String fieldValue;
+        String methodValue;
+        final String constructorValue;
 
         @JsonCreator
         private ReadableBean(@JacksonInject ConstructorDependency constructorInjected,
@@ -131,30 +130,30 @@ static class FieldDependency {};
     static class InjectableBean
     {
         @Inject
-        private FieldDependency fieldInjected;
-        private MethodDependency methodInjected;
-        private final ConstructorDependency constructorInjected;
+        FieldDependency fieldInjected;
+        MethodDependency methodInjected;
+        final ConstructorDependency constructorInjected;
 
         @JacksonInject
         @Inject
         @javax.inject.Named("javax")
-        private FieldDependency fieldInjectedWithJavaAnnotation;
-        private MethodDependency methodInjectedWithJavaAnnotation;
-        private final ConstructorDependency constructorInjectedWithJavaAnnotation;
+        FieldDependency fieldInjectedWithJavaAnnotation;
+        MethodDependency methodInjectedWithJavaAnnotation;
+        final ConstructorDependency constructorInjectedWithJavaAnnotation;
 
         @JacksonInject
         @Inject
         @com.google.inject.name.Named("guice")
-        private FieldDependency fieldInjectedWithGuiceAnnotation;
-        private MethodDependency methodInjectedWithGuiceAnnotation;
-        private final ConstructorDependency constructorInjectedWithGuiceAnnotation;
+        FieldDependency fieldInjectedWithGuiceAnnotation;
+        MethodDependency methodInjectedWithGuiceAnnotation;
+        final ConstructorDependency constructorInjectedWithGuiceAnnotation;
 
         @JacksonInject
         @Inject
         @Ann
-        private FieldDependency fieldInjectedWithCustomAnnotation;
-        private MethodDependency methodInjectedWithCustomAnnotation;
-        private final ConstructorDependency constructorInjectedWithCustomAnnotation;
+        FieldDependency fieldInjectedWithCustomAnnotation;
+        MethodDependency methodInjectedWithCustomAnnotation;
+        final ConstructorDependency constructorInjectedWithCustomAnnotation;
 
         @Inject // this is simply to make sure we *can* build this correctly
         protected InjectableBean(ConstructorDependency constructorInjected,
diff --git a/guice/src/test/java/com/fasterxml/jackson/module/guice/ObjectMapperModuleTest.java b/guice/src/test/java/com/fasterxml/jackson/module/guice/ObjectMapperModuleTest.java
@@ -1,14 +1,19 @@
 package com.fasterxml.jackson.module.guice;
 
+import java.io.IOException;
+import java.math.BigInteger;
+
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
+
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.module.guice.ObjectMapperModule;
+
 import com.google.inject.Binder;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -19,9 +24,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.math.BigInteger;
-
 public class ObjectMapperModuleTest
 {
     @Test
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 public abstract class BaseJaxbTest
     extends junit.framework.TestCase
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/TestVersions.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/TestVersions.java
@@ -5,8 +5,6 @@
 
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
-
 public class TestVersions extends BaseJaxbTest
 {
     public void testVersions()
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapType.java
@@ -1,7 +1,5 @@
 package com.fasterxml.jackson.module.jaxb.adapters;
 
-import com.fasterxml.jackson.module.jaxb.adapters.EntryType;
-
 import java.util.List;
 
 /**
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
@@ -88,7 +88,7 @@ public Wrapper(long l) {
     }
 
     static class WrapperWithGetterAndSetter {
-        private List<Date> values;
+        List<Date> values;
 
         public WrapperWithGetterAndSetter() { }
         public WrapperWithGetterAndSetter(long l) {
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
@@ -55,8 +55,7 @@ public Object getIdObject() {
 
     @XmlRootElement(name="bah")
     public static class JaxbAnnotatedObject {
-
-        private BigDecimal number;
+        BigDecimal number;
 
         public JaxbAnnotatedObject() { }
         
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
@@ -27,7 +27,7 @@ public class TestDomElementSerialization extends BaseJaxbTest
      */
 
     @SuppressWarnings("serial")
-    private final static class DomModule extends SimpleModule
+    final static class DomModule extends SimpleModule
     {
         public DomModule()
         {
@@ -47,7 +47,7 @@ public void setupModule(SetupContext context)
         }
     }
     
-    private final static class DomSerializers extends Serializers.Base
+    final static class DomSerializers extends Serializers.Base
     {
         @Override
         public JsonSerializer<?> findSerializer(SerializationConfig config,
diff --git a/mrbean/src/main/java/com/fasterxml/jackson/module/mrbean/MrBeanModule.java b/mrbean/src/main/java/com/fasterxml/jackson/module/mrbean/MrBeanModule.java
@@ -1,10 +1,8 @@
 package com.fasterxml.jackson.module.mrbean;
 
 import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.module.mrbean.AbstractTypeMaterializer;
 
-public class MrBeanModule extends Module
+public class MrBeanModule extends com.fasterxml.jackson.databind.Module
 {
     /**
      * Configured materializer instance to register with deserializer factory.
diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestMrbeanNestedGeneric.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestMrbeanNestedGeneric.java
@@ -5,8 +5,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 
-import com.fasterxml.jackson.module.mrbean.MrBeanModule;
-
 /**
  * Tests to verify whether generic declarations are properly handled by Mr Bean.
  */
diff --git a/osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java b/osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java
@@ -30,7 +30,6 @@
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.module.osgi.OsgiJacksonModule;
 
 @RunWith(value = Parameterized.class)
 public class InjectOsgiServiceTest
@@ -90,7 +89,7 @@ private static interface NotFoundService
 
     }
 
-    private static abstract class VerifyableBean 
+    static abstract class VerifyableBean 
     {
         public String field;
         

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Thing build() {`
`25`	`25`	`static class Thing {`
`26`	`26`	`final String foo;`
`27`	`27`
`28`		`- private Thing(String foo) {`
	`28`	`+ Thing(String foo) {`
`29`	`29`	`this.foo = foo;`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class TestCollectionDeser extends AfterburnerTestBase`
`10`	`10`	`// [module-afterburner#36]`
`11`	`11`	`static class CollectionBean`
`12`	`12`	`{`
`13`		`- private Collection<String> x = new TreeSet<String>();`
	`13`	`+ Collection<String> x = new TreeSet<String>();`
`14`	`14`
`15`	`15`	`public Collection<String> getStuff() { return x; }`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class TestPolymorphic extends AfterburnerTestBase`
`10`	`10`	`{`
`11`	`11`	`static class Envelope {`
`12`	`12`	`@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.EXTERNAL_PROPERTY, property="class")`
`13`		`- private Object payload;`
	`13`	`+ Object payload;`
`14`	`14`
`15`	`15`	`public Envelope(@JsonProperty("payload") Object payload) {`
`16`	`16`	`this.payload = payload;`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ abstract static class AbstractRoot`
`54`	`54`	`{`
`55`	`55`	`private final String opt;`
`56`	`56`
`57`		`- private AbstractRoot(String opt) {`
	`57`	`+ AbstractRoot(String opt) {`
`58`	`58`	`this.opt = opt;`
`59`	`59`	`}`
`60`	`60`
`@@ -75,7 +75,7 @@ public final String getOpt() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`static final class One extends AbstractRoot {`
`78`		`- private One(String opt) {`
	`78`	`+ One(String opt) {`
`79`	`79`	`super(opt);`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`public class NodeMergeTest extends AfterburnerTestBase`
`11`	`11`	`{`
`12`		`- private final static ObjectMapper MAPPER = mapperBuilder()`
	`12`	`+ final static ObjectMapper MAPPER = mapperBuilder()`
`13`	`13`	`// 26-Oct-2016, tatu: Make sure we'll report merge problems by default`
`14`	`14`	`.disable(MapperFeature.IGNORE_MERGE_FOR_UNMERGEABLE)`
`15`	`15`	`.build();`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`
`6`	`6`	`import com.fasterxml.jackson.databind.type.TypeFactory;`
`7`	`7`
`8`		`-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;`
`9`		`-`
`10`	`8`	`public class TestVersions extends BaseJaxbTest`
`11`	`9`	`{`
`12`	`10`	`public void testVersions()`