From f66494192ca6068147bbd2068a97a3bcdb691f5f Mon Sep 17 00:00:00 2001 From: Thai Nguyen Date: Sun, 30 Oct 2016 21:30:18 +0700 Subject: [PATCH] Revert "Change text/xml to application/xml" This reverts commit b61b82cd2a31831c43df1993d36997c762e21907. --- .../cxf/jaxrs/implementation/CourseRepository.java | 2 +- .../cxf/jaxrs/implementation/ServiceLiveTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-cxf/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java b/apache-cxf/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java index 4a826b664d..a2fd6be435 100644 --- a/apache-cxf/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java +++ b/apache-cxf/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; @Path("baeldung") -@Produces("application/xml") +@Produces("text/xml") public class CourseRepository { private Map courses = new HashMap<>(); diff --git a/apache-cxf/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java b/apache-cxf/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java index cf7af5070a..29c34ae16b 100644 --- a/apache-cxf/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java +++ b/apache-cxf/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java @@ -39,7 +39,7 @@ public class ServiceLiveTest { final HttpPut httpPut = new HttpPut(BASE_URL + "3"); final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("non_existent_course.xml"); httpPut.setEntity(new InputStreamEntity(resourceStream)); - httpPut.setHeader("Content-Type", "application/xml"); + httpPut.setHeader("Content-Type", "text/xml"); final HttpResponse response = client.execute(httpPut); assertEquals(404, response.getStatusLine().getStatusCode()); @@ -50,7 +50,7 @@ public class ServiceLiveTest { final HttpPut httpPut = new HttpPut(BASE_URL + "1"); final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("unchanged_course.xml"); httpPut.setEntity(new InputStreamEntity(resourceStream)); - httpPut.setHeader("Content-Type", "application/xml"); + httpPut.setHeader("Content-Type", "text/xml"); final HttpResponse response = client.execute(httpPut); assertEquals(304, response.getStatusLine().getStatusCode()); @@ -61,7 +61,7 @@ public class ServiceLiveTest { final HttpPut httpPut = new HttpPut(BASE_URL + "2"); final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("changed_course.xml"); httpPut.setEntity(new InputStreamEntity(resourceStream)); - httpPut.setHeader("Content-Type", "application/xml"); + httpPut.setHeader("Content-Type", "text/xml"); final HttpResponse response = client.execute(httpPut); assertEquals(200, response.getStatusLine().getStatusCode()); @@ -76,7 +76,7 @@ public class ServiceLiveTest { final HttpPost httpPost = new HttpPost(BASE_URL + "1/students"); final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("conflict_student.xml"); httpPost.setEntity(new InputStreamEntity(resourceStream)); - httpPost.setHeader("Content-Type", "application/xml"); + httpPost.setHeader("Content-Type", "text/xml"); final HttpResponse response = client.execute(httpPost); assertEquals(409, response.getStatusLine().getStatusCode()); @@ -87,7 +87,7 @@ public class ServiceLiveTest { final HttpPost httpPost = new HttpPost(BASE_URL + "2/students"); final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("created_student.xml"); httpPost.setEntity(new InputStreamEntity(resourceStream)); - httpPost.setHeader("Content-Type", "application/xml"); + httpPost.setHeader("Content-Type", "text/xml"); final HttpResponse response = client.execute(httpPost); assertEquals(200, response.getStatusLine().getStatusCode());