From da903904c9379d4bebce778e54fdce7cd9b74ba6 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 18 Jun 2019 13:00:00 +0300 Subject: [PATCH] Fix Javadoc reference to MediaType#APPLICATION_CBOR_VALUE {@value ...} cannot be used outside of the current type. --- ...ppingJackson2CborHttpMessageConverter.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java index 694d2fd82d..02c3151ef7 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,15 +25,17 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.util.Assert; /** - * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} - * that can read and write CBOR data format using - * + * Implementation of {@link org.springframework.http.converter.HttpMessageConverter + * HttpMessageConverter} that can read and write the CBOR + * data format using * the dedicated Jackson 2.x extension. * - *

By default, this converter supports {@value MediaType#APPLICATION_CBOR_VALUE} media type. This can be - * overridden by setting the {@link #setSupportedMediaTypes supportedMediaTypes} property. + *

By default, this converter supports the {@link MediaType#APPLICATION_CBOR_VALUE} + * media type. This can be overridden by setting the {@link #setSupportedMediaTypes + * supportedMediaTypes} property. * - *

The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}. + *

The default constructor uses the default configuration provided by + * {@link Jackson2ObjectMapperBuilder}. * *

Compatible with Jackson 2.9 and higher. * @@ -43,17 +45,18 @@ import org.springframework.util.Assert; public class MappingJackson2CborHttpMessageConverter extends AbstractJackson2HttpMessageConverter { /** - * Construct a new {@code MappingJackson2CborHttpMessageConverter} using default configuration - * provided by {@code Jackson2ObjectMapperBuilder}. + * Construct a new {@code MappingJackson2CborHttpMessageConverter} using the + * default configuration provided by {@code Jackson2ObjectMapperBuilder}. */ public MappingJackson2CborHttpMessageConverter() { this(Jackson2ObjectMapperBuilder.cbor().build()); } /** - * Construct a new {@code MappingJackson2CborHttpMessageConverter} with a custom {@link ObjectMapper} - * (must be configured with a {@code CBORFactory} instance). - * You can use {@link Jackson2ObjectMapperBuilder} to build it easily. + * Construct a new {@code MappingJackson2CborHttpMessageConverter} with a + * custom {@link ObjectMapper} (must be configured with a {@code CBORFactory} + * instance). + *

You can use {@link Jackson2ObjectMapperBuilder} to build it easily. * @see Jackson2ObjectMapperBuilder#cbor() */ public MappingJackson2CborHttpMessageConverter(ObjectMapper objectMapper) {