From 39253b314af2c1d896a901987c57ee468ef37a6e Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 30 Jun 2016 14:09:09 -0400 Subject: [PATCH] Fix tests by moving JAXB2 types back into sub-package --- .../springframework/http/codec/xml/Jaxb2DecoderTests.java | 6 ++++++ .../http/codec/xml/XmlEventDecoderTests.java | 1 + .../http/codec/xml/{ => jaxb}/XmlRootElement.java | 2 +- .../http/codec/xml/{ => jaxb}/XmlRootElementWithName.java | 2 +- .../xml/{ => jaxb}/XmlRootElementWithNameAndNamespace.java | 2 +- .../springframework/http/codec/xml/{ => jaxb}/XmlType.java | 2 +- .../http/codec/xml/{ => jaxb}/XmlTypeWithName.java | 2 +- .../codec/xml/{ => jaxb}/XmlTypeWithNameAndNamespace.java | 2 +- .../http/codec/xml/{ => jaxb}/package-info.java | 2 +- 9 files changed, 14 insertions(+), 7 deletions(-) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/XmlRootElement.java (93%) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/XmlRootElementWithName.java (94%) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/XmlRootElementWithNameAndNamespace.java (94%) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/XmlType.java (93%) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/XmlTypeWithName.java (93%) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/XmlTypeWithNameAndNamespace.java (94%) rename spring-web-reactive/src/test/java/org/springframework/http/codec/xml/{ => jaxb}/package-info.java (55%) diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/Jaxb2DecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/Jaxb2DecoderTests.java index 40c19a68403..5cfbe1945d6 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/Jaxb2DecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/Jaxb2DecoderTests.java @@ -29,6 +29,12 @@ import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; import org.springframework.http.codec.Pojo; +import org.springframework.http.codec.xml.jaxb.XmlRootElement; +import org.springframework.http.codec.xml.jaxb.XmlRootElementWithName; +import org.springframework.http.codec.xml.jaxb.XmlRootElementWithNameAndNamespace; +import org.springframework.http.codec.xml.jaxb.XmlType; +import org.springframework.http.codec.xml.jaxb.XmlTypeWithName; +import org.springframework.http.codec.xml.jaxb.XmlTypeWithNameAndNamespace; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java index 09a82eb9ac1..fa942c9b947 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java @@ -23,6 +23,7 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; +import org.springframework.http.codec.xml.XmlEventDecoder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElement.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java similarity index 93% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElement.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java index 497ade650f1..746d218c776 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElement.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithName.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java similarity index 94% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithName.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java index ac8dca65016..6509be89979 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithName.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb; import javax.xml.bind.annotation.XmlRootElement; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithNameAndNamespace.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java similarity index 94% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithNameAndNamespace.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java index 2dc4afd0b16..0a702e2f01b 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithNameAndNamespace.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb; import javax.xml.bind.annotation.XmlRootElement; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlType.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java similarity index 93% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlType.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java index f9b73eae39e..747d99e5c16 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlType.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithName.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java similarity index 93% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithName.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java index 0efa8dff311..11b5f251f1e 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithName.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb; import javax.xml.bind.annotation.XmlType; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithNameAndNamespace.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java similarity index 94% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithNameAndNamespace.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java index c1ad65bde7c..3396397d668 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithNameAndNamespace.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb; import javax.xml.bind.annotation.XmlType; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/package-info.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java similarity index 55% rename from spring-web-reactive/src/test/java/org/springframework/http/codec/xml/package-info.java rename to spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java index 2f5da29e85b..f3b3a59496b 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/package-info.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "namespace") -package org.springframework.http.codec.xml; +package org.springframework.http.codec.xml.jaxb;