Browse Source

Deprecate Castor support

Issue: SPR-16219
pull/1601/merge
Juergen Hoeller 8 years ago
parent
commit
08c78554b9
  1. 4
      spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
  2. 6
      spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
  3. 6
      spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
  4. 3
      spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
  5. 2
      spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd

4
spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2017 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.
@ -23,7 +23,9 @@ import org.springframework.oxm.XmlMappingException; @@ -23,7 +23,9 @@ import org.springframework.oxm.XmlMappingException;
*
* @author Juergen Hoeller
* @since 3.0
* @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
*/
@Deprecated
@SuppressWarnings("serial")
public class CastorMappingException extends XmlMappingException {

6
spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java

@ -74,8 +74,8 @@ import org.springframework.util.xml.StaxUtils; @@ -74,8 +74,8 @@ import org.springframework.util.xml.StaxUtils;
* can only be used to unmarshal XML that represents that specific class. If you want to unmarshal
* multiple classes, you have to provide a mapping file using {@code setMappingLocations}.
*
* <p>Due to limitations of Castor's API, it is required to set the encoding used for
* writing to output streams. It defaults to {@code UTF-8}.
* <p>Due to limitations of Castor's API, it is required to set the encoding used for writing
* to output streams. It defaults to {@code UTF-8}.
*
* @author Arjen Poutsma
* @author Jakub Narloch
@ -86,7 +86,9 @@ import org.springframework.util.xml.StaxUtils; @@ -86,7 +86,9 @@ import org.springframework.util.xml.StaxUtils;
* @see #setTargetPackages(String[])
* @see #setMappingLocation(Resource)
* @see #setMappingLocations(Resource[])
* @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
*/
@Deprecated
public class CastorMarshaller extends AbstractMarshaller implements InitializingBean, BeanClassLoaderAware {
/**

6
spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2017 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,8 +25,10 @@ import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; @@ -25,8 +25,10 @@ import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
*
* @author Jakub Narloch
* @since 3.1
* @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
*/
public class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
@Deprecated
class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
@Override
protected String getBeanClassName(Element element) {

3
spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 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.
@ -27,6 +27,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; @@ -27,6 +27,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
*/
public class OxmNamespaceHandler extends NamespaceHandlerSupport {
@SuppressWarnings("deprecation")
@Override
public void init() {
registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());

2
spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd

@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
<xsd:annotation>
<xsd:documentation
source="java:org.springframework.oxm.castor.CastorMarshaller">
Defines a Castor Marshaller.
Defines a Castor Marshaller. Deprecated as of Spring Framework 4.3.13!
</xsd:documentation>
<xsd:appinfo>
<tool:annotation>

Loading…
Cancel
Save