Browse Source

Deprecate JiBX marshaller

Resolves #22249
pull/22253/head
Arjen Poutsma 7 years ago
parent
commit
5938ca9a7c
  1. 4
      spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
  2. 4
      spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
  3. 2
      spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd
  4. 5
      spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
  5. 3
      spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java

4
spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,7 +25,9 @@ import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
* *
* @author Arjen Poutsma * @author Arjen Poutsma
* @since 3.0 * @since 3.0
* @deprecated as of Spring Framework 5.1.5, due to the lack of activity on the JiBX project
*/ */
@Deprecated
class JibxMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser { class JibxMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
@Override @Override

4
spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -81,7 +81,9 @@ import org.springframework.util.xml.StaxUtils;
* @since 3.0 * @since 3.0
* @see org.jibx.runtime.IMarshallingContext * @see org.jibx.runtime.IMarshallingContext
* @see org.jibx.runtime.IUnmarshallingContext * @see org.jibx.runtime.IUnmarshallingContext
* @deprecated as of Spring Framework 5.1.5, due to the lack of activity on the JiBX project
*/ */
@Deprecated
public class JibxMarshaller extends AbstractMarshaller implements InitializingBean { public class JibxMarshaller extends AbstractMarshaller implements InitializingBean {
private static final String DEFAULT_BINDING_NAME = "binding"; private static final String DEFAULT_BINDING_NAME = "binding";

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

@ -50,7 +50,7 @@
<xsd:complexType> <xsd:complexType>
<xsd:annotation> <xsd:annotation>
<xsd:documentation source="java:org.springframework.oxm.jibx.JibxMarshaller"> <xsd:documentation source="java:org.springframework.oxm.jibx.JibxMarshaller">
Defines a JiBX Marshaller. Defines a JiBX Marshaller. Deprecated as of Spring Framework 5.1.5!
</xsd:documentation> </xsd:documentation>
<xsd:appinfo> <xsd:appinfo>
<tool:annotation> <tool:annotation>

5
spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ import org.junit.Test;
import org.springframework.oxm.AbstractMarshallerTests; import org.springframework.oxm.AbstractMarshallerTests;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.xmlunit.matchers.CompareMatcher.*; import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
/** /**
* NOTE: These tests fail under Eclipse/IDEA because JiBX binding does not occur by * NOTE: These tests fail under Eclipse/IDEA because JiBX binding does not occur by
@ -35,6 +35,7 @@ import static org.xmlunit.matchers.CompareMatcher.*;
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Sam Brannen * @author Sam Brannen
*/ */
@Deprecated
public class JibxMarshallerTests extends AbstractMarshallerTests<JibxMarshaller> { public class JibxMarshallerTests extends AbstractMarshallerTests<JibxMarshaller> {
@BeforeClass @BeforeClass

3
spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -34,6 +34,7 @@ import static org.junit.Assert.*;
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Sam Brannen * @author Sam Brannen
*/ */
@Deprecated
public class JibxUnmarshallerTests extends AbstractUnmarshallerTests<JibxMarshaller> { public class JibxUnmarshallerTests extends AbstractUnmarshallerTests<JibxMarshaller> {
protected static final String INPUT_STRING_WITH_SPECIAL_CHARACTERS = protected static final String INPUT_STRING_WITH_SPECIAL_CHARACTERS =

Loading…
Cancel
Save