@@ -495,24 +495,29 @@ public void testSubobjectsWithRootObjectMapperNamespaceValidator() throws Except
495
495
}
496
496
}
497
497
}""" ;
498
+
499
+ final String [] validSubojectsValues = ObjectMapper .SUB_OBJECTS_AUTO_FEATURE_FLAG
500
+ ? new String [] { "false" , "true" , "auto" }
501
+ : new String [] { "false" , "true" };
502
+
498
503
{
499
504
String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , "false" ).replace ("<FIELD_NAME>" , "_project" );
500
505
Exception e = expectThrows (IllegalArgumentException .class , () -> createMapperServiceWithNamespaceValidator (json , validator ));
501
506
assertThat (e .getMessage (), equalTo (errorMessage ));
502
507
}
503
508
{
504
- String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , randomFrom ( "true" , "auto" ) ).replace ("<FIELD_NAME>" , "_project" );
509
+ String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , "true" ).replace ("<FIELD_NAME>" , "_project" );
505
510
Exception e = expectThrows (IllegalArgumentException .class , () -> createMapperServiceWithNamespaceValidator (json , validator ));
506
511
assertThat (e .getMessage (), equalTo (errorMessage ));
507
512
}
508
513
{
509
- String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , randomFrom ("false" , "true" , "auto" ))
514
+ String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , randomFrom (validSubojectsValues ))
510
515
.replace ("<FIELD_NAME>" , "_project.foo" );
511
516
Exception e = expectThrows (IllegalArgumentException .class , () -> createMapperServiceWithNamespaceValidator (json , validator ));
512
517
assertThat (e .getMessage (), equalTo (errorMessage ));
513
518
}
514
519
{
515
- String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , randomFrom ("false" , "true" , "auto" ))
520
+ String json = withSubobjects .replace ("<SUBOBJECTS_SETTING>" , randomFrom (validSubojectsValues ))
516
521
.replace ("<FIELD_NAME>" , "project.foo" );
517
522
MapperService mapperService = createMapperServiceWithNamespaceValidator (json , validator );
518
523
assertNotNull (mapperService );
0 commit comments