Fix tests by moving JAXB2 types back into sub-package

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;

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;

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElement.java → 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

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithName.java → 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;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithNameAndNamespace.java → 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;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlType.java → 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

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithName.java → 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;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithNameAndNamespace.java → 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;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/package-info.java → spring-web-reactive/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java

 @javax.xml.bind.annotation.XmlSchema(namespace = "namespace")
-package org.springframework.http.codec.xml;
+package org.springframework.http.codec.xml.jaxb;