diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java index d2f2dfd9b1..5dbc3e3afb 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java @@ -595,8 +595,8 @@ public class Jackson2ObjectMapperBuilder { * @see #modulesToInstall(Module...) * @see com.fasterxml.jackson.databind.Module */ - @SuppressWarnings("unchecked") - public Jackson2ObjectMapperBuilder modulesToInstall(Class... modules) { + @SafeVarargs + public final Jackson2ObjectMapperBuilder modulesToInstall(Class... modules) { this.moduleClasses = modules; this.findWellKnownModules = true; return this; diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java index 6925ddaf1a..36338243c2 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java @@ -409,8 +409,8 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean... modules) { + @SafeVarargs + public final void setModulesToInstall(Class... modules) { this.builder.modulesToInstall(modules); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java index d52db8bd7e..81a8fe3fa1 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java @@ -242,7 +242,6 @@ class Jackson2ObjectMapperBuilderTests { } @Test - @SuppressWarnings("unchecked") void modulesToInstallByClass() { ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json() .modulesToInstall(CustomIntegerModule.class) @@ -292,7 +291,6 @@ class Jackson2ObjectMapperBuilderTests { } @Test // SPR-12634 - @SuppressWarnings("unchecked") void customizeWellKnownModulesWithModuleClass() throws JsonProcessingException, UnsupportedEncodingException { diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java index f4d2b7fb62..8968b87234 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java @@ -213,7 +213,6 @@ public class Jackson2ObjectMapperFactoryBeanTests { } @Test // SPR-12634 - @SuppressWarnings("unchecked") public void customizeDefaultModulesWithModuleClass() throws JsonProcessingException, UnsupportedEncodingException { this.factory.setModulesToInstall(CustomIntegerModule.class); this.factory.afterPropertiesSet();