Move remaining JAXB2 test files from core to http

spring-web-reactive/src/main/java/org/springframework/core/codec/support/CharSequenceEncoder.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.core.codec.support;
+
+import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+
+import org.springframework.core.ResolvableType;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.util.MimeType;
+
+/**
+ *
+ * @author Rossen Stoyanchev
+ */
+public class CharSequenceEncoder extends AbstractEncoder<CharSequence> {
+
+	private final StringEncoder stringEncoder;
+
+
+	public CharSequenceEncoder(StringEncoder encoder) {
+		super(encoder.getEncodableMimeTypes().toArray(new MimeType[encoder.getEncodableMimeTypes().size()]));
+		this.stringEncoder = encoder;
+	}
+
+
+	@Override
+	public Flux<DataBuffer> encode(Publisher<? extends CharSequence> inputStream,
+			DataBufferFactory bufferFactory, ResolvableType elementType,
+			MimeType mimeType, Object... hints) {
+
+		return this.stringEncoder.encode(
+				Flux.from(inputStream).map(CharSequence::toString),
+				bufferFactory, elementType, mimeType, hints);
+	}
+
+}

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/Jaxb2DecoderTests.java

@@ -25,20 +25,14 @@ import reactor.core.publisher.Flux;
 import reactor.core.test.TestSubscriber;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.core.codec.support.jaxb.XmlRootElement;
-import org.springframework.core.codec.support.jaxb.XmlRootElementWithName;
-import org.springframework.core.codec.support.jaxb.XmlRootElementWithNameAndNamespace;
-import org.springframework.core.codec.support.jaxb.XmlType;
-import org.springframework.core.codec.support.jaxb.XmlTypeWithName;
-import org.springframework.core.codec.support.jaxb.XmlTypeWithNameAndNamespace;
 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.Jaxb2Decoder;
-import org.springframework.http.codec.xml.XmlEventDecoder;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Sebastien Deleuze

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java

@@ -23,7 +23,6 @@ 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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.codec.support.jaxb;
+package org.springframework.http.codec.xml;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.codec.support.jaxb;
+package org.springframework.http.codec.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlRootElementWithNameAndNamespace.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.codec.support.jaxb;
+package org.springframework.http.codec.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.codec.support.jaxb;
+package org.springframework.http.codec.xml;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.codec.support.jaxb;
+package org.springframework.http.codec.xml;
 
 import javax.xml.bind.annotation.XmlType;
 

spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlTypeWithNameAndNamespace.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.codec.support.jaxb;
+package org.springframework.http.codec.xml;
 
 import javax.xml.bind.annotation.XmlType;
 

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

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