Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-1496 - Removed deprecations at least introduced in Lovelace.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-03-13 16:21:31 +01:00
parent 78e635fba9
commit 0bf160eb97
39 changed files with 63 additions and 1901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolver.java
View File

@@ -30,7 +30,6 @@ import org.springframework.core.convert.ConversionService;
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
import org.springframework.util.ClassUtils;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.annotation.ModelAttributeMethodProcessor;
@@ -50,18 +49,6 @@ public class ProxyingHandlerMethodArgumentResolver extends ModelAttributeMethodP
private final SpelAwareProxyProjectionFactory proxyFactory;
private final ObjectFactory<ConversionService> conversionService;
/**
* Creates a new {@link PageableHandlerMethodArgumentResolver} using the given {@link ConversionService} and the
* {@link ModelAttribute} annotation not required.
*
* @param conversionService must not be {@literal null}.
* @deprecated use {@link #ProxyingHandlerMethodArgumentResolver(ObjectFactory, boolean)} instead.
*/
@Deprecated
public ProxyingHandlerMethodArgumentResolver(final ConversionService conversionService) {
this(() -> conversionService, true);
}
/**
* Creates a new {@link PageableHandlerMethodArgumentResolver} using the given {@link ConversionService}.
*

6
src/main/java/org/springframework/data/web/XmlBeamHttpMessageConverter.java
View File

@@ -58,7 +58,7 @@ public class XmlBeamHttpMessageConverter extends AbstractHttpMessageConverter<Ob
private static final long serialVersionUID = -1324345769124477493L;
/*
/*
* (non-Javadoc)
* @see org.xmlbeam.config.DefaultXMLFactoriesConfig#createDocumentBuilderFactory()
*/
@@ -77,7 +77,7 @@ public class XmlBeamHttpMessageConverter extends AbstractHttpMessageConverter<Ob
/**
* Creates a new {@link XmlBeamHttpMessageConverter} using the given {@link XBProjector}.
*
*
* @param projector must not be {@literal null}.
*/
public XmlBeamHttpMessageConverter(XBProjector projector) {
@@ -136,7 +136,7 @@ public class XmlBeamHttpMessageConverter extends AbstractHttpMessageConverter<Ob
Throwable cause = o_O.getCause();
if (SAXParseException.class.isInstance(cause)) {
throw new HttpMessageNotReadableException("Cannot read input message!", cause);
throw new HttpMessageNotReadableException("Cannot read input message!", cause, inputMessage);
} else {
throw o_O;
}