Skip to content

Commit 199d3ac

Browse files
cowtowncodercowtowncoder
committed
Post-merge cleanup for #4448 
1 parent 48a1a2c commit 199d3ac

File tree

46 files changed

+228
-186
lines changed

Some content is hidden

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

46 files changed

+228
-186
lines changed

‎src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.util.HashMap;
4+
import java.util.LinkedHashMap;
5+
import java.util.Map;
6+
7+
import org.junit.jupiter.api.Test;
8+
39
import com.fasterxml.jackson.annotation.JsonAnyGetter;
410
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
11+
512
import com.fasterxml.jackson.databind.ObjectMapper;
613
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7-
import org.junit.jupiter.api.Test;
8-
9-
import java.util.HashMap;
10-
import java.util.LinkedHashMap;
11-
import java.util.Map;
1214

1315
import static org.junit.jupiter.api.Assertions.assertEquals;
1416

@@ -39,7 +41,7 @@ public Bean(int a, int b, Map<String,Object> x) {
3941
/**********************************************************
4042
*/
4143

42-
private final ObjectMapper MAPPER = new ObjectMapper();
44+
private final ObjectMapper MAPPER = newJsonMapper();
4345

4446
@Test
4547
void anyBeanWithSort() throws Exception

‎src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.fasterxml.jackson.failing;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.annotation.JsonAnySetter;
46
import com.fasterxml.jackson.annotation.JsonCreator;
57
import com.fasterxml.jackson.annotation.JsonProperty;
68
import com.fasterxml.jackson.databind.ObjectMapper;
79
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
8-
import org.junit.jupiter.api.Test;
910

1011
import static org.junit.jupiter.api.Assertions.assertEquals;
1112

‎src/test/java/com/fasterxml/jackson/failing/AnySetterForCreator562Test.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.util.Collections;
4+
import java.util.Map;
5+
6+
import org.junit.jupiter.api.Test;
7+
38
import com.fasterxml.jackson.annotation.JsonAnySetter;
49
import com.fasterxml.jackson.annotation.JsonCreator;
510
import com.fasterxml.jackson.annotation.JsonProperty;
611
import com.fasterxml.jackson.databind.ObjectMapper;
712
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
8-
import org.junit.jupiter.api.Test;
9-
10-
import java.util.Collections;
11-
import java.util.Map;
1213

1314
import static org.junit.jupiter.api.Assertions.assertEquals;
1415

‎src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.fasterxml.jackson.failing;
22

3-
import com.fasterxml.jackson.annotation.JsonCreator;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.fasterxml.jackson.annotation.JsonSetter;
6-
import com.fasterxml.jackson.annotation.Nulls;
7-
import com.fasterxml.jackson.databind.ObjectMapper;
8-
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
3+
import java.util.Objects;
4+
95
import org.junit.jupiter.api.Test;
106

11-
import java.util.Objects;
7+
import com.fasterxml.jackson.annotation.*;
8+
9+
import com.fasterxml.jackson.databind.ObjectMapper;
10+
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
1211

1312
// [databind#2572]: "empty" setter, POJO with no 0-arg constructor
1413
class AsEmptyPOJONoDefaultCtor2572Test extends DatabindTestUtil {

‎src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.beans.ConstructorProperties;
4+
5+
import org.junit.jupiter.api.Test;
6+
37
import com.fasterxml.jackson.annotation.JsonBackReference;
48
import com.fasterxml.jackson.annotation.JsonManagedReference;
9+
510
import com.fasterxml.jackson.databind.ObjectMapper;
611
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7-
import org.junit.jupiter.api.Test;
8-
9-
import java.beans.ConstructorProperties;
1012

1113
import static org.junit.jupiter.api.Assertions.assertNotNull;
1214
import static org.junit.jupiter.api.Assertions.assertSame;

‎src/test/java/com/fasterxml/jackson/failing/BeanDeserializerModifier4356Test.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.io.IOException;
4+
import java.util.Iterator;
5+
6+
import org.junit.jupiter.api.Test;
7+
38
import com.fasterxml.jackson.annotation.JsonCreator;
49
import com.fasterxml.jackson.annotation.JsonProperty;
10+
511
import com.fasterxml.jackson.core.JsonParser;
612
import com.fasterxml.jackson.core.JsonProcessingException;
13+
714
import com.fasterxml.jackson.databind.*;
815
import com.fasterxml.jackson.databind.deser.BeanDeserializerBuilder;
916
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
1017
import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
1118
import com.fasterxml.jackson.databind.module.SimpleModule;
1219
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
13-
import org.junit.jupiter.api.Test;
14-
15-
import java.io.IOException;
16-
import java.util.Iterator;
1720

1821
import static org.junit.jupiter.api.Assertions.assertEquals;
1922

‎src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.beans.ConstructorProperties;
4+
5+
import org.junit.jupiter.api.Test;
6+
37
import com.fasterxml.jackson.annotation.JsonBackReference;
48
import com.fasterxml.jackson.annotation.JsonManagedReference;
9+
510
import com.fasterxml.jackson.databind.ObjectMapper;
611
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
712
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
813
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
9-
import org.junit.jupiter.api.Test;
10-
11-
import java.beans.ConstructorProperties;
1214

1315
import static org.junit.jupiter.api.Assertions.assertNotNull;
1416

‎src/test/java/com/fasterxml/jackson/failing/ConstructorDetector3241Test.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
import org.junit.jupiter.api.Test;
9+
310
import com.fasterxml.jackson.annotation.JsonSetter;
411
import com.fasterxml.jackson.annotation.Nulls;
12+
513
import com.fasterxml.jackson.databind.ObjectMapper;
614
import com.fasterxml.jackson.databind.cfg.ConstructorDetector;
715
import com.fasterxml.jackson.databind.exc.InvalidNullException;
816
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
917
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
1018
import com.fasterxml.jackson.databind.json.JsonMapper;
1119
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
12-
import org.junit.jupiter.api.Test;
13-
14-
import java.lang.annotation.ElementType;
15-
import java.lang.annotation.Retention;
16-
import java.lang.annotation.RetentionPolicy;
17-
import java.lang.annotation.Target;
1820

1921
import static org.junit.jupiter.api.Assertions.fail;
2022

‎src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.fasterxml.jackson.failing;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.annotation.JsonCreator;
46
import com.fasterxml.jackson.annotation.JsonProperty;
7+
58
import com.fasterxml.jackson.databind.ObjectMapper;
69
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7-
import org.junit.jupiter.api.Test;
810

911
import static org.junit.jupiter.api.Assertions.assertEquals;
1012

‎src/test/java/com/fasterxml/jackson/failing/CreatorNullPrimitives2977Test.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package com.fasterxml.jackson.failing;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.annotation.JsonProperty;
6+
47
import com.fasterxml.jackson.databind.DeserializationFeature;
58
import com.fasterxml.jackson.databind.ObjectMapper;
69
import com.fasterxml.jackson.databind.cfg.ConstructorDetector;
710
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
811
import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
912
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
1013
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
11-
import org.junit.jupiter.api.Test;
1214

1315
import static org.junit.jupiter.api.Assertions.assertEquals;
1416

‎src/test/java/com/fasterxml/jackson/failing/CreatorWithReadOnlyParam4119Test.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.fasterxml.jackson.failing;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.annotation.JsonCreator;
46
import com.fasterxml.jackson.annotation.JsonProperty;
57
import com.fasterxml.jackson.databind.ObjectMapper;
68
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7-
import org.junit.jupiter.api.Test;
89

910
import static org.junit.jupiter.api.Assertions.*;
1011

‎src/test/java/com/fasterxml/jackson/failing/CyclicRefViaCollection3069Test.java

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.util.*;
4+
5+
import org.junit.jupiter.api.Test;
6+
37
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
48
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
59
import com.fasterxml.jackson.databind.ObjectMapper;
610
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7-
import org.junit.jupiter.api.Test;
8-
9-
import java.util.*;
1011

1112
import static org.junit.jupiter.api.Assertions.assertEquals;
1213

@@ -58,13 +59,12 @@ public int compareTo(Bean o) {
5859
}
5960
}
6061

61-
private final ObjectMapper MAPPER = new ObjectMapper();
62+
private final ObjectMapper MAPPER = newJsonMapper();
6263

6364
// [databind#3069]
6465
@Test
6566
void serializationCollection() throws Exception {
6667
testSerializationCollection(MAPPER, new TreeSet<>(abc()));
67-
//testSerializationEnumSet(MAPPER, EnumSet.of(addEnum(BeanEnum.class, a), addEnum(BeanEnum.class, b)));
6868
}
6969

7070
@Test
@@ -99,11 +99,6 @@ private void testSerializationCollection(final ObjectMapper mapper, final Collec
9999
assertEquals(getExpectedResult(), mapper.writeValueAsString(collection));
100100
}
101101

102-
private void testSerializationEnumSet(final ObjectMapper mapper, final EnumSet<?> enumSet)
103-
throws Exception {
104-
assertEquals(getExpectedResult(), mapper.writeValueAsString(enumSet));
105-
}
106-
107102
private void testSerializationIndexedList(final ObjectMapper mapper, final List<Bean> list) throws Exception {
108103
assertEquals(getExpectedResult(), mapper.writeValueAsString(list));
109104
}

‎src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.util.Collection;
4+
import java.util.Collections;
5+
6+
import org.junit.jupiter.api.Test;
7+
38
import com.fasterxml.jackson.annotation.JsonTypeInfo;
49
import com.fasterxml.jackson.databind.ObjectMapper;
510
import com.fasterxml.jackson.databind.json.JsonMapper;
611
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
712
import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
8-
import org.junit.jupiter.api.Test;
9-
10-
import java.util.Collection;
11-
import java.util.Collections;
1213

1314
import static org.junit.jupiter.api.Assertions.assertEquals;
1415

‎src/test/java/com/fasterxml/jackson/failing/DelegatingCreatorWithAbstractProp2252Test.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.util.ArrayList;
4+
import java.util.Map;
5+
6+
import org.junit.jupiter.api.Test;
7+
38
import com.fasterxml.jackson.annotation.JsonCreator;
49
import com.fasterxml.jackson.databind.ObjectMapper;
510
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
6-
import org.junit.jupiter.api.Test;
7-
8-
import java.util.ArrayList;
9-
import java.util.Map;
1011

1112
import static org.junit.jupiter.api.Assertions.assertNotNull;
1213

‎src/test/java/com/fasterxml/jackson/failing/DeserializerUpdateProperties4358Test.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
package com.fasterxml.jackson.failing;
22

3+
import java.io.IOException;
4+
import java.util.ArrayList;
5+
import java.util.Arrays;
6+
import java.util.List;
7+
import java.util.concurrent.CopyOnWriteArrayList;
8+
9+
import org.junit.jupiter.api.BeforeAll;
10+
import org.junit.jupiter.api.Test;
11+
312
import com.fasterxml.jackson.annotation.JsonCreator;
413
import com.fasterxml.jackson.annotation.JsonProperty;
14+
515
import com.fasterxml.jackson.core.JacksonException;
616
import com.fasterxml.jackson.core.JsonParser;
17+
718
import com.fasterxml.jackson.databind.*;
819
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
920
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
1021
import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
1122
import com.fasterxml.jackson.databind.module.SimpleModule;
1223
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
13-
import org.junit.jupiter.api.BeforeAll;
14-
import org.junit.jupiter.api.Test;
15-
16-
import java.io.IOException;
17-
import java.util.ArrayList;
18-
import java.util.Arrays;
19-
import java.util.List;
20-
import java.util.concurrent.CopyOnWriteArrayList;
2124

2225
import static org.junit.jupiter.api.Assertions.assertEquals;
2326

‎src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.fasterxml.jackson.failing;
22

3-
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.fasterxml.jackson.annotation.JsonSubTypes;
5-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
6-
import com.fasterxml.jackson.annotation.JsonUnwrapped;
3+
import org.junit.jupiter.api.Test;
4+
5+
import com.fasterxml.jackson.annotation.*;
6+
77
import com.fasterxml.jackson.databind.ObjectMapper;
88
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
9-
import org.junit.jupiter.api.Test;
109

1110
import static org.junit.jupiter.api.Assertions.*;
1211

‎src/test/java/com/fasterxml/jackson/failing/ImplicitParamsForCreator806Test.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.fasterxml.jackson.failing;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.databind.ObjectMapper;
46
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
57
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
68
import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
79
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
810
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
9-
import org.junit.jupiter.api.Test;
1011

1112
import static org.junit.jupiter.api.Assertions.assertEquals;
1213
import static org.junit.jupiter.api.Assertions.assertNotNull;

‎src/test/java/com/fasterxml/jackson/failing/InnerClassNonStaticCore384Test.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.fasterxml.jackson.failing;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
5-
import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
6-
import org.junit.jupiter.api.Test;
7-
83
import java.io.IOException;
94
import java.util.ArrayList;
105
import java.util.List;
116
import java.util.Objects;
127

8+
import org.junit.jupiter.api.Test;
9+
10+
import com.fasterxml.jackson.databind.ObjectMapper;
11+
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
12+
import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
13+
1314
import static org.junit.jupiter.api.Assertions.assertEquals;
1415
import static org.junit.jupiter.api.Assertions.assertTrue;
1516

0 commit comments

Comments
 (0)