Clean up wrt JDK17/record test refactoring

Author: cowtowncoder

src/test/java/tools/jackson/databind/records/Jdk8ConstructorParameterNameAnnotationIntrospector.java

@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.json.JsonMapper;
 import tools.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,10 +34,7 @@ public CreatorTestObject(
         }
     }
 
-    private final ObjectMapper OBJECT_MAPPER =
-            JsonMapper.builder()
-                    .annotationIntrospector(new Jdk8ConstructorParameterNameAnnotationIntrospector())
-                    .build();
+    private final ObjectMapper OBJECT_MAPPER = newJsonMapper();
 
     @Test
     public void testPlain() throws Exception

src/test/java/tools/jackson/databind/records/RecordCreatorSerialization4452Test.java

@@ -303,7 +303,6 @@ public void testDeserializeUsingImplicitCanonicalConstructor_WhenFactoryMethodsE
     public void testDeserializeMultipleConstructorsRecord_WithExplicitAndImplicitParameterNames_WithJsonCreator() throws Exception {
         final ObjectMapper mapper = jsonMapperBuilder()
                 .disable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
-                .annotationIntrospector(new Jdk8ConstructorParameterNameAnnotationIntrospector())
                 .build();
 
         RecordWithJsonPropertyAndImplicitPropertyWithJsonCreator value = mapper.readValue(
@@ -321,10 +320,7 @@ public void testDeserializeMultipleConstructorsRecord_WithExplicitAndImplicitPar
      */
     @Test
     public void testDeserializeMultipleConstructorsRecord_WithExplicitAndImplicitParameterNames() throws Exception {
-        final ObjectMapper mapper = jsonMapperBuilder()
-                .annotationIntrospector(new Jdk8ConstructorParameterNameAnnotationIntrospector())
-                .build();
-        RecordWithJsonPropertyAndImplicitPropertyWithoutJsonCreator value = mapper.readValue(
+        RecordWithJsonPropertyAndImplicitPropertyWithoutJsonCreator value = MAPPER.readValue(
                     "{\"id_only\":123,\"email\":\"[email protected]\"}",
                     RecordWithJsonPropertyAndImplicitPropertyWithoutJsonCreator.class);
         assertEquals(123, value.id);

src/test/java/tools/jackson/databind/records/RecordExplicitCreatorsTest.java

@@ -325,11 +325,7 @@ public void testDeserializeUsingImplicitDelegatingConstructor() throws Exception
     @Test
     public void testDeserializeMultipleConstructorsRecord_WithImplicitParameterNames_WillUseCanonicalConstructor() throws Exception
     {
-        ObjectMapper mapper = jsonMapperBuilder()
-                .annotationIntrospector(new Jdk8ConstructorParameterNameAnnotationIntrospector())
-                .build();
-
-        RecordWithNonCanonicalConstructor value = mapper.readValue(
+        RecordWithNonCanonicalConstructor value = MAPPER.readValue(
                 "{\"id\":123,\"name\":\"Bob\",\"email\":\"[email protected]\"}",
                 RecordWithNonCanonicalConstructor.class);
 
@@ -339,10 +335,7 @@ public void testDeserializeMultipleConstructorsRecord_WithImplicitParameterNames
     @Test
     public void testDeserializeMultipleConstructorsRecord_WithImplicitParameterNames_WillIgnoreNonCanonicalConstructor() throws Exception
     {
-        ObjectMapper mapper = jsonMapperBuilder()
-                .annotationIntrospector(new Jdk8ConstructorParameterNameAnnotationIntrospector())
-                .build();
-        RecordWithNonCanonicalConstructor value = mapper.readValue(
+        RecordWithNonCanonicalConstructor value = MAPPER.readValue(
                 "{\"id\":123,\"email\":\"[email protected]\"}",
                 RecordWithNonCanonicalConstructor.class);
 

src/test/java/tools/jackson/databind/records/RecordImplicitCreatorsTest.java

@@ -27,7 +27,6 @@ public RecordWithSingleValueCanonAndMultiValueAltConstructor(String name, String
     }
 
     private final ObjectMapper MAPPER = jsonMapperBuilder()
-            .annotationIntrospector(new Jdk8ConstructorParameterNameAnnotationIntrospector())
             .constructorDetector(ConstructorDetector.USE_PROPERTIES_BASED)
             .build();