Skip to content

Commit 02ee7fd

Browse files
committed
Suppress Jackson 2 warnings
See gh-45535
1 parent 5bdb0ec commit 02ee7fd

File tree

26 files changed

+34
-2
lines changed

26 files changed

+34
-2
lines changed

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/github/StandardGitHub.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ final class StandardGitHub implements GitHub {
4545

4646
@Override
4747
public GitHubRepository getRepository(String organization, String name) {
48-
RestTemplate restTemplate = new RestTemplate(
49-
Collections.singletonList(new MappingJackson2HttpMessageConverter(new ObjectMapper())));
48+
RestTemplate restTemplate = createRestTemplate();
5049
restTemplate.getInterceptors().add((request, body, execution) -> {
5150
request.getHeaders().add("User-Agent", StandardGitHub.this.username);
5251
request.getHeaders()
@@ -61,4 +60,9 @@ public GitHubRepository getRepository(String organization, String name) {
6160
return new StandardGitHubRepository(restTemplate);
6261
}
6362

63+
@SuppressWarnings("removal")
64+
private RestTemplate createRestTemplate() {
65+
return new RestTemplate(Collections.singletonList(new MappingJackson2HttpMessageConverter(new ObjectMapper())));
66+
}
67+
6468
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jackson/JacksonEndpointAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
*/
3939
@Configuration(proxyBeanMethods = false)
4040
@AutoConfigureAfter(JacksonAutoConfiguration.class)
41+
@SuppressWarnings("removal")
4142
public class JacksonEndpointAutoConfiguration {
4243

4344
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/reactive/WebFluxEndpointManagementContextConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ private void process(ServerCodecConfigurer configurer) {
180180
}
181181
}
182182

183+
@SuppressWarnings("removal")
183184
private void process(Encoder<?> encoder) {
184185
if (encoder instanceof Jackson2JsonEncoder jackson2JsonEncoder) {
185186
jackson2JsonEncoder.registerObjectMappersForType(OperationResponseBody.class, (associations) -> {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ static EndpointObjectMapperWebMvcConfigurer endpointObjectMapperWebMvcConfigurer
151151
* {@link OperationResponseBody} to {@link MappingJackson2HttpMessageConverter}
152152
* instances.
153153
*/
154+
@SuppressWarnings("removal")
154155
static class EndpointObjectMapperWebMvcConfigurer implements WebMvcConfigurer {
155156

156157
private static final List<MediaType> MEDIA_TYPES = Collections
@@ -171,6 +172,7 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
171172
}
172173
}
173174

175+
@SuppressWarnings("removal")
174176
private void configure(MappingJackson2HttpMessageConverter converter) {
175177
converter.registerObjectMappersForType(OperationResponseBody.class, (associations) -> {
176178
ObjectMapper objectMapper = this.endpointObjectMapper.get();

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/EndpointObjectMapperConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
* @author Phillip Webb
3838
*/
3939
@Configuration
40+
@SuppressWarnings("removal")
4041
class EndpointObjectMapperConfiguration {
4142

4243
@Bean

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ void nullType() {
7171
}
7272

7373
@Test
74+
@SuppressWarnings("removal")
7475
void jsonFormat() throws Exception {
7576
AuditEvent event = new AuditEvent("johannes", "UNKNOWN",
7677
Collections.singletonMap("type", (Object) "BadCredentials"));

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void run() {
164164
/**
165165
* Early initializer for Jackson.
166166
*/
167+
@SuppressWarnings("removal")
167168
private static final class JacksonInitializer implements Runnable {
168169

169170
@Override

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
@ConditionalOnClass(RepositoryRestMvcConfiguration.class)
5454
@EnableConfigurationProperties(RepositoryRestProperties.class)
5555
@Import(RepositoryRestMvcConfiguration.class)
56+
@SuppressWarnings("removal")
5657
public class RepositoryRestMvcAutoConfiguration {
5758

5859
@Bean

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
* @author Stephane Nicoll
3535
*/
3636
@Order(0)
37+
@SuppressWarnings("removal")
3738
class SpringBootRepositoryRestConfigurer implements RepositoryRestConfigurer {
3839

3940
private final Jackson2ObjectMapperBuilder objectMapperBuilder;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class GraphQlRSocketAutoConfiguration {
5454

5555
@Bean
5656
@ConditionalOnMissingBean
57+
@SuppressWarnings("removal")
5758
public GraphQlRSocketHandler graphQlRSocketHandler(ExecutionGraphQlService graphQlService,
5859
ObjectProvider<RSocketGraphQlInterceptor> interceptors, ObjectMapper objectMapper) {
5960
return new GraphQlRSocketHandler(graphQlService, interceptors.orderedStream().toList(),

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ private static class JacksonAndJsonbUnavailableCondition extends NoneNestedCondi
7979
super(ConfigurationPhase.REGISTER_BEAN);
8080
}
8181

82+
@SuppressWarnings("removal")
8283
@ConditionalOnBean(MappingJackson2HttpMessageConverter.class)
8384
static class JacksonAvailable {
8485

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConverters.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public List<HttpMessageConverter<?>> defaultMessageConverters() {
200200
return converters;
201201
}
202202

203+
@SuppressWarnings("removal")
203204
private void reorderXmlConvertersToEnd(List<HttpMessageConverter<?>> converters) {
204205
List<HttpMessageConverter<?>> xml = new ArrayList<>();
205206
for (Iterator<HttpMessageConverter<?>> iterator = converters.iterator(); iterator.hasNext();) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* @author Andy Wilkinson
3636
*/
3737
@Configuration(proxyBeanMethods = false)
38+
@SuppressWarnings("removal")
3839
class JacksonHttpMessageConvertersConfiguration {
3940

4041
@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ static class JsonbPreferred {
6565

6666
}
6767

68+
@SuppressWarnings("removal")
6869
@ConditionalOnMissingBean({ MappingJackson2HttpMessageConverter.class, GsonHttpMessageConverter.class })
6970
static class JacksonAndGsonMissing {
7071

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class CodecsAutoConfiguration {
5454

5555
@Configuration(proxyBeanMethods = false)
5656
@ConditionalOnClass(ObjectMapper.class)
57+
@SuppressWarnings("removal")
5758
static class JacksonCodecConfiguration {
5859

5960
@Bean

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* @since 1.4.0
3030
*/
3131
@FunctionalInterface
32+
@SuppressWarnings("removal")
3233
public interface Jackson2ObjectMapperBuilderCustomizer {
3334

3435
/**

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
*/
8787
@AutoConfiguration
8888
@ConditionalOnClass(ObjectMapper.class)
89+
@SuppressWarnings("removal")
8990
public class JacksonAutoConfiguration {
9091

9192
private static final Map<?, Boolean> FEATURE_DEFAULTS;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public RSocketStrategies rSocketStrategies(ObjectProvider<RSocketStrategiesCusto
6666

6767
@Configuration(proxyBeanMethods = false)
6868
@ConditionalOnClass({ ObjectMapper.class, CBORFactory.class })
69+
@SuppressWarnings("removal")
6970
protected static class JacksonCborStrategyConfiguration {
7071

7172
private static final MediaType[] SUPPORTED_TYPES = { MediaType.APPLICATION_CBOR };
@@ -85,6 +86,7 @@ public RSocketStrategiesCustomizer jacksonCborRSocketStrategyCustomizer(Jackson2
8586

8687
@Configuration(proxyBeanMethods = false)
8788
@ConditionalOnClass(ObjectMapper.class)
89+
@SuppressWarnings("removal")
8890
protected static class JacksonJsonStrategyConfiguration {
8991

9092
private static final MediaType[] SUPPORTED_TYPES = { MediaType.APPLICATION_JSON,

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ private static AsyncTaskExecutor determineAsyncTaskExecutor(Map<String, AsyncTas
8383

8484
@Override
8585
public boolean configureMessageConverters(List<MessageConverter> messageConverters) {
86+
@SuppressWarnings("removal")
8687
MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(this.objectMapper);
8788
DefaultContentTypeResolver resolver = new DefaultContentTypeResolver();
8889
resolver.setDefaultMimeType(MimeTypeUtils.APPLICATION_JSON);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ static class TestConfigurationWithRestMvcConfig {
161161
@Configuration(proxyBeanMethods = false)
162162
@TestAutoConfigurationPackage(City.class)
163163
@EnableWebMvc
164+
@SuppressWarnings("removal")
164165
static class TestConfigurationWithObjectMapperBuilder {
165166

166167
@Bean

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ void doesBackOffIfEnableHypermediaSupportIsDeclaredManually() {
8888
}
8989

9090
@Test
91+
@SuppressWarnings("removal")
9192
void whenUsingTheDefaultConfigurationThenMappingJacksonConverterCanWriteHateoasTypeAsApplicationJson() {
9293
this.contextRunner.run((context) -> {
9394
RequestMappingHandlerAdapter handlerAdapter = context.getBean(RequestMappingHandlerAdapter.class);
@@ -102,6 +103,7 @@ void whenUsingTheDefaultConfigurationThenMappingJacksonConverterCanWriteHateoasT
102103
}
103104

104105
@Test
106+
@SuppressWarnings("removal")
105107
void whenHalIsNotTheDefaultJsonMediaTypeThenMappingJacksonConverterCannotWriteHateoasTypeAsApplicationJson() {
106108
this.contextRunner.withPropertyValues("spring.hateoas.use-hal-as-default-json-media-type:false")
107109
.run((context) -> {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
* @author Moritz Halbritter
6969
* @author Sebastien Deleuze
7070
*/
71+
@SuppressWarnings("removal")
7172
class HttpMessageConvertersAutoConfigurationTests {
7273

7374
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
* @author Dave Syer
4545
* @author Phillip Webb
4646
*/
47+
@SuppressWarnings("removal")
4748
class HttpMessageConvertersTests {
4849

4950
@Test

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
* @author Ralf Ueberfuhr
9393
* @author Eddú Meléndez
9494
*/
95+
@SuppressWarnings("removal")
9596
class JacksonAutoConfigurationTests {
9697

9798
protected final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class RSocketStrategiesAutoConfigurationTests {
4949
AutoConfigurations.of(JacksonAutoConfiguration.class, RSocketStrategiesAutoConfiguration.class));
5050

5151
@Test
52+
@SuppressWarnings("removal")
5253
void shouldCreateDefaultBeans() {
5354
this.contextRunner.run((context) -> {
5455
assertThat(context).getBeans(RSocketStrategies.class).hasSize(1);

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ static class ExampleWebMvcRegistrations implements WebMvcRegistrations {
186186

187187
}
188188

189+
@SuppressWarnings("removal")
189190
static class ExampleMessageConverter extends MappingJackson2HttpMessageConverter {
190191

191192
}

0 commit comments

Comments
 (0)