Skip to content

Commit 2ad1d95

Browse files
committed
guess what? Fixing remaining test case compiler warnings (wrt unused imports, synth accessors)
1 parent 2cebe12 commit 2ad1d95

35 files changed

+42
-52
lines changed

src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import com.fasterxml.jackson.core.*;
1313

14-
import com.fasterxml.jackson.databind.ObjectMapper;
1514
import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
1615
import com.fasterxml.jackson.databind.json.JsonMapper;
1716
import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;

src/test/java/com/fasterxml/jackson/databind/MapperViaParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.fasterxml.jackson.core.io.CharacterEscapes;
88
import com.fasterxml.jackson.core.io.SerializedString;
99
import com.fasterxml.jackson.core.json.JsonWriteFeature;
10-
import com.fasterxml.jackson.databind.ObjectMapper;
10+
1111
import com.fasterxml.jackson.databind.json.JsonMapper;
1212

1313
public class MapperViaParserTest extends BaseMapTest

src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ public boolean handleUnknownProperty(DeserializationContext ctxt, JsonParser p,
516516
assertEquals("test", aObject.knownField);
517517
}
518518

519-
private static class A{
520-
private String knownField;
519+
private static class A {
520+
String knownField;
521521

522522
@JsonCreator
523523
private A(@JsonProperty("knownField") String knownField) {

src/test/java/com/fasterxml/jackson/databind/TestFormatSchema.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.fasterxml.jackson.core.io.IOContext;
99
import com.fasterxml.jackson.core.base.ParserBase;
1010
import com.fasterxml.jackson.core.base.GeneratorBase;
11-
import com.fasterxml.jackson.databind.ObjectMapper;
1211

1312
/**
1413
* Basic tests to ensure that {@link FormatSchema} instances are properly

src/test/java/com/fasterxml/jackson/databind/TestRootName.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.*;
44

5-
import com.fasterxml.jackson.databind.ObjectMapper;
65
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
76
import com.fasterxml.jackson.databind.json.JsonMapper;
87

src/test/java/com/fasterxml/jackson/databind/TestVersions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.fasterxml.jackson.core.Version;
44
import com.fasterxml.jackson.core.Versioned;
55

6-
import com.fasterxml.jackson.databind.ObjectMapper;
76
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
7+
import com.fasterxml.jackson.databind.json.JsonMapper;
88
import com.fasterxml.jackson.databind.cfg.PackageVersion;
99

1010
/**
@@ -15,7 +15,7 @@ public class TestVersions extends BaseMapTest
1515
{
1616
public void testMapperVersions()
1717
{
18-
ObjectMapper mapper = new ObjectMapper();
18+
ObjectMapper mapper = new JsonMapper();
1919
assertVersion(mapper);
2020
assertVersion(mapper.reader());
2121
assertVersion(mapper.writer());

src/test/java/com/fasterxml/jackson/databind/deser/TestObjectOrArrayDeserialization.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public static class SomeObject {
1313
}
1414

1515
public static class ArrayOrObject {
16-
private final List<SomeObject> objects;
17-
private final SomeObject object;
16+
final List<SomeObject> objects;
17+
final SomeObject object;
1818

1919
@JsonCreator
2020
public ArrayOrObject(List<SomeObject> objects) {
@@ -29,24 +29,25 @@ public ArrayOrObject(SomeObject object) {
2929
}
3030
}
3131

32+
private final ObjectMapper MAPPER = newJsonMapper();
33+
3234
public void testObjectCase() throws Exception {
33-
ArrayOrObject arrayOrObject = new ObjectMapper().readValue("{}", ArrayOrObject.class);
35+
ArrayOrObject arrayOrObject = MAPPER.readValue("{}", ArrayOrObject.class);
3436
assertNull("expected objects field to be null", arrayOrObject.objects);
3537
assertNotNull("expected object field not to be null", arrayOrObject.object);
3638
}
3739

3840
public void testEmptyArrayCase() throws Exception {
39-
ArrayOrObject arrayOrObject = new ObjectMapper().readValue("[]", ArrayOrObject.class);
41+
ArrayOrObject arrayOrObject = MAPPER.readValue("[]", ArrayOrObject.class);
4042
assertNotNull("expected objects field not to be null", arrayOrObject.objects);
4143
assertTrue("expected objects field to be an empty list", arrayOrObject.objects.isEmpty());
4244
assertNull("expected object field to be null", arrayOrObject.object);
4345
}
4446

4547
public void testNotEmptyArrayCase() throws Exception {
46-
ArrayOrObject arrayOrObject = new ObjectMapper().readValue("[{}, {}]", ArrayOrObject.class);
48+
ArrayOrObject arrayOrObject = MAPPER.readValue("[{}, {}]", ArrayOrObject.class);
4749
assertNotNull("expected objects field not to be null", arrayOrObject.objects);
4850
assertEquals("expected objects field to have size 2", 2, arrayOrObject.objects.size());
4951
assertNull("expected object field to be null", arrayOrObject.object);
5052
}
51-
5253
}

src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingExternalProperty1003Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ static class HeroBattle {
1010

1111
private final Hero hero;
1212

13-
private HeroBattle(Hero hero) {
13+
HeroBattle(Hero hero) {
1414
if (hero == null) throw new Error();
1515
this.hero = hero;
1616
}

src/test/java/com/fasterxml/jackson/databind/deser/creators/ImplicitNameMatch792Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static class ReadWriteBean
5454
{
5555
private int value;
5656

57-
private ReadWriteBean(@JsonProperty(value="value",
57+
ReadWriteBean(@JsonProperty(value="value",
5858
access=JsonProperty.Access.READ_WRITE) int v) {
5959
value = v;
6060
}

src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static Product1853 from(String name){
115115
return new Product1853(false, "DELEG:"+name);
116116
}
117117

118-
private Product1853(boolean bogus, String name) {
118+
Product1853(boolean bogus, String name) {
119119
this.name = name;
120120
}
121121

0 commit comments

Comments
 (0)