s/CharsetAwareTransform/Transform/g forgotten in test files

systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java

@@ -54,8 +54,8 @@
 import org.apache.cxf.interceptor.InterceptorProvider;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.interceptor.transform.CharsetAwareTransformInInterceptor;
-import org.apache.cxf.interceptor.transform.CharsetAwareTransformOutInterceptor;
+import org.apache.cxf.interceptor.transform.TransformInInterceptor;
+import org.apache.cxf.interceptor.transform.TransformOutInterceptor;
 import org.apache.cxf.jaxrs.client.ClientConfiguration;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
@@ -199,12 +199,12 @@ public void testPostBookTransform() throws Exception {
         String address = "http://localhost:" + PORT 
                          + "/test/v1/rest-transform/bookstore/books";
 
-        CharsetAwareTransformOutInterceptor out =  new CharsetAwareTransformOutInterceptor();
+        TransformOutInterceptor out =  new TransformOutInterceptor();
         out.setOutTransformElements(
             Collections.singletonMap("{http://www.example.org/books}*", 
                                      "{http://www.example.org/super-books}*"));
 
-        CharsetAwareTransformInInterceptor in =  new CharsetAwareTransformInInterceptor();
+        TransformInInterceptor in =  new TransformInInterceptor();
         Map<String, String> map = new HashMap<String, String>();
 
         // If Book2 didn't have {http://www.example.org/books}Book
@@ -793,7 +793,7 @@ public void testGetUnqualifiedBookSoap() throws Exception {
                                 new QName("http://books.com", "BookService"));
         BookStoreJaxrsJaxws store = service.getBookPort();
 
-        CharsetAwareTransformOutInterceptor out =  new CharsetAwareTransformOutInterceptor();
+        TransformOutInterceptor out =  new TransformOutInterceptor();
         Map<String, String> mapOut = new HashMap<String, String>();
         // Book content (id, name) is unqualified, thus the following works
         // because JAXB will report 
@@ -805,7 +805,7 @@ public void testGetUnqualifiedBookSoap() throws Exception {
         mapOut.put("{http://jaxws.jaxrs.systest.cxf.apache.org/}*", "*");
         out.setOutTransformElements(mapOut);
 
-        CharsetAwareTransformInInterceptor in =  new CharsetAwareTransformInInterceptor();
+        TransformInInterceptor in =  new TransformInInterceptor();
         Map<String, String> mapIn = new HashMap<String, String>();
         // mapIn.put("*", "{http://jaxws.jaxrs.systest.cxf.apache.org/}*");
         // won't work for a case where a totally unqualified getBookResponse needs to be

systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java

@@ -35,8 +35,8 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.interceptor.transform.CharsetAwareTransformInInterceptor;
-import org.apache.cxf.interceptor.transform.CharsetAwareTransformOutInterceptor;
+import org.apache.cxf.interceptor.transform.TransformInInterceptor;
+import org.apache.cxf.interceptor.transform.TransformOutInterceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.systest.interceptor.GreeterImpl;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -59,8 +59,8 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase {
 
     private static TestLoggingInInterceptor serverlogIn = new TestLoggingInInterceptor();
     private static TestLoggingOutInterceptor serverlogOut = new TestLoggingOutInterceptor();
-    private static CharsetAwareTransformInInterceptor servertransIn = new CharsetAwareTransformInInterceptor();
-    private static CharsetAwareTransformOutInterceptor servertransOut = new CharsetAwareTransformOutInterceptor();
+    private static TransformInInterceptor servertransIn = new TransformInInterceptor();
+    private static TransformOutInterceptor servertransOut = new TransformOutInterceptor();
 
     private Greeter greeter;
 

systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java

@@ -26,8 +26,8 @@
 import javax.xml.ws.soap.SOAPBinding;
 
 import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.feature.transform.CharsetAwareXSLTInInterceptor;
-import org.apache.cxf.feature.transform.CharsetAwareXSLTOutInterceptor;
+import org.apache.cxf.feature.transform.XSLTInInterceptor;
+import org.apache.cxf.feature.transform.XSLTOutInterceptor;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
@@ -56,7 +56,7 @@ public void testClientOutTransformation() {
 
         Echo port = service.getPort(PORT_NAME, Echo.class);
         Client client = ClientProxy.getClient(port);
-        CharsetAwareXSLTOutInterceptor outInterceptor = new CharsetAwareXSLTOutInterceptor(XSLT_REQUEST_PATH);
+        XSLTOutInterceptor outInterceptor = new XSLTOutInterceptor(XSLT_REQUEST_PATH);
         client.getOutInterceptors().add(outInterceptor);
         String response = port.echo("test");
         Assert.assertTrue("Request was not transformed", response.contains(TRANSFORMED_CONSTANT));
@@ -70,7 +70,7 @@ public void testClientInTransformation() {
 
         Echo port = service.getPort(PORT_NAME, Echo.class);
         Client client = ClientProxy.getClient(port);
-        CharsetAwareXSLTInInterceptor inInterceptor = new CharsetAwareXSLTInInterceptor(XSLT_RESPONSE_PATH);
+        XSLTInInterceptor inInterceptor = new XSLTInInterceptor(XSLT_RESPONSE_PATH);
         client.getInInterceptors().add(inInterceptor);
         String response = port.echo("test");
         Assert.assertTrue(response.contains(TRANSFORMED_CONSTANT));