Consistently use mutable ArrayList for modulesToInstall vs modules

Closes gh-30751
spring-projects · Jun 26, 2023 · 062d701 · 062d701
1 parent 7137b22
commit 062d701
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 30 deletions.
diff --git a/...eb/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/...eb/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -581,7 +581,7 @@ public Jackson2ObjectMapperBuilder modules(Consumer<List<Module>> consumer) {
 	 * @see com.fasterxml.jackson.databind.Module
 	 */
 	public Jackson2ObjectMapperBuilder modulesToInstall(Module... modules) {
-		this.modules = Arrays.asList(modules);
+		this.modules = new ArrayList<>(Arrays.asList(modules));
 		this.findWellKnownModules = true;
 		return this;
 	}

diff --git a/...c/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/...c/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
@@ -228,26 +228,6 @@ void wrongTimeZoneStringSetter() {
 				Jackson2ObjectMapperBuilder.json().timeZone(zoneId).build());
 	}
 
-	@Test
-	void modules() {
-		NumberSerializer serializer1 = new NumberSerializer(Integer.class);
-		SimpleModule module = new SimpleModule();
-		module.addSerializer(Integer.class, serializer1);
-		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().modules(module).build();
-		Serializers serializers = getSerializerFactoryConfig(objectMapper).serializers().iterator().next();
-		assertThat(serializers.findSerializer(null, SimpleType.construct(Integer.class), null)).isSameAs(serializer1);
-	}
-
-	@Test
-	void modulesWithConsumer() {
-		NumberSerializer serializer1 = new NumberSerializer(Integer.class);
-		SimpleModule module = new SimpleModule();
-		module.addSerializer(Integer.class, serializer1);
-		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().modules(list -> list.add(module) ).build();
-		Serializers serializers = getSerializerFactoryConfig(objectMapper).serializers().iterator().next();
-		assertThat(serializers.findSerializer(null, SimpleType.construct(Integer.class), null)).isSameAs(serializer1);
-	}
-
 	@Test
 	void modulesToInstallByClass() {
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
@@ -311,14 +291,15 @@ void registerMultipleModulesWithNullTypeId() {
 		barModule.addSerializer(new BarSerializer());
 		builder.modulesToInstall(fooModule, barModule);
 		ObjectMapper objectMapper = builder.build();
+
 		assertThat(StreamSupport
-		.stream(getSerializerFactoryConfig(objectMapper).serializers().spliterator(), false)
-		.filter(s -> s.findSerializer(null, SimpleType.construct(Foo.class), null) != null)
-		.count()).isEqualTo(1);
+				.stream(getSerializerFactoryConfig(objectMapper).serializers().spliterator(), false)
+				.filter(s -> s.findSerializer(null, SimpleType.construct(Foo.class), null) != null)
+				.count()).isEqualTo(1);
 		assertThat(StreamSupport
-		.stream(getSerializerFactoryConfig(objectMapper).serializers().spliterator(), false)
-		.filter(s -> s.findSerializer(null, SimpleType.construct(Bar.class), null) != null)
-		.count()).isEqualTo(1);
+				.stream(getSerializerFactoryConfig(objectMapper).serializers().spliterator(), false)
+				.filter(s -> s.findSerializer(null, SimpleType.construct(Bar.class), null) != null)
+				.count()).isEqualTo(1);
 	}
 
 	private static SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) {
@@ -329,6 +310,38 @@ private static DeserializerFactoryConfig getDeserializerFactoryConfig(ObjectMapp
 		return ((BasicDeserializerFactory) objectMapper.getDeserializationContext().getFactory()).getFactoryConfig();
 	}
 
+	@Test
+	void modules() {
+		NumberSerializer serializer1 = new NumberSerializer(Integer.class);
+		SimpleModule module = new SimpleModule();
+		module.addSerializer(Integer.class, serializer1);
+		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().modules(module).build();
+		Serializers serializers = getSerializerFactoryConfig(objectMapper).serializers().iterator().next();
+		assertThat(serializers.findSerializer(null, SimpleType.construct(Integer.class), null)).isSameAs(serializer1);
+	}
+
+	@Test
+	void modulesWithConsumer() {
+		NumberSerializer serializer1 = new NumberSerializer(Integer.class);
+		SimpleModule module = new SimpleModule();
+		module.addSerializer(Integer.class, serializer1);
+		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().modules(list -> list.add(module) ).build();
+		Serializers serializers = getSerializerFactoryConfig(objectMapper).serializers().iterator().next();
+		assertThat(serializers.findSerializer(null, SimpleType.construct(Integer.class), null)).isSameAs(serializer1);
+	}
+
+	@Test
+	void modulesWithConsumerAfterModulesToInstall() {
+		NumberSerializer serializer1 = new NumberSerializer(Integer.class);
+		SimpleModule module = new SimpleModule();
+		module.addSerializer(Integer.class, serializer1);
+		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
+				.modulesToInstall(new JavaTimeModule())
+				.modules(list -> list.add(module) ).build();
+		Serializers serializers = getSerializerFactoryConfig(objectMapper).serializers().iterator().next();
+		assertThat(serializers.findSerializer(null, SimpleType.construct(Integer.class), null)).isSameAs(serializer1);
+	}
+
 	@Test
 	void propertyNamingStrategy() {
 		PropertyNamingStrategy strategy = new PropertyNamingStrategy.SnakeCaseStrategy();
@@ -341,7 +354,7 @@ void propertyNamingStrategy() {
 	void serializerByType() {
 		JsonSerializer<Number> serializer = new NumberSerializer(Integer.class);
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
-				.modules(new ArrayList<>())  // Disable well-known modules detection
+				.modules(new ArrayList<>())  // disable well-known modules detection
 				.serializerByType(Boolean.class, serializer)
 				.build();
 		assertThat(getSerializerFactoryConfig(objectMapper).hasSerializers()).isTrue();
@@ -353,7 +366,7 @@ void serializerByType() {
 	void deserializerByType() throws JsonMappingException {
 		JsonDeserializer<Date> deserializer = new DateDeserializers.DateDeserializer();
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
-				.modules(new ArrayList<>())  // Disable well-known modules detection
+				.modules(new ArrayList<>())  // disable well-known modules detection
 				.deserializerByType(Date.class, deserializer)
 				.build();
 		assertThat(getDeserializerFactoryConfig(objectMapper).hasDeserializers()).isTrue();
@@ -434,7 +447,7 @@ void completeSetup() throws JsonMappingException {
 		JsonSerializer<Number> serializer2 = new NumberSerializer(Integer.class);
 
 		Jackson2ObjectMapperBuilder builder = Jackson2ObjectMapperBuilder.json()
-				.modules(new ArrayList<>())  // Disable well-known modules detection
+				.modules(new ArrayList<>())  // disable well-known modules detection
 				.serializers(serializer1)
 				.serializersByType(Collections.singletonMap(Boolean.class, serializer2))
 				.deserializersByType(deserializerMap)