You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/10 18:19:54 UTC
[1/3] cxf git commit: Switch to use StandardCharset.UTF_8 instead of
string literal
Repository: cxf
Updated Branches:
refs/heads/master e10281adf -> 173ec8971
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index f5e6e9c..0c61622 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.util.Collections;
import java.util.Enumeration;
@@ -277,7 +278,7 @@ final class JMSMessageUtils {
}
}
- String normalizedEncoding = HttpHeaderHelper.mapCharset(enc, "UTF-8");
+ String normalizedEncoding = HttpHeaderHelper.mapCharset(enc, StandardCharsets.UTF_8.name());
if (normalizedEncoding == null) {
String m = new org.apache.cxf.common.i18n.Message("INVALID_ENCODING_MSG", LOG, new Object[] {
enc
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
index abcbec3..1b48e4d 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.jms.uri;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -94,7 +95,7 @@ final class JMSURIParser {
private static String urldecode(String s) {
try {
- return URLDecoder.decode(s, "UTF-8");
+ return URLDecoder.decode(s, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new IllegalArgumentException("Encoding UTF-8 not supported");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
index ec3e128..ab54e22 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.jms;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import org.junit.Assert;
import org.junit.Test;
@@ -29,8 +30,10 @@ public class JMSMessageUtilTest extends Assert {
@Test
public void testGetEncoding() throws IOException {
- assertEquals("Get the wrong encoding", JMSMessageUtils.getEncoding("text/xml; charset=utf-8"), "UTF-8");
- assertEquals("Get the wrong encoding", JMSMessageUtils.getEncoding("text/xml"), "UTF-8");
+ assertEquals("Get the wrong encoding", JMSMessageUtils.getEncoding("text/xml; charset=utf-8"),
+ StandardCharsets.UTF_8.name());
+ assertEquals("Get the wrong encoding", JMSMessageUtils.getEncoding("text/xml"),
+ StandardCharsets.UTF_8.name());
assertEquals("Get the wrong encoding", JMSMessageUtils.getEncoding("text/xml; charset=GBK"), "GBK");
try {
JMSMessageUtils.getEncoding("text/xml; charset=asci");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/CapturingXMLWriter.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/CapturingXMLWriter.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/CapturingXMLWriter.java
index 6d49252..1fe31fb 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/CapturingXMLWriter.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/CapturingXMLWriter.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.ws.rm;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +40,7 @@ public class CapturingXMLWriter implements XMLStreamWriter {
public CapturingXMLWriter(XMLStreamWriter del) {
delegate = del;
- capture = StaxUtils.createXMLStreamWriter(bos, "UTF-8");
+ capture = StaxUtils.createXMLStreamWriter(bos, StandardCharsets.UTF_8.name());
Map<String, String> map = new HashMap<String, String>();
map.put("{http://schemas.xmlsoap.org/ws/2005/02/rm}Sequence", "");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index d4698c8..223430e 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.rm.soap;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -761,7 +762,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
// read SOAP headers from saved input stream
RewindableInputStream is = (RewindableInputStream)message.get(RMMessageConstants.SAVED_CONTENT);
is.rewind();
- XMLStreamReader reader = StaxUtils.createXMLStreamReader(is, "UTF-8");
+ XMLStreamReader reader = StaxUtils.createXMLStreamReader(is, StandardCharsets.UTF_8.name());
message.getHeaders().clear();
if (reader.getEventType() != XMLStreamConstants.START_ELEMENT
&& reader.nextTag() != XMLStreamConstants.START_ELEMENT) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
index 3ba1f66..1026624 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.security.wss4j;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.security.Provider;
import java.util.LinkedList;
import java.util.List;
@@ -298,7 +299,7 @@ public class WSS4JStaxOutInterceptor extends AbstractWSS4JStaxInterceptor {
}
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
message.put(Message.ENCODING, encoding);
}
return encoding;
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index f5bae66..9b77c26 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -21,6 +21,7 @@ package org.apache.cxf.wsdl;
import java.io.PrintWriter;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -288,7 +289,7 @@ public class JAXBExtensionHelper implements ExtensionSerializer, ExtensionDeseri
// TODO Auto-generated method stub
try {
Marshaller u = createMarshaller();
- u.setProperty("jaxb.encoding", "UTF-8");
+ u.setProperty("jaxb.encoding", StandardCharsets.UTF_8.name());
u.setProperty("jaxb.fragment", Boolean.TRUE);
u.setProperty("jaxb.formatted.output", Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index 9e102fb..6e2b3e4 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.wsdl11;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -359,7 +360,7 @@ public class ServiceWSDLBuilderTest extends Assert {
writer.close();
// this is a test to make sure any embedded namespaces are properly included
- String savedSchema = new String(outputStream.toByteArray(), "UTF-8");
+ String savedSchema = new String(outputStream.toByteArray(), StandardCharsets.UTF_8);
assertTrue(savedSchema.contains("http://www.w3.org/2005/05/xmlmime"));
SchemaImport types2SchemaImport = getImport(typesSchema.getImports(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index e7f7bba..f44217d 100644
--- a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -26,6 +26,7 @@ import java.net.InterfaceAddress;
import java.net.MulticastSocket;
import java.net.NetworkInterface;
import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
@@ -116,7 +117,7 @@ public final class WSDiscoveryClientTest {
DatagramPacket p = new DatagramPacket(bytes, bytes.length, address, Integer.parseInt(PORT));
s.receive(p);
SocketAddress sa = p.getSocketAddress();
- String incoming = new String(p.getData(), 0, p.getLength(), "UTF-8");
+ String incoming = new String(p.getData(), 0, p.getLength(), StandardCharsets.UTF_8);
int idx = incoming.indexOf("MessageID");
idx = incoming.indexOf('>', idx);
incoming = incoming.substring(idx + 1);
@@ -127,7 +128,7 @@ public final class WSDiscoveryClientTest {
String msg = IOUtils.readStringFromStream(ins);
msg = msg.replace("urn:uuid:883d0d53-92aa-4066-9b6f-9eadb1832366",
incoming);
- byte out[] = msg.getBytes("UTF-8");
+ byte out[] = msg.getBytes(StandardCharsets.UTF_8);
DatagramPacket outp = new DatagramPacket(out, 0, out.length, sa);
s.send(outp);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 33ea415..429cf0e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -548,7 +549,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
// not disallowed in the path components
String endpointAddressUrlEncoded =
"http://localhost:" + PORT + "/bookstore/books/colon/"
- + URLEncoder.encode("1:2:3", "UTF-8");
+ + URLEncoder.encode("1:2:3", StandardCharsets.UTF_8.name());
Response r = WebClient.create(endpointAddressUrlEncoded).get();
assertEquals(404, r.getStatus());
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
index a2d1052..60200f0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
@@ -59,7 +60,7 @@ public class JAXRSClientServerProxySpringBookTest extends AbstractBusClientServe
public void testGetWadlResourcesInfo() throws Exception {
WebClient client = WebClient.create("http://localhost:" + PORT + "/test" + "?_wadl&_type=xml");
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(10000000);
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
Element root = doc.getDocumentElement();
assertEquals(WadlGenerator.WADL_NS, root.getNamespaceURI());
assertEquals("application", root.getLocalName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
index ff99951..f9dab3c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
@@ -28,6 +28,7 @@ import java.net.HttpURLConnection;
import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -151,7 +152,7 @@ public class JAXRSClientServerResourceCreatedSpringProviderTest extends Abstract
public void testWadlPublishedEndpointUrl() throws Exception {
String requestURI = "http://localhost:" + PORT + "/webapp/resources2";
WebClient client = WebClient.create(requestURI + "?_wadl&_type=xml");
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
Element root = doc.getDocumentElement();
assertEquals(WadlGenerator.WADL_NS, root.getNamespaceURI());
assertEquals("application", root.getLocalName());
@@ -179,7 +180,7 @@ public class JAXRSClientServerResourceCreatedSpringProviderTest extends Abstract
private List<Element> getWadlResourcesInfo(String baseURI, String requestURI, int size) throws Exception {
WebClient client = WebClient.create(requestURI + "?_wadl&_type=xml");
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(10000000);
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
Element root = doc.getDocumentElement();
assertEquals(WadlGenerator.WADL_NS, root.getNamespaceURI());
assertEquals("application", root.getLocalName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 5ad1242..7a1d546 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -140,7 +141,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
public void testGetWadlFromWadlLocation() throws Exception {
String address = "http://localhost:" + PORT + "/the/generated";
WebClient client = WebClient.create(address + "/bookstore" + "?_wadl&_type=xml");
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
List<Element> resources = checkWadlResourcesInfo(doc, address, "/schemas/book.xsd", 2);
assertEquals("", resources.get(0).getAttribute("type"));
String type = resources.get(1).getAttribute("type");
@@ -258,7 +259,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
String refAttrName) throws Exception {
WebClient client = WebClient.create(address + schemaSegment);
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(10000000L);
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
Element root = doc.getDocumentElement();
assertEquals(Constants.URI_2001_SCHEMA_XSD, root.getNamespaceURI());
assertEquals("schema", root.getLocalName());
@@ -277,7 +278,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
WebClient client = WebClient.create(requestTypeURI);
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(1000000);
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
Element root = doc.getDocumentElement();
assertEquals(WadlGenerator.WADL_NS, root.getNamespaceURI());
assertEquals("application", root.getLocalName());
@@ -300,7 +301,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
private List<Element> checkWadlResourcesInfo(String baseURI, String requestURI,
String schemaRef, int size) throws Exception {
WebClient client = WebClient.create(requestURI + "?_wadl&_type=xml");
- Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(client.get(InputStream.class), StandardCharsets.UTF_8));
return checkWadlResourcesInfo(doc, baseURI, schemaRef, size);
}
private List<Element> checkWadlResourcesInfo(Document doc, String baseURI, String schemaRef, int size)
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
index 97fd389..0ea788a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.systest.jaxrs;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -87,7 +88,7 @@ public class JAXRSLoggingAtomPushTest extends Assert {
String s = IOUtils.readStringFromStream(ins);
ins.close();
s = s.replaceAll("9080", PORT);
- lm.readConfiguration(new ByteArrayInputStream(s.getBytes("UTF-8")));
+ lm.readConfiguration(new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
for (Handler h : LOG.getHandlers()) {
LOG.removeHandler(h);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SoapFaultHandlerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SoapFaultHandlerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SoapFaultHandlerTest.java
index d5c4992..e6829ed 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SoapFaultHandlerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SoapFaultHandlerTest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.test.AbstractCXFSpringTest;
@@ -59,7 +60,7 @@ public class SoapFaultHandlerTest extends AbstractCXFSpringTest {
out.close();
InputStream response = getInputStream(connection);
// get the response fault message
- String result = IOUtils.toString(response, "UTF-8");
+ String result = IOUtils.toString(response, StandardCharsets.UTF_8.name());
// just make sure the custom namespace is working
assertTrue("The custom namespace is not working.", result.indexOf("cxf:Provider") > 0);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
index 00bff25..8fa7b87 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
@@ -20,6 +20,7 @@ package org.apache.cxf.systest.swa;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import javax.activation.DataHandler;
import javax.jws.WebService;
@@ -95,12 +96,7 @@ public class SwANoMimeServiceImpl implements SwAServiceInterface {
}
public void echoData(Holder<String> text, Holder<byte[]> data) {
- try {
- data.value = ("test" + new String(data.value, 0, 6)).getBytes("UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
+ data.value = ("test" + new String(data.value, 0, 6)).getBytes(StandardCharsets.UTF_8);
}
public void echoDataRef(Holder<DataStruct> data) {
@@ -120,11 +116,7 @@ public class SwANoMimeServiceImpl implements SwAServiceInterface {
}
public void echoDataWithHeader(Holder<String> text, Holder<byte[]> data, Holder<String> headerText) {
- try {
- data.value = ("test" + new String(data.value, 0, 6)).getBytes("UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
+ data.value = ("test" + new String(data.value, 0, 6)).getBytes(StandardCharsets.UTF_8);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 4087fcc..3f0c79f 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.systest.kerberos.jaxrs.kerberos;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -105,7 +106,7 @@ public class JAXRSKerberosBookTest extends AbstractLdapTestUnit {
// Read in krb5.conf and substitute in the correct port
Path path = FileSystems.getDefault().getPath(basedir, "/src/test/resources/krb5.conf");
- String content = new String(Files.readAllBytes(path), "UTF-8");
+ String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
content = content.replaceAll("port", "" + super.getKdcServer().getTransports()[0].getPort());
Path path2 = FileSystems.getDefault().getPath(basedir, "/target/test-classes/jaxrs.krb5.conf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index bdd2f80..6d2045e 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -113,7 +114,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
// Read in ldap.xml and substitute in the correct port
Path path = FileSystems.getDefault().getPath(basedir, "/src/test/resources/ldap.xml");
- String content = new String(Files.readAllBytes(path), "UTF-8");
+ String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
content = content.replaceAll("portno", "" + super.getLdapServer().getPort());
Path path2 = FileSystems.getDefault().getPath(basedir, "/target/test-classes/ldapport.xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 648dc73..be57236 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.kerberos.wssec.kerberos;
import java.io.File;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -118,7 +119,7 @@ public class KerberosTokenTest extends AbstractLdapTestUnit {
// Read in krb5.conf and substitute in the correct port
Path path = FileSystems.getDefault().getPath(basedir, "/src/test/resources/krb5.conf");
- String content = new String(Files.readAllBytes(path), "UTF-8");
+ String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
content = content.replaceAll("port", "" + super.getKdcServer().getTransports()[0].getPort());
Path path2 = FileSystems.getDefault().getPath(basedir, "/target/test-classes/wssec.kerberos.krb5.conf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index a7948bc..619e16a 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.kerberos.wssec.spnego;
import java.io.File;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -111,7 +112,7 @@ public class SpnegoTokenTest extends AbstractLdapTestUnit {
// Read in krb5.conf and substitute in the correct port
Path path = FileSystems.getDefault().getPath(basedir, "/src/test/resources/krb5.conf");
- String content = new String(Files.readAllBytes(path), "UTF-8");
+ String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
content = content.replaceAll("port", "" + super.getKdcServer().getTransports()[0].getPort());
Path path2 = FileSystems.getDefault().getPath(basedir, "/target/test-classes/wssec.spnego.krb5.conf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
index a330adf..799c379 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.jaxrs.security.oauth;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -156,7 +157,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
protected String generateToken() throws OAuthServiceException {
String token;
try {
- token = tokenGenerator.generate(UUID.randomUUID().toString().getBytes("UTF-8"));
+ token = tokenGenerator.generate(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8));
} catch (Exception e) {
throw new OAuthServiceException("Unable to create token ", e.getCause());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
index f6881d0..4ee4b45 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.servlet;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
@@ -72,7 +73,7 @@ public class CXFFilterTest extends AbstractServletTest {
WebResponse response = newClient().getResponse(req);
assertEquals("text/xml", response.getContentType());
- assertEquals("UTF-8", response.getCharacterSet());
+ assertEquals(StandardCharsets.UTF_8.name(), response.getCharacterSet());
Document doc = StaxUtils.read(response.getInputStream());
assertNotNull(doc);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
index 49e3e79..a60f791 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.systest.servlet;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
@@ -67,7 +68,7 @@ public class CXFServletTest extends AbstractServletTest {
@Test
public void testPostInvokeServices() throws Exception {
- invoke("UTF-8");
+ invoke(StandardCharsets.UTF_8.name());
invoke("iso-8859-1");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
index 05f0ae8..a96b449 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.servlet;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
@@ -91,7 +92,7 @@ public class ExternalServicesServletTest extends AbstractServletTest {
WebResponse response = newClient().getResponse(req);
assertEquals("text/xml", response.getContentType());
- assertEquals("UTF-8", response.getCharacterSet());
+ assertEquals(StandardCharsets.UTF_8.name(), response.getCharacterSet());
Document doc = StaxUtils.read(response.getInputStream());
assertNotNull(doc);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
index 5e94811..4f0c1e8 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
@@ -44,7 +44,7 @@ public class JsFrontEndServletTest extends AbstractServletTest {
WebResponse response = newClient().getResponse(req);
assertEquals("text/xml", response.getContentType());
- //assertEquals("UTF-8", response.getCharacterSet());
+ //assertEquals(StandardCharsets.UTF_8, response.getCharacterSet());
Document doc = StaxUtils.read(response.getInputStream());
assertNotNull(doc);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java
index 06ff4ac..7a574ec 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.js;
import java.io.File;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.js.rhino.ProviderFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -33,11 +34,11 @@ public class Server extends AbstractBusTestServerBase {
protected void run() {
try {
String f = getClass().getResource("resources/hello_world.js").toURI().getPath();
- f = URLDecoder.decode(f, "UTF-8");
+ f = URLDecoder.decode(f, StandardCharsets.UTF_8.name());
pf.createAndPublish(new File(f), "http://localhost:" + JS_PORT
+ "/SoapContext/SoapPort", false);
f = getClass().getResource("resources/hello_world.jsx").toURI().getPath();
- f = URLDecoder.decode(f, "UTF-8");
+ f = URLDecoder.decode(f, StandardCharsets.UTF_8.name());
pf.createAndPublish(new File(f), "http://localhost:" + JSX_PORT, false);
} catch (Exception ex) {
ex.printStackTrace();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
index 78a1864..4285378 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -169,10 +170,10 @@ public class MtomServerTest extends AbstractBusClientServerTestBase {
}
ByteArrayOutputStream bout = new ByteArrayOutputStream();
IOUtils.copy(is, bout);
- String s = bout.toString("UTF-8");
+ String s = bout.toString(StandardCharsets.UTF_8.name());
s = s.replaceAll(":9036/", ":" + PORT2 + "/");
- os.write(s.getBytes("UTF-8"));
+ os.write(s.getBytes(StandardCharsets.UTF_8));
os.flush();
is.close();
os.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
index 79d18ad..85039f8 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
@@ -24,6 +24,7 @@ import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.logging.Logger;
import org.apache.cxf.common.i18n.Message;
@@ -58,12 +59,12 @@ public class FileWriterUtil {
}
private Writer getWriter(File fn) throws IOException {
- return getWriter(fn, "UTF-8");
+ return getWriter(fn, StandardCharsets.UTF_8.name());
}
public Writer getWriter(File fn, String encoding) throws IOException {
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
}
return new OutputStreamWriter(new BufferedOutputStream(osc.createOutputStream(fn)), encoding);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
----------------------------------------------------------------------
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
index 9bb3642..1760a89 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.util;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.common.util.URIParserUtil;
import org.junit.Assert;
@@ -98,9 +99,9 @@ public class URIParserUtilTest extends Assert {
}
@Test
public void testCXF3855() throws Exception {
- String orig = new String(new byte[] {-47, -122}, "UTF-8");
+ String orig = new String(new byte[] {-47, -122}, StandardCharsets.UTF_8);
orig = "/foo" + orig + ".txt";
String s = URIParserUtil.escapeChars(orig);
- assertEquals(orig, URLDecoder.decode(s, "UTF-8"));
+ assertEquals(orig, URLDecoder.decode(s, StandardCharsets.UTF_8.name()));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
index 186f3b5..fe33970 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
@@ -26,6 +26,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.Writer;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -414,7 +415,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
String encoding = env.get(ToolCorbaConstants.CFG_WSDL_ENCODING).toString();
return new FileWriterUtil().getWriter(file, encoding);
} else {
- return new FileWriterUtil().getWriter(file, "UTF-8");
+ return new FileWriterUtil().getWriter(file, StandardCharsets.UTF_8.name());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
index b338d75..999cd6f 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
@@ -26,6 +26,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -174,7 +175,7 @@ public class WSDLToIDLTest extends ToolTestBase {
Path path = FileSystems.getDefault().getPath(output.getPath(), "simple-binding.idl");
assertTrue("simple-binding.idl should be generated", Files.isReadable(path));
- String line = new String(Files.readAllBytes(path), "UTF-8");
+ String line = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
assertTrue("Invalid Idl File Generated", line.length() > 0);
}
@@ -189,7 +190,7 @@ public class WSDLToIDLTest extends ToolTestBase {
Path path = FileSystems.getDefault().getPath(output.getPath(), "simple-binding_gen.idl");
assertTrue("simple-binding_gen.idl should be generated", Files.isReadable(path));
- String line = new String(Files.readAllBytes(path), "UTF-8");
+ String line = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
assertTrue("Invalid Idl File Generated", line.length() > 0);
}
@@ -219,7 +220,7 @@ public class WSDLToIDLTest extends ToolTestBase {
fail("WSDLToIDL generated an invalid simple-binding-corba.wsdl");
}
- String line = new String(Files.readAllBytes(path2), "UTF-8");
+ String line = new String(Files.readAllBytes(path2), StandardCharsets.UTF_8);
assertTrue("Invalid Idl File Generated", line.length() > 0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
index d2e583f..70ef1d3 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
@@ -20,6 +20,7 @@ package org.apache.cxf.tools.java2wsdl.generator.wsdl11;
import java.io.File;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
@@ -95,7 +96,7 @@ public final class DateTypeCustomGenerator extends AbstractGenerator<File> {
try {
generator.doWrite(getTemplate(), new FileWriterUtil(xjb.getParent(), getOutputStreamCreator())
- .getWriter(xjb, "UTF-8"));
+ .getWriter(xjb, StandardCharsets.UTF_8.name()));
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
index 257889d..46954ea 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
@@ -26,6 +26,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -70,7 +71,7 @@ public class WSDL11Generator extends AbstractGenerator<Definition> {
Definition def = null;
try {
Writer os = new FileWriterUtil(file.getParent(),
- getOutputStreamCreator()).getWriter(file, "UTF-8");
+ getOutputStreamCreator()).getWriter(file, StandardCharsets.UTF_8.name());
WSDLWriter wsdlWriter = WSDLFactory.newInstance().newWSDLWriter();
ServiceWSDLBuilder builder = new ServiceWSDLBuilder(getBus(), getServiceModel());
@@ -105,8 +106,9 @@ public class WSDL11Generator extends AbstractGenerator<Definition> {
File impfile = new File(file.getParentFile(), imp.getKey());
Element el = imp.getValue().getElement();
updateImports(el, imports);
- os = new FileWriterUtil(impfile.getParent(),
- getToolContext().get(OutputStreamCreator.class)).getWriter(impfile, "UTF-8");
+ FileWriterUtil fileWriterUtil =
+ new FileWriterUtil(impfile.getParent(), getToolContext().get(OutputStreamCreator.class));
+ os = fileWriterUtil.getWriter(impfile, StandardCharsets.UTF_8.name());
StaxUtils.writeTo(el, os, 2);
os.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
index 687e533..ec36bc0 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -205,7 +206,7 @@ public class JAXRSContainer extends AbstractCXFToolContainer {
protected String readWadl(String wadlURI) {
try {
URL url = new URL(wadlURI);
- Reader reader = new InputStreamReader(url.openStream(), "UTF-8");
+ Reader reader = new InputStreamReader(url.openStream(), StandardCharsets.UTF_8);
return IOUtils.toString(reader);
} catch (IOException e) {
throw new ToolException(e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 285f85f..ff37819 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -31,6 +31,7 @@ import java.io.StringReader;
import java.io.Writer;
import java.net.URI;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -1666,7 +1667,7 @@ public class SourceGenerator {
try {
file.createNewFile();
try (Writer writer = new OutputStreamWriter(new FileOutputStream(file),
- encoding == null ? "UTF-8" : encoding)) {
+ encoding == null ? StandardCharsets.UTF_8.name() : encoding)) {
writer.write(content);
writer.flush();
}
@@ -1683,7 +1684,7 @@ public class SourceGenerator {
if (validateWadl) {
SchemaFactory factory = SchemaFactory.newInstance(Constants.URI_2001_SCHEMA_XSD);
URL schemaURL = ResourceUtils.getResourceURL("classpath:/schemas/wadl/wadl.xsd", bus);
- Reader r = new BufferedReader(new InputStreamReader(schemaURL.openStream(), "UTF-8"));
+ Reader r = new BufferedReader(new InputStreamReader(schemaURL.openStream(), StandardCharsets.UTF_8));
StreamSource source = new StreamSource(r);
source.setSystemId(schemaURL.toString());
Schema s = factory.newSchema(new Source[]{source});
@@ -1714,7 +1715,8 @@ public class SourceGenerator {
private void generateClassesFromSchema(JCodeModel codeModel, File src) {
try {
- Object writer = JAXBUtils.createFileCodeWriter(src, encoding == null ? "UTF-8" : encoding);
+ Object writer = JAXBUtils.createFileCodeWriter(src, encoding == null
+ ? StandardCharsets.UTF_8.name() : encoding);
codeModel.build(writer);
generatedTypeClasses = JAXBUtils.getGeneratedClassNames(codeModel);
} catch (Exception e) {
@@ -1814,7 +1816,7 @@ public class SourceGenerator {
if (is == null) {
is = URI.create(href).toURL().openStream();
}
- return readXmlDocument(new InputStreamReader(is, "UTF-8"));
+ return readXmlDocument(new InputStreamReader(is, StandardCharsets.UTF_8));
} catch (Exception ex) {
throw new RuntimeException("Resource " + href + " can not be read");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index dac902f..01f073b 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -32,6 +32,7 @@ import java.io.OutputStream;
import java.io.Writer;
import java.net.URI;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -820,7 +821,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer {
Element el = imp.getSchemaDocument().getDocumentElement();
updateImports(el, sourceMap);
os = new FileWriterUtil(impfile.getParent(), context.get(OutputStreamCreator.class))
- .getWriter(impfile, "UTF-8");
+ .getWriter(impfile, StandardCharsets.UTF_8.name());
StaxUtils.writeTo(el, os, 2);
os.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java b/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
index 10cb2cf..5a36504 100644
--- a/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
+++ b/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.tools.wsdlto.javascript;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -60,7 +61,7 @@ public class WSDLToJavaScriptTest extends ProcessorTestBase {
// now we really want to check some results.
Path path = FileSystems.getDefault().getPath(output.getPath(), "SOAPService_Test1.js");
assertTrue(Files.isReadable(path));
- String javascript = new String(Files.readAllBytes(path), "UTF-8");
+ String javascript = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
assertTrue(javascript.contains("xmlns:murble='http://apache.org/hello_world_soap_http'"));
assertEquals("Number of '{' does not match number of '}' in generated JavaScript.",
@@ -84,7 +85,7 @@ public class WSDLToJavaScriptTest extends ProcessorTestBase {
// now we really want to check some results.
Path path = FileSystems.getDefault().getPath(output.getPath(), "SOAPService.js");
assertTrue(Files.isReadable(path));
- String javascript = new String(Files.readAllBytes(path), "UTF-8");
+ String javascript = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
assertTrue(javascript.contains("xmlns:murble='http://apache.org/hello_world_soap_http'"));
assertEquals("Number of '{' does not match number of '}' in generated JavaScript.",
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index c6eea47..ef0fa79 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -227,7 +228,7 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
Path path = FileSystems.getDefault().getPath(output.getCanonicalPath(), "build.xml");
assertTrue(Files.isReadable(path));
- String content = new String(Files.readAllBytes(path), "UTF-8");
+ String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
assertTrue("wsdl location should be url style in build.xml", content.indexOf("param1=\"file:") > -1);
[3/3] cxf git commit: Switch to use StandardCharset.UTF_8 instead of
string literal
Posted by co...@apache.org.
Switch to use StandardCharset.UTF_8 instead of string literal
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/173ec897
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/173ec897
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/173ec897
Branch: refs/heads/master
Commit: 173ec8971c78dd7c8fc311617b6e25718af23da8
Parents: e10281a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Nov 10 17:19:19 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 10 17:19:19 2015 +0000
----------------------------------------------------------------------
core/src/main/java/org/apache/cxf/BusFactory.java | 3 ++-
.../apache/cxf/attachment/AttachmentSerializer.java | 5 +++--
.../org/apache/cxf/attachment/AttachmentUtil.java | 8 +++++---
.../java/org/apache/cxf/attachment/Rfc5987Util.java | 3 ++-
.../bus/extension/TextExtensionFragmentParser.java | 3 ++-
.../cxf/bus/spring/BusApplicationContext.java | 3 ++-
.../apache/cxf/common/jaxb/JAXBContextCache.java | 3 ++-
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 5 +++--
.../apache/cxf/common/util/Base64UrlUtility.java | 8 ++------
.../org/apache/cxf/common/util/Base64Utility.java | 6 ++----
.../org/apache/cxf/common/util/StringUtils.java | 3 ++-
.../org/apache/cxf/common/util/URIParserUtil.java | 16 ++++++----------
.../java/org/apache/cxf/common/util/UrlUtils.java | 7 ++++---
.../org/apache/cxf/helpers/HttpHeaderHelper.java | 2 +-
.../AbstractOutDatabindingInterceptor.java | 3 ++-
.../apache/cxf/interceptor/StaxOutInterceptor.java | 3 ++-
.../java/org/apache/cxf/io/CachedOutputStream.java | 5 +++--
.../main/java/org/apache/cxf/io/CachedWriter.java | 3 ++-
.../java/org/apache/cxf/staxutils/StaxUtils.java | 5 +++--
.../cxf/attachment/AttachmentDeserializerTest.java | 5 +++--
.../org/apache/cxf/attachment/Rfc5987UtilTest.java | 5 +++--
.../apache/cxf/common/util/Base64UtilityTest.java | 5 +++--
.../org/apache/cxf/io/CachedStreamTestBase.java | 5 +++--
.../staxutils/transform/OutTransformWriterTest.java | 9 +++++----
.../cxf/staxutils/transform/TransformTestUtils.java | 3 ++-
.../server/controllers/ApplicationController.java | 2 +-
.../server/controllers/MemoryOAuthDataProvider.java | 2 +-
.../java/org/apache/cxf/jaxb/io/DataWriterImpl.java | 3 ++-
.../cxf/ext/logging/LoggingInInterceptor.java | 3 ++-
.../org/apache/cxf/ext/logging/SOAPLoggingTest.java | 9 +++++----
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 3 ++-
.../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 5 +++--
.../cxf/jaxrs/provider/BinaryDataProvider.java | 3 ++-
.../cxf/jaxrs/provider/DataBindingProvider.java | 3 ++-
.../cxf/jaxrs/provider/FormEncodingProvider.java | 5 +++--
.../cxf/jaxrs/provider/JAXBElementProvider.java | 3 ++-
.../cxf/jaxrs/provider/PrimitiveTextProvider.java | 5 +++--
.../apache/cxf/jaxrs/provider/SourceProvider.java | 3 ++-
.../cxf/jaxrs/provider/StringTextProvider.java | 5 +++--
.../apache/cxf/jaxrs/provider/XSLTJaxbProvider.java | 3 ++-
.../java/org/apache/cxf/jaxrs/utils/FormUtils.java | 8 ++++----
.../java/org/apache/cxf/jaxrs/utils/HttpUtils.java | 5 +++--
.../java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 3 ++-
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 3 ++-
.../cxf/jaxrs/utils/schemas/SchemaHandler.java | 3 ++-
.../org/apache/cxf/jaxrs/impl/RequestImplTest.java | 13 +++++++------
.../jaxrs/provider/FormEncodingProviderTest.java | 3 ++-
.../cxf/jaxrs/provider/JAXBElementProviderTest.java | 7 ++++---
.../jaxrs/provider/PrimitiveTextProviderTest.java | 3 ++-
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 10 +++++++---
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 5 +++--
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 9 +++------
.../apache/cxf/js/rhino/JsServiceFactoryBean.java | 3 ++-
.../jaxrs/provider/aegis/AegisElementProvider.java | 3 ++-
.../cxf/jaxrs/provider/aegis/AegisJSONProvider.java | 3 ++-
.../cxf/jaxrs/provider/json/JSONProvider.java | 5 +++--
.../cxf/jaxrs/provider/json/utils/JSONUtils.java | 3 ++-
.../provider/jsonp/AbstractJsonpOutInterceptor.java | 3 ++-
.../provider/jsonp/JsonpJaxrsWriterInterceptor.java | 3 ++-
.../jaxrs/provider/atom/AtomPojoProviderTest.java | 6 +++---
.../cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java | 5 +++--
.../jaxrs/ext/search/hbase/HBaseQueryVisitor.java | 15 ++++-----------
.../jose/jaxrs/AbstractJweDecryptingFilter.java | 4 +++-
.../jose/jaxrs/JwsJsonWriterInterceptor.java | 3 ++-
.../security/jose/jaxrs/JwsWriterInterceptor.java | 3 ++-
.../cxf/rs/security/jose/common/JoseUtils.java | 9 ++-------
.../rs/security/jose/jwe/JweCompactConsumer.java | 9 ++-------
.../rs/security/jose/jwe/JweDecryptionOutput.java | 10 ++--------
.../cxf/rs/security/jose/jwe/JweJsonConsumer.java | 9 ++-------
.../rs/security/jose/jwe/JweJwtCompactConsumer.java | 3 ++-
.../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 4 ++--
.../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 3 ++-
.../jose/jwe/JweCompactReaderWriterTest.java | 11 ++++++-----
.../rs/security/jose/jwe/JwePbeHmacAesWrapTest.java | 5 +++--
.../cxf/rs/security/oauth/utils/OAuthUtils.java | 3 ++-
.../oauth2/grants/saml/Saml2BearerGrantHandler.java | 6 ++++--
.../oauth2/client/ClientCodeRequestFilter.java | 5 +++--
.../rs/security/oauth2/client/OAuthClientUtils.java | 3 ++-
.../oauth2/grants/jwt/JwtBearerGrantHandler.java | 3 ++-
.../security/oauth2/provider/OAuthJSONProvider.java | 5 +++--
.../security/oidc/rp/OidcIdTokenRequestFilter.java | 5 +++--
.../oidc/rp/OidcRpAuthenticationFilter.java | 5 +++--
.../AbstractRequestAssertionConsumerHandler.java | 12 ++++--------
.../saml/sso/AbstractServiceProviderFilter.java | 3 ++-
.../cxf/rs/security/saml/sso/MetadataWriter.java | 3 ++-
.../saml/sso/SAMLProtocolResponseValidator.java | 3 ++-
.../rs/security/saml/sso/SamlPostBindingFilter.java | 5 +++--
.../saml/sso/SamlRedirectBindingFilter.java | 13 +++++++------
.../cxf/rs/security/saml/AbstractSamlInHandler.java | 3 ++-
.../security/saml/AbstractSamlOutInterceptor.java | 10 +++-------
.../rs/security/saml/SamlEnvelopedInHandler.java | 3 ++-
.../rs/security/xml/AbstractXmlEncInHandler.java | 3 ++-
.../rs/security/xml/AbstractXmlSecInHandler.java | 3 ++-
.../cxf/rs/security/xml/XmlSecOutInterceptor.java | 3 ++-
.../apache/cxf/rt/security/crypto/CryptoUtils.java | 5 +++--
.../apache/cxf/rt/security/crypto/HmacUtils.java | 8 ++------
.../cxf/rt/security/crypto/MessageDigestUtils.java | 6 ++----
.../http_jetty/JettyHTTPDestinationTest.java | 5 +++--
.../cxf/transport/http/netty/server/util/Utils.java | 5 +++--
.../http/netty/server/NettyHttpDestinationTest.java | 5 +++--
.../https/httpclient/PublicSuffixMatcherLoader.java | 3 ++-
.../apache/cxf/transport/jms/JMSMessageUtils.java | 3 ++-
.../apache/cxf/transport/jms/uri/JMSURIParser.java | 3 ++-
.../cxf/transport/jms/JMSMessageUtilTest.java | 7 +++++--
.../org/apache/cxf/ws/rm/CapturingXMLWriter.java | 3 ++-
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 3 ++-
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 3 ++-
.../org/apache/cxf/wsdl/JAXBExtensionHelper.java | 3 ++-
.../apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 3 ++-
.../cxf/ws/discovery/WSDiscoveryClientTest.java | 5 +++--
.../systest/jaxrs/JAXRSClientServerBookTest.java | 3 ++-
.../jaxrs/JAXRSClientServerProxySpringBookTest.java | 3 ++-
...ientServerResourceCreatedSpringProviderTest.java | 5 +++--
.../jaxrs/JAXRSClientServerSpringBookTest.java | 9 +++++----
.../cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java | 3 ++-
.../cxf/systest/handlers/SoapFaultHandlerTest.java | 3 ++-
.../cxf/systest/swa/SwANoMimeServiceImpl.java | 14 +++-----------
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 3 ++-
.../cxf/systest/kerberos/ldap/LDAPClaimsTest.java | 3 ++-
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 3 ++-
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 3 ++-
.../security/oauth/MemoryOAuthDataProvider.java | 3 ++-
.../apache/cxf/systest/servlet/CXFFilterTest.java | 3 ++-
.../apache/cxf/systest/servlet/CXFServletTest.java | 3 ++-
.../servlet/ExternalServicesServletTest.java | 3 ++-
.../cxf/systest/servlet/JsFrontEndServletTest.java | 2 +-
.../test/java/org/apache/cxf/systest/js/Server.java | 5 +++--
.../org/apache/cxf/systest/mtom/MtomServerTest.java | 5 +++--
.../org/apache/cxf/tools/util/FileWriterUtil.java | 5 +++--
.../apache/cxf/tools/util/URIParserUtilTest.java | 5 +++--
.../corba/processors/idl/IDLToWSDLProcessor.java | 3 ++-
.../org/apache/cxf/tools/corba/WSDLToIDLTest.java | 7 ++++---
.../generator/wsdl11/DateTypeCustomGenerator.java | 3 ++-
.../java2wsdl/generator/wsdl11/WSDL11Generator.java | 8 +++++---
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 3 ++-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 10 ++++++----
.../cxf/tools/wsdlto/WSDLToJavaContainer.java | 3 ++-
.../wsdlto/javascript/WSDLToJavaScriptTest.java | 5 +++--
.../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 3 ++-
139 files changed, 371 insertions(+), 306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/BusFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/BusFactory.java b/core/src/main/java/org/apache/cxf/BusFactory.java
index 1019fcf..7f1dd01 100644
--- a/core/src/main/java/org/apache/cxf/BusFactory.java
+++ b/core/src/main/java/org/apache/cxf/BusFactory.java
@@ -22,6 +22,7 @@ package org.apache.cxf;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;
import java.util.WeakHashMap;
@@ -378,7 +379,7 @@ public abstract class BusFactory {
}
if (is != null) {
- try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {
+ try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
busFactoryClass = rd.readLine();
busFactoryCondition = rd.readLine();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index 539fcc6..d01f209 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.io.StringWriter;
import java.io.Writer;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -144,7 +145,7 @@ public class AttachmentSerializer {
out = message.getContent(OutputStream.class);
encoding = (String) message.get(Message.ENCODING);
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
}
StringWriter writer = new StringWriter();
writer.write("--");
@@ -200,7 +201,7 @@ public class AttachmentSerializer {
if (attachmentId != null) {
attachmentId = checkAngleBrackets(attachmentId);
writer.write("Content-ID: <");
- writer.write(URLDecoder.decode(attachmentId, "UTF-8"));
+ writer.write(URLDecoder.decode(attachmentId, StandardCharsets.UTF_8.name()));
writer.write(">\r\n");
}
// headers like Content-Disposition need to be serialized
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 11ff76f..ec3407a 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -28,6 +28,7 @@ import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.ArrayList;
@@ -209,7 +210,8 @@ public final class AttachmentUtil {
cid = ns;
}
}
- return URLEncoder.encode(name, "UTF-8") + "@" + URLEncoder.encode(cid, "UTF-8");
+ return URLEncoder.encode(name, StandardCharsets.UTF_8.name()) + "@"
+ + URLEncoder.encode(cid, StandardCharsets.UTF_8.name());
}
public static String getUniqueBoundaryValue() {
@@ -335,7 +337,7 @@ public final class AttachmentUtil {
}
// urldecode. Is this bad even without cid:? What does decode do with malformed %-signs, anyhow?
try {
- id = URLDecoder.decode(id, "UTF-8");
+ id = URLDecoder.decode(id, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
//ignore, keep id as is
}
@@ -526,7 +528,7 @@ public final class AttachmentUtil {
// Is this right? - DD
if (contentId.startsWith("cid:")) {
try {
- contentId = URLDecoder.decode(contentId.substring(4), "UTF-8");
+ contentId = URLDecoder.decode(contentId.substring(4), StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException ue) {
contentId = contentId.substring(4);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java b/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
index 8da87f7..347e5d2 100644
--- a/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
+++ b/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
@@ -20,6 +20,7 @@ package org.apache.cxf.attachment;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,7 +39,7 @@ public final class Rfc5987Util {
}
public static String encode(final String s) throws UnsupportedEncodingException {
- return encode(s, "UTF-8");
+ return encode(s, StandardCharsets.UTF_8.name());
}
// http://stackoverflow.com/questions/11302361/ (continued next line)
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
index 3ee4f7c..f7804ee 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
@@ -71,7 +72,7 @@ public class TextExtensionFragmentParser {
*/
public List<Extension> getExtensions(InputStream is) throws IOException {
List<Extension> extensions = new ArrayList<Extension>();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
String line = reader.readLine();
while (line != null) {
final Extension extension = getExtensionFromTextLine(line);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
index dc37c2c..36d951b 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.security.AccessControlException;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -156,7 +157,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
Resource[] exts = resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE);
for (Resource r : exts) {
try (InputStream is = r.getInputStream();
- BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {
+ BufferedReader rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
String line = rd.readLine();
while (line != null) {
if (!"".equals(line)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index 55bcd78..d6393d2 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -403,7 +404,7 @@ public final class JAXBContextCache {
//ignore
}
try (InputStream ins = loader.getResourceAsStream("/" + pkg.replace('.', '/') + "/jaxb.index");
- BufferedReader reader = new BufferedReader(new InputStreamReader(ins, "UTF-8"))) {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(ins, StandardCharsets.UTF_8))) {
if (!StringUtils.isEmpty(pkg)) {
pkg += ".";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index f4e4b54..6440c37 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -37,6 +37,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -765,7 +766,7 @@ public final class JAXBUtils {
return classes;
}
public static Object createFileCodeWriter(File f) throws JAXBException {
- return createFileCodeWriter(f, "UTF-8");
+ return createFileCodeWriter(f, StandardCharsets.UTF_8.name());
}
public static Object createFileCodeWriter(File f, String encoding) throws JAXBException {
try {
@@ -896,7 +897,7 @@ public final class JAXBUtils {
if (entry.getValue() != null) {
BufferedReader reader = null;
try {
- reader = new BufferedReader(new InputStreamReader(entry.getValue(), "UTF-8"));
+ reader = new BufferedReader(new InputStreamReader(entry.getValue(), StandardCharsets.UTF_8));
String pkg = entry.getKey();
ClassLoader loader = packageLoaders.get(pkg);
if (!StringUtils.isEmpty(pkg)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java b/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
index 25dc0df..cde9701 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
@@ -29,7 +29,7 @@ package org.apache.cxf.common.util;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
public final class Base64UrlUtility {
@@ -42,11 +42,7 @@ public final class Base64UrlUtility {
}
public static String encode(String str) {
- try {
- return encode(str.getBytes("UTF-8"));
- } catch (UnsupportedEncodingException ex) {
- throw new RuntimeException(ex);
- }
+ return encode(str.getBytes(StandardCharsets.UTF_8));
}
public static String encode(byte[] id) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
index 1888d69..d101b39 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import java.nio.CharBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.logging.Logger;
@@ -85,8 +85,6 @@ public final class Base64Utility {
private static final int PAD_SIZE4 = 2;
private static final int PAD_SIZE8 = 3;
- private static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
-
// class static initializer for building decode table
static {
for (int i = 0; i < BDTSIZE; i++) {
@@ -379,7 +377,7 @@ public final class Base64Utility {
private static void writeCharArrayToStream(char[] chunk, int len, OutputStream os) throws IOException {
// may be we can just cast to byte when creating chunk[] earlier on
- byte[] bytes = CHARSET_UTF8.encode(CharBuffer.wrap(chunk, 0, len)).array();
+ byte[] bytes = StandardCharsets.UTF_8.encode(CharBuffer.wrap(chunk, 0, len)).array();
os.write(bytes);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 23e39e0..b90c078 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -197,7 +198,7 @@ public final class StringUtils {
}
public static byte[] toBytesUTF8(String str) {
- return toBytes(str, "UTF-8");
+ return toBytes(str, StandardCharsets.UTF_8.name());
}
public static byte[] toBytesASCII(String str) {
return toBytes(str, "US-ASCII");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index 8170709..9850ee5 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -20,11 +20,11 @@
package org.apache.cxf.common.util;
import java.io.File;
-import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@ -222,15 +222,11 @@ public final class URIParserUtil {
for (int x = 0; x < s.length(); x++) {
char ch = s.charAt(x);
if (isExcluded(ch)) {
- try {
- byte[] bytes = Character.toString(ch).getBytes("UTF-8");
- for (int y = 0; y < bytes.length; y++) {
- b.append("%");
- b.append(HEX_DIGITS.charAt((bytes[y] & 0xFF) >> 4));
- b.append(HEX_DIGITS.charAt(bytes[y] & 0x0F));
- }
- } catch (UnsupportedEncodingException e) {
- //should not happen
+ byte[] bytes = Character.toString(ch).getBytes(StandardCharsets.UTF_8);
+ for (int y = 0; y < bytes.length; y++) {
+ b.append("%");
+ b.append(HEX_DIGITS.charAt((bytes[y] & 0xFF) >> 4));
+ b.append(HEX_DIGITS.charAt(bytes[y] & 0x0F));
}
} else {
b.append(ch);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
index 8b2518e..3dd0087 100644
--- a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
@@ -43,7 +44,7 @@ public final class UrlUtils {
public static String urlEncode(String value) {
- return urlEncode(value, "UTF-8");
+ return urlEncode(value, StandardCharsets.UTF_8.name());
}
public static String urlEncode(String value, String enc) {
@@ -118,7 +119,7 @@ public final class UrlUtils {
public static String urlDecode(String value) {
- return urlDecode(value, "UTF-8");
+ return urlDecode(value, StandardCharsets.UTF_8.name());
}
/**
@@ -127,7 +128,7 @@ public final class UrlUtils {
* @param value value to decode
*/
public static String pathDecode(String value) {
- return urlDecode(value, "UTF-8", true);
+ return urlDecode(value, StandardCharsets.UTF_8.name(), true);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
index 049691d..62dec05 100644
--- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
+++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
@@ -108,7 +108,7 @@ public final class HttpHeaderHelper {
return deflt;
}
//older versions of tomcat don't properly parse ContentType headers with stuff
- //after charset="UTF-8"
+ //after charset=StandardCharsets.UTF_8
int idx = enc.indexOf(";");
if (idx != -1) {
enc = enc.substring(0, idx);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
index 0993e4b..0e3183b 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
@@ -20,6 +20,7 @@
package org.apache.cxf.interceptor;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -178,7 +179,7 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
return info.getClass().getName().equals("org.apache.cxf.binding.soap.model.SoapBindingInfo")
&& s.getDataBinding().getClass().getName().equals("org.apache.cxf.jaxb.JAXBDataBinding")
&& !MessageUtils.isDOMPresent(m)
- && (enc == null || "UTF-8".equals(enc));
+ && (enc == null || StandardCharsets.UTF_8.name().equals(enc));
}
protected <T> DataWriter<T> getDataWriter(Message message, Service service, Class<T> output) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
index 9de2dac..8509036 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.interceptor;
import java.io.OutputStream;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.ResourceBundle;
@@ -137,7 +138,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
message.put(Message.ENCODING, encoding);
}
return encoding;
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index 9464b51..e71adff 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -31,6 +31,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Collections;
@@ -310,7 +311,7 @@ public class CachedOutputStream extends OutputStream {
}
public void writeCacheTo(StringBuilder out, long limit) throws IOException {
- writeCacheTo(out, "UTF-8", limit);
+ writeCacheTo(out, StandardCharsets.UTF_8.name(), limit);
}
public void writeCacheTo(StringBuilder out, String charsetName, long limit) throws IOException {
@@ -356,7 +357,7 @@ public class CachedOutputStream extends OutputStream {
}
public void writeCacheTo(StringBuilder out) throws IOException {
- writeCacheTo(out, "UTF-8");
+ writeCacheTo(out, StandardCharsets.UTF_8.name());
}
public void writeCacheTo(StringBuilder out, String charsetName) throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/io/CachedWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CachedWriter.java b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
index 8d33cdb..8fb3fdf 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
@@ -33,6 +33,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Collections;
@@ -517,7 +518,7 @@ public class CachedWriter extends Writer {
}
};
}
- return new InputStreamReader(fileInputStream, "UTF-8");
+ return new InputStreamReader(fileInputStream, StandardCharsets.UTF_8);
} catch (FileNotFoundException e) {
throw new IOException("Cached file was deleted, " + e.toString());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index d7c2720..6b0eb42 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -28,6 +28,7 @@ import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
@@ -382,7 +383,7 @@ public final class StaxUtils {
public static XMLStreamWriter createXMLStreamWriter(OutputStream out, String encoding) {
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
}
XMLOutputFactory factory = getXMLOutputFactory();
try {
@@ -1695,7 +1696,7 @@ public final class StaxUtils {
*/
public static XMLStreamReader createXMLStreamReader(InputStream in, String encoding) {
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
}
XMLInputFactory factory = getXMLInputFactory();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index 4014135..330ec9f 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -84,7 +85,7 @@ public class AttachmentDeserializerTest extends Assert {
Assert.assertTrue(m.find());
msg = new MessageImpl();
- msg.setContent(InputStream.class, new ByteArrayInputStream(message.getBytes("UTF-8")));
+ msg.setContent(InputStream.class, new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8)));
msg.put(Message.CONTENT_TYPE, "multipart/related");
AttachmentDeserializer ad = new AttachmentDeserializer(msg);
ad.initializeAttachments();
@@ -427,7 +428,7 @@ public class AttachmentDeserializerTest extends Assert {
+ "------=_Part_1"
+ "\n\nContent-Transfer-Encoding: binary\n\n"
+ "ABCD3\r\n"
- + "------=_Part_1--").getBytes("UTF-8");
+ + "------=_Part_1--").getBytes(StandardCharsets.UTF_8);
ByteArrayInputStream in = new ByteArrayInputStream(messageBytes) {
public int read(byte[] b, int off, int len) {
return super.read(b, off, len >= 2 ? 2 : len);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/test/java/org/apache/cxf/attachment/Rfc5987UtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/attachment/Rfc5987UtilTest.java b/core/src/test/java/org/apache/cxf/attachment/Rfc5987UtilTest.java
index 17f04f05..e730909 100644
--- a/core/src/test/java/org/apache/cxf/attachment/Rfc5987UtilTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/Rfc5987UtilTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.attachment;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -49,8 +50,8 @@ public class Rfc5987UtilTest {
@Test
public void test() throws Exception {
- assertEquals(expected, Rfc5987Util.encode(input, "UTF-8"));
+ assertEquals(expected, Rfc5987Util.encode(input, StandardCharsets.UTF_8.name()));
- assertEquals(input, Rfc5987Util.decode(expected, "UTF-8"));
+ assertEquals(input, Rfc5987Util.decode(expected, StandardCharsets.UTF_8.name()));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index 213dcd0..a05ffaf 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.common.util;
import java.io.ByteArrayOutputStream;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.helpers.IOUtils;
@@ -43,7 +44,7 @@ public class Base64UtilityTest extends Assert {
@Test
public void testEncodeMultipleChunks() throws Exception {
final String text = "The true sign of intelligence is not knowledge but imagination.";
- byte[] bytes = text.getBytes("UTF-8");
+ byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
// multiple of 3 octets
assertEquals(63, bytes.length);
String s1 = new String(Base64Utility.encodeChunk(bytes, 0, bytes.length));
@@ -64,7 +65,7 @@ public class Base64UtilityTest extends Assert {
public void testEncodeAndStream() throws Exception {
final String text = "The true sign of intelligence is not knowledge but imagination.";
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- byte[] bytes = text.getBytes("UTF-8");
+ byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
Base64Utility.encodeAndStream(bytes, 0, bytes.length, bos);
String decodedText = new String(Base64Utility.decode(bos.toString()));
assertEquals(decodedText, text);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 5a82792..9d69fe3 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -253,14 +254,14 @@ public abstract class CachedStreamTestBase extends Assert {
protected static String readFromStream(InputStream is) throws IOException {
try (ByteArrayOutputStream buf = new ByteArrayOutputStream()) {
IOUtils.copyAndCloseInput(is, buf);
- return new String(buf.toByteArray(), "UTF-8");
+ return new String(buf.toByteArray(), StandardCharsets.UTF_8);
}
}
protected static String readPartiallyFromStream(InputStream is, int len) throws IOException {
try (ByteArrayOutputStream buf = new ByteArrayOutputStream()) {
IOUtils.copyAtLeast(is, buf, len);
- return new String(buf.toByteArray(), "UTF-8");
+ return new String(buf.toByteArray(), StandardCharsets.UTF_8);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 564f0f5..181f9c4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.staxutils.transform;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -51,7 +52,7 @@ public class OutTransformWriterTest extends Assert {
@Test
public void testDefaultNamespace() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(os, "UTF-8");
+ XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name());
Map<String, String> outMap = new HashMap<String, String>();
outMap.put("{http://testbeans.com}*", "{http://testbeans.com/v2}*");
@@ -148,7 +149,7 @@ public class OutTransformWriterTest extends Assert {
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, "UTF-8"),
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
null, Collections.singletonMap("{http://bar}a", "{http://bar}a=1 2 3"),
null, null, false, null);
StaxUtils.copy(new StreamSource(is), writer);
@@ -255,7 +256,7 @@ public class OutTransformWriterTest extends Assert {
// writing each child separately (as the soap header children are serialized)
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, "UTF-8"),
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
map, null,
null, null, false, null);
boolean nsset = "ns3".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com/double"));
@@ -520,7 +521,7 @@ public class OutTransformWriterTest extends Assert {
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, "UTF-8"),
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
null, null, null, null, false, "");
StaxUtils.copy(new StreamSource(is), writer);
writer.flush();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
index 89b8cc5..df095bd 100755
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
@@ -21,6 +21,7 @@ package org.apache.cxf.staxutils.transform;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -111,7 +112,7 @@ public final class TransformTestUtils {
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, "UTF-8"),
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
emap, append, dropEls, amap, attributesToElements, defaultNamespace);
StaxUtils.copy(new StreamSource(TransformTestUtils.class.getResourceAsStream(file)), writer);
writer.flush();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
index a17264f..a6c72d3 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
@@ -68,7 +68,7 @@ public class ApplicationController implements ServletContextAware {
String consumerKey = clientApp.getConsumerKey();
if (StringUtils.isEmpty(consumerKey)) {
consumerKey = tokenGen
- .generate((principal.getName() + clientApp.getClientName()).getBytes("UTF-8"));
+ .generate((principal.getName() + clientApp.getClientName()).getBytes(StandardCharsets.UTF_8));
}
String secretKey = tokenGen.generate(new SecureRandom().generateSeed(20));
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
index e993cd7..37424a0 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
@@ -169,7 +169,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
protected String generateToken() throws OAuthServiceException {
String token;
try {
- token = tokenGenerator.generate(UUID.randomUUID().toString().getBytes("UTF-8"));
+ token = tokenGenerator.generate(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8));
} catch (Exception e) {
throw new OAuthServiceException("Unable to create token ", e.getCause());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
index 8307f48..2ec2558 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
@@ -23,6 +23,7 @@ package org.apache.cxf.jaxb.io;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
@@ -130,7 +131,7 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
try {
marshaller = context.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+ marshaller.setProperty(Marshaller.JAXB_ENCODING, StandardCharsets.UTF_8.name());
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.FALSE);
marshaller.setListener(databinding.getMarshallerListener());
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index aeb851d..d05d0d1 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ext.logging;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.util.StringUtils;
@@ -64,7 +65,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
private void handleOutputStream(final LogEvent event, Message message, CachedOutputStream cos) throws IOException {
String encoding = (String)message.get(Message.ENCODING);
if (StringUtils.isEmpty(encoding)) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
}
StringBuilder payload = new StringBuilder();
cos.writeCacheTo(payload, encoding, limit);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/SOAPLoggingTest.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/SOAPLoggingTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/SOAPLoggingTest.java
index 80dbdec..2dbe150 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/SOAPLoggingTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/SOAPLoggingTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ext.logging;
import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
@@ -80,7 +81,7 @@ public class SOAPLoggingTest {
Assert.assertEquals(SERVICE_URI, requestOut.getAddress());
Assert.assertEquals("text/xml", requestOut.getContentType());
Assert.assertEquals(EventType.REQ_OUT, requestOut.getType());
- Assert.assertEquals("UTF-8", requestOut.getEncoding());
+ Assert.assertEquals(StandardCharsets.UTF_8.name(), requestOut.getEncoding());
Assert.assertNotNull(requestOut.getExchangeId());
Assert.assertEquals("POST", requestOut.getHttpMethod());
Assert.assertNotNull(requestOut.getMessageId());
@@ -94,7 +95,7 @@ public class SOAPLoggingTest {
Assert.assertEquals(SERVICE_URI, requestIn.getAddress());
Assert.assertEquals("text/xml; charset=UTF-8", requestIn.getContentType());
Assert.assertEquals(EventType.REQ_IN, requestIn.getType());
- Assert.assertEquals("UTF-8", requestIn.getEncoding());
+ Assert.assertEquals(StandardCharsets.UTF_8.name(), requestIn.getEncoding());
Assert.assertNotNull(requestIn.getExchangeId());
Assert.assertEquals("POST", requestIn.getHttpMethod());
Assert.assertNotNull(requestIn.getMessageId());
@@ -109,7 +110,7 @@ public class SOAPLoggingTest {
Assert.assertNull(responseOut.getAddress());
Assert.assertEquals("text/xml", responseOut.getContentType());
Assert.assertEquals(EventType.RESP_OUT, responseOut.getType());
- Assert.assertEquals("UTF-8", responseOut.getEncoding());
+ Assert.assertEquals(StandardCharsets.UTF_8.name(), responseOut.getEncoding());
Assert.assertNotNull(responseOut.getExchangeId());
// Not yet available
@@ -125,7 +126,7 @@ public class SOAPLoggingTest {
Assert.assertNull(responseIn.getAddress());
Assert.assertEquals("text/xml; charset=UTF-8", responseIn.getContentType());
Assert.assertEquals(EventType.RESP_IN, responseIn.getType());
- Assert.assertEquals("UTF-8", responseIn.getEncoding());
+ Assert.assertEquals(StandardCharsets.UTF_8.name(), responseIn.getEncoding());
Assert.assertNotNull(responseIn.getExchangeId());
// Not yet available
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index f172737..12127b9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -26,6 +26,7 @@ import java.io.Reader;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -406,7 +407,7 @@ public final class ResponseImpl extends Response {
}
if (stringEntity != null) {
try {
- return new ByteArrayInputStream(stringEntity.getBytes("UTF-8"));
+ return new ByteArrayInputStream(stringEntity.getBytes(StandardCharsets.UTF_8));
} catch (Exception ex) {
throw new ProcessingException(ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
index 5cafd8c..634d07a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -394,7 +395,7 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
try {
String errorMessage = JAXRSUtils.logMessageHandlerProblem(name, cls, ct);
if (out != null) {
- out.write(errorMessage.getBytes("UTF-8"));
+ out.write(errorMessage.getBytes(StandardCharsets.UTF_8));
}
} catch (IOException another) {
// ignore
@@ -445,7 +446,7 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
private void writeResponseToStream(OutputStream os, Object responseObj) {
try {
- byte[] bytes = responseObj.toString().getBytes("UTF-8");
+ byte[] bytes = responseObj.toString().getBytes(StandardCharsets.UTF_8);
os.write(bytes, 0, bytes.length);
} catch (Exception ex) {
LOG.severe("Problem with writing the data to the output stream");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
index b0cd13a..980b076 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
@@ -33,6 +33,7 @@ import java.io.Reader;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.security.DigestInputStream;
import java.util.UUID;
import java.util.logging.Logger;
@@ -177,7 +178,7 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider
private String getEncoding(MediaType mt) {
String enc = mt.getParameters().get("charset");
- return enc == null ? "UTF-8" : enc;
+ return enc == null ? StandardCharsets.UTF_8.name() : enc;
}
private String getCharset(MediaType mt) {
return mt.getParameters().get("charset");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataBindingProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataBindingProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataBindingProvider.java
index 1a9532e..e5f5eed 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataBindingProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataBindingProvider.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
@@ -105,7 +106,7 @@ public class DataBindingProvider<T> implements MessageBodyReader<T>, MessageBody
throws IOException {
XMLStreamWriter writer = null;
try {
- String enc = HttpUtils.getSetEncoding(m, headers, "UTF-8");
+ String enc = HttpUtils.getSetEncoding(m, headers, StandardCharsets.UTF_8.name());
writer = createWriter(clazz, genericType, enc, os);
writeToWriter(writer, o);
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
index 1968763..3f78efe 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.Consumes;
import javax.ws.rs.Encoded;
@@ -168,7 +169,7 @@ public class FormEncodingProvider<T> extends AbstractConfigurableProvider
FormUtils.populateMapFromMultipart(params, body, PhaseInterceptorChain.getCurrentMessage(),
decode);
} else {
- String enc = HttpUtils.getEncoding(mt, "UTF-8");
+ String enc = HttpUtils.getEncoding(mt, StandardCharsets.UTF_8.name());
Object servletRequest = mc != null ? mc.getHttpServletRequest() : null;
if (servletRequest == null) {
@@ -222,7 +223,7 @@ public class FormEncodingProvider<T> extends AbstractConfigurableProvider
(MultivaluedMap<String, String>)(obj instanceof Form ? ((Form)obj).asMap() : obj);
boolean encoded = keepEncoded(anns);
- String enc = HttpUtils.getSetEncoding(mt, headers, "UTF-8");
+ String enc = HttpUtils.getSetEncoding(mt, headers, StandardCharsets.UTF_8.name());
FormUtils.writeMapToOutputStream(map, os, enc, encoded);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
index 4c61df9..8f834b5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
@@ -26,6 +26,7 @@ import java.io.Reader;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -360,7 +361,7 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T> {
}
StringBuilder pi = new StringBuilder();
- pi.append(XML_PI_START + (enc == null ? "UTF-8" : enc) + "\"?>");
+ pi.append(XML_PI_START + (enc == null ? StandardCharsets.UTF_8.name() : enc) + "\"?>");
os.write(pi.toString().getBytes());
String startTag = null;
String endTag = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
index 31721b0..a585afe 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
@@ -53,7 +54,7 @@ public class PrimitiveTextProvider<T> extends AbstractConfigurableProvider
public T readFrom(Class<T> type, Type genType, Annotation[] anns, MediaType mt,
MultivaluedMap<String, String> headers, InputStream is) throws IOException {
- String string = IOUtils.toString(is, HttpUtils.getEncoding(mt, "UTF-8"));
+ String string = IOUtils.toString(is, HttpUtils.getEncoding(mt, StandardCharsets.UTF_8.name()));
if (StringUtils.isEmpty(string)) {
reportEmptyContentLength();
}
@@ -82,7 +83,7 @@ public class PrimitiveTextProvider<T> extends AbstractConfigurableProvider
public void writeTo(T obj, Class<?> type, Type genType, Annotation[] anns,
MediaType mt, MultivaluedMap<String, Object> headers,
OutputStream os) throws IOException {
- String encoding = HttpUtils.getSetEncoding(mt, headers, "UTF-8");
+ String encoding = HttpUtils.getSetEncoding(mt, headers, StandardCharsets.UTF_8.name());
byte[] bytes = obj.toString().getBytes(encoding);
os.write(bytes);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
index 654a9ff..52bf495 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.logging.Logger;
import javax.ws.rs.Consumes;
@@ -186,7 +187,7 @@ public class SourceProvider<T> extends AbstractConfigurableProvider implements
MediaType mt, MultivaluedMap<String, Object> headers, OutputStream os)
throws IOException {
- String encoding = HttpUtils.getSetEncoding(mt, headers, "UTF-8");
+ String encoding = HttpUtils.getSetEncoding(mt, headers, StandardCharsets.UTF_8.name());
XMLStreamReader reader =
source instanceof Source ? StaxUtils.createXMLStreamReader((Source)source)
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/StringTextProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/StringTextProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/StringTextProvider.java
index e6e25da..6d26a99 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/StringTextProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/StringTextProvider.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -41,7 +42,7 @@ public class StringTextProvider extends AbstractConfigurableProvider
public String readFrom(Class<String> type, Type genType, Annotation[] anns, MediaType mt,
MultivaluedMap<String, String> headers, InputStream is) throws IOException {
- return IOUtils.toString(is, HttpUtils.getEncoding(mt, "UTF-8"));
+ return IOUtils.toString(is, HttpUtils.getEncoding(mt, StandardCharsets.UTF_8.name()));
}
public long getSize(String t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mt) {
@@ -55,7 +56,7 @@ public class StringTextProvider extends AbstractConfigurableProvider
public void writeTo(String obj, Class<?> type, Type genType, Annotation[] anns,
MediaType mt, MultivaluedMap<String, Object> headers,
OutputStream os) throws IOException {
- String encoding = HttpUtils.getSetEncoding(mt, headers, "UTF-8");
+ String encoding = HttpUtils.getSetEncoding(mt, headers, StandardCharsets.UTF_8.name());
//REVISIT try to avoid instantiating the whole byte array
byte[] bytes = obj.getBytes(encoding);
if (bytes.length > bufferSize) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index bd33ad2..dd92978 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -26,6 +26,7 @@ import java.io.Reader;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -515,7 +516,7 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
}
Reader r = new BufferedReader(
- new InputStreamReader(urlStream.openStream(), "UTF-8"));
+ new InputStreamReader(urlStream.openStream(), StandardCharsets.UTF_8));
Source source = new StreamSource(r);
source.setSystemId(urlStream.toExternalForm());
if (factory == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
index e91e60a..666fa28 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
@@ -63,10 +64,9 @@ public final class FormUtils {
}
public static String formToString(Form form) {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try {
- FormUtils.writeMapToOutputStream(form.asMap(), bos, "UTF-8", false);
- return bos.toString("UTF-8");
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+ FormUtils.writeMapToOutputStream(form.asMap(), bos, StandardCharsets.UTF_8.name(), false);
+ return bos.toString(StandardCharsets.UTF_8.name());
} catch (Exception ex) {
// will not happen
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 61664b4..e945943 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,6 +22,7 @@ package org.apache.cxf.jaxrs.utils;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -132,7 +133,7 @@ public final class HttpUtils {
public static String urlEncode(String value) {
- return urlEncode(value, "UTF-8");
+ return urlEncode(value, StandardCharsets.UTF_8.name());
}
public static String urlEncode(String value, String enc) {
@@ -558,7 +559,7 @@ public final class HttpUtils {
headers.putSingle(HttpHeaders.CONTENT_TYPE,
JAXRSUtils.mediaTypeToString(mt, CHARSET_PARAMETER)
+ ';' + CHARSET_PARAMETER + "="
- + (defaultEncoding == null ? "UTF-8" : defaultEncoding));
+ + (defaultEncoding == null ? StandardCharsets.UTF_8 : defaultEncoding));
}
return defaultEncoding;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index ab2a55c..26120ec 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -27,6 +27,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -945,7 +946,7 @@ public final class JAXRSUtils {
m.put(FormUtils.FORM_PARAM_MAP, params);
if (mt == null || mt.isCompatible(MediaType.APPLICATION_FORM_URLENCODED_TYPE)) {
- String enc = HttpUtils.getEncoding(mt, "UTF-8");
+ String enc = HttpUtils.getEncoding(mt, StandardCharsets.UTF_8.name());
String body = FormUtils.readBody(m.getContent(InputStream.class), enc);
HttpServletRequest request = (HttpServletRequest)m.get(AbstractHTTPDestination.HTTP_REQUEST);
FormUtils.populateMapFromString(params, m, body, enc, decode, request);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
index 4bbbea1..dc370ea 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -542,7 +543,7 @@ public final class ResourceUtils {
}
public static List<UserResource> getUserResources(InputStream is) throws Exception {
- Document doc = StaxUtils.read(new InputStreamReader(is, "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(is, StandardCharsets.UTF_8));
return getResourcesFromElement(doc.getDocumentElement());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
index f085535..5a97297 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@@ -101,7 +102,7 @@ public class SchemaHandler {
}
for (URL schemaURL : schemaURLs) {
Reader r = new BufferedReader(
- new InputStreamReader(schemaURL.openStream(), "UTF-8"));
+ new InputStreamReader(schemaURL.openStream(), StandardCharsets.UTF_8));
StreamSource source = new StreamSource(r);
source.setSystemId(schemaURL.toString());
sources.add(source);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index c38dbc7..0690e9d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.jaxrs.impl;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -66,9 +67,9 @@ public class RequestImplTest extends Assert {
metadata.putSingle(HttpHeaders.CONTENT_LANGUAGE, "en");
metadata.putSingle(HttpHeaders.CONTENT_ENCODING, "utf-8");
- assertSameVariant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), "UTF-8");
- assertSameVariant(null, new Locale("en"), "UTF-8");
- assertSameVariant(MediaType.APPLICATION_XML_TYPE, null, "UTF-8");
+ assertSameVariant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), StandardCharsets.UTF_8.name());
+ assertSameVariant(null, new Locale("en"), StandardCharsets.UTF_8.name());
+ assertSameVariant(MediaType.APPLICATION_XML_TYPE, null, StandardCharsets.UTF_8.name());
assertSameVariant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), null);
}
@@ -77,9 +78,9 @@ public class RequestImplTest extends Assert {
public void testSingleMatchingVariantWithContentTypeOnly() {
metadata.putSingle(HttpHeaders.CONTENT_TYPE, "application/xml");
- assertSameVariant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), "UTF-8");
- assertSameVariant(null, new Locale("en"), "UTF-8");
- assertSameVariant(MediaType.APPLICATION_XML_TYPE, null, "UTF-8");
+ assertSameVariant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), StandardCharsets.UTF_8.name());
+ assertSameVariant(null, new Locale("en"), StandardCharsets.UTF_8.name());
+ assertSameVariant(MediaType.APPLICATION_XML_TYPE, null, StandardCharsets.UTF_8.name());
assertSameVariant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index 57bba2c..3409090 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.lang.annotation.Annotation;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import javax.ws.rs.Consumes;
@@ -279,7 +280,7 @@ public class FormEncodingProviderTest extends Assert {
(MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
new Annotation[]{},
MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=UTF-8"), null,
- new ByteArrayInputStream(s.getBytes("UTF-8")));
+ new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
String value = mvMap.getFirst("name");
assertEquals(s, "name=" + value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index df4e9f3..b3b1350 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -28,6 +28,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -130,7 +131,7 @@ public class JAXBElementProviderTest extends Assert {
Book book = p.readFrom(Book.class, null,
new Annotation[]{},
MediaType.valueOf(MediaType.APPLICATION_XML + ";charset=UTF-8"), null,
- new ByteArrayInputStream(bookStringUTF16.getBytes("UTF-8")));
+ new ByteArrayInputStream(bookStringUTF16.getBytes(StandardCharsets.UTF_8)));
assertEquals(book.getName(), nameStringUTF16);
}
@@ -705,7 +706,7 @@ public class JAXBElementProviderTest extends Assert {
JAXBElementProvider<JAXBElement> provider = new JAXBElementProvider<JAXBElement>();
JAXBElement<Book> jaxbElement = provider.readFrom(JAXBElement.class, Book.class,
new Annotation[0], MediaType.TEXT_XML_TYPE, new MetadataMap<String, String>(),
- new ByteArrayInputStream(xml.getBytes("UTF-8")));
+ new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
Book book = jaxbElement.getValue();
assertEquals(123L, book.getId());
assertEquals("CXF in Action", book.getName());
@@ -719,7 +720,7 @@ public class JAXBElementProviderTest extends Assert {
JAXBElementProvider<ParamJAXBElement> provider = new JAXBElementProvider<ParamJAXBElement>();
ParamJAXBElement jaxbElement = provider.readFrom(ParamJAXBElement.class, ParamJAXBElement.class,
new Annotation[0], MediaType.TEXT_XML_TYPE, new MetadataMap<String, String>(),
- new ByteArrayInputStream(xml.getBytes("UTF-8")));
+ new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
ParamType param = jaxbElement.getValue();
assertEquals("a", param.getComment());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index 95fb77f..0f500c1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.jaxrs.provider;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.lang.annotation.Annotation;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import javax.ws.rs.core.MediaType;
@@ -206,7 +207,7 @@ public class PrimitiveTextProviderTest extends Assert {
String value = (String)p.readFrom(String.class, null,
new Annotation[]{},
MediaType.valueOf(MediaType.APPLICATION_XML + ";charset=UTF-8"), null,
- new ByteArrayInputStream(s.getBytes("UTF-8")));
+ new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
assertEquals(value, value);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index ac90b1e..ad78c24 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.jaxrs.utils;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
@@ -54,7 +55,8 @@ public class FormUtilsTest extends Assert {
EasyMock.replay(mockMessage, mockRequest);
MultivaluedMap<String, String> params = new MetadataMap<String, String>();
- FormUtils.populateMapFromString(params, mockMessage, null, "UTF-8", false, mockRequest);
+ FormUtils.populateMapFromString(params, mockMessage, null, StandardCharsets.UTF_8.name(),
+ false, mockRequest);
assertEquals(2, params.size());
assertEquals(HTTP_PARAM_VALUE1, params.get(HTTP_PARAM1).iterator().next());
@@ -66,7 +68,8 @@ public class FormUtilsTest extends Assert {
EasyMock.replay(mockMessage, mockRequest);
MultivaluedMap<String, String> params = new MetadataMap<String, String>();
- FormUtils.populateMapFromString(params, mockMessage, null, "UTF-8", false, mockRequest);
+ FormUtils.populateMapFromString(params, mockMessage, null, StandardCharsets.UTF_8.name(),
+ false, mockRequest);
assertEquals(0, params.size());
}
@@ -78,7 +81,8 @@ public class FormUtilsTest extends Assert {
MultivaluedMap<String, String> params = new MetadataMap<String, String>();
String postBody = FORM_PARAM1 + "=" + FORM_PARAM_VALUE1 + "&" + FORM_PARAM2 + "=" + FORM_PARAM_VALUE2;
- FormUtils.populateMapFromString(params, mockMessage, postBody, "UTF-8", false, mockRequest);
+ FormUtils.populateMapFromString(params, mockMessage, postBody, StandardCharsets.UTF_8.name(),
+ false, mockRequest);
assertEquals(2, params.size());
assertEquals(FORM_PARAM_VALUE1, params.get(FORM_PARAM1).iterator().next());
[2/3] cxf git commit: Switch to use StandardCharset.UTF_8 instead of
string literal
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index aa051c6..856d02f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -25,6 +25,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -121,8 +122,8 @@ public class JAXRSUtilsTest extends Assert {
@Test
public void testFormParametersUTF8Encoding() throws Exception {
JAXRSUtils.intersectMimeTypes("application/json", "application/json+v2");
- doTestFormParamsWithEncoding("UTF-8", true);
- doTestFormParamsWithEncoding("UTF-8", false);
+ doTestFormParamsWithEncoding(StandardCharsets.UTF_8.name(), true);
+ doTestFormParamsWithEncoding(StandardCharsets.UTF_8.name(), false);
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
index 55e0a26..7eeb9c2 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
@@ -25,6 +25,7 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
@@ -226,11 +227,7 @@ public class SwAOutInterceptor extends AbstractSoapInterceptor {
if (ct == null) {
ct = "text/plain; charset=\'UTF-8\'";
}
- try {
- dh = new DataHandler(new ByteDataSource(((String)o).getBytes("UTF-8"), ct));
- } catch (IOException e) {
- throw new Fault(e);
- }
+ dh = new DataHandler(new ByteDataSource(((String)o).getBytes(StandardCharsets.UTF_8), ct));
} else {
throw new Fault(new org.apache.cxf.common.i18n.Message("ATTACHMENT_NOT_SUPPORTED",
LOG, o.getClass()));
@@ -260,7 +257,7 @@ public class SwAOutInterceptor extends AbstractSoapInterceptor {
IOUtils.copy(src.getInputStream(), bos, 1024);
ds = new ByteDataSource(bos.toByteArray(), ct);
} else {
- ds = new ByteDataSource(IOUtils.toString(src.getReader()).getBytes("UTF-8"),
+ ds = new ByteDataSource(IOUtils.toString(src.getReader()).getBytes(StandardCharsets.UTF_8),
ct);
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
index db079d7..b9221d6 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
@@ -21,6 +21,7 @@ package org.apache.cxf.js.rhino;
import java.io.File;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -74,7 +75,7 @@ public class JsServiceFactoryBean {
public void create() throws Exception {
BusFactory.setDefaultBus(bus);
String jsFileString = getClass().getResource(js).toURI().getPath();
- jsFileString = URLDecoder.decode(jsFileString, "UTF-8");
+ jsFileString = URLDecoder.decode(jsFileString, StandardCharsets.UTF_8.name());
File file = new File(jsFileString);
providerFactory.createAndPublish(file, address, isBaseAddr);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java
index c8fc34e..e0aa712 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java
@@ -26,6 +26,7 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
@@ -113,7 +114,7 @@ public class AegisElementProvider<T> extends AbstractAegisProvider<T> {
AegisType aegisType = context.getTypeMapping().getType(genericType);
AegisWriter<XMLStreamWriter> aegisWriter = context.createXMLStreamWriter();
try {
- String enc = HttpUtils.getSetEncoding(m, headers, "UTF-8");
+ String enc = HttpUtils.getSetEncoding(m, headers, StandardCharsets.UTF_8.name());
XMLStreamWriter xmlStreamWriter = createStreamWriter(aegisType.getSchemaType(), enc, os);
// use type qname as element qname?
xmlStreamWriter.writeStartDocument();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
index 3bf5894..0a2591a 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -114,7 +115,7 @@ public final class AegisJSONProvider<T> extends AegisElementProvider<T> {
Document dom = w3cStreamWriter.getDocument();
// ok, now the namespace map has all the prefixes.
- String enc = HttpUtils.getSetEncoding(m, headers, "UTF-8");
+ String enc = HttpUtils.getSetEncoding(m, headers, StandardCharsets.UTF_8.name());
XMLStreamWriter xmlStreamWriter = createStreamWriter(aegisType.getSchemaType(), enc, os);
xmlStreamWriter.writeStartDocument();
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
index 2a53be9..24f694f 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
@@ -30,6 +30,7 @@ import java.io.StringReader;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.Enumeration;
@@ -216,7 +217,7 @@ public class JSONProvider<T> extends AbstractJAXBProvider<T> {
}
XMLStreamReader reader = null;
- String enc = HttpUtils.getEncoding(mt, "UTF-8");
+ String enc = HttpUtils.getEncoding(mt, StandardCharsets.UTF_8.name());
Unmarshaller unmarshaller = null;
try {
InputStream realStream = getInputStream(type, genericType, is);
@@ -374,7 +375,7 @@ public class JSONProvider<T> extends AbstractJAXBProvider<T> {
XMLStreamWriter writer = null;
try {
- String enc = HttpUtils.getSetEncoding(m, headers, "UTF-8");
+ String enc = HttpUtils.getSetEncoding(m, headers, StandardCharsets.UTF_8.name());
if (Document.class.isAssignableFrom(cls)) {
writer = createWriter(obj, cls, genericType, enc, os, false);
copyReaderToWriter(StaxUtils.createXMLStreamReader((Document)obj), writer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
index 6c37267..1e99871 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.provider.json.utils;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -135,7 +136,7 @@ public final class JSONUtils {
public static XMLStreamReader createStreamReader(InputStream is, boolean readXsiType,
ConcurrentHashMap<String, String> namespaceMap) throws Exception {
- return createStreamReader(is, readXsiType, namespaceMap, null, null, null, "UTF-8");
+ return createStreamReader(is, readXsiType, namespaceMap, null, null, null, StandardCharsets.UTF_8.name());
}
public static XMLStreamReader createStreamReader(InputStream is, boolean readXsiType,
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java
index 2760488..2c1a807 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.provider.jsonp;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServletResponse;
@@ -42,7 +43,7 @@ public abstract class AbstractJsonpOutInterceptor extends AbstractPhaseIntercept
protected void writeValue(Message message, String value) throws Fault {
try {
- getOutputStream(message).write(value.getBytes("UTF-8"));
+ getOutputStream(message).write(value.getBytes(StandardCharsets.UTF_8));
} catch (IOException e) {
throw new Fault(e);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpJaxrsWriterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpJaxrsWriterInterceptor.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpJaxrsWriterInterceptor.java
index 2086d6c..6322964 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpJaxrsWriterInterceptor.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpJaxrsWriterInterceptor.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxrs.provider.jsonp;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.ext.WriterInterceptor;
@@ -47,7 +48,7 @@ public class JsonpJaxrsWriterInterceptor implements WriterInterceptor {
if (!StringUtils.isEmpty(callback)) {
context.getHeaders().putSingle(Message.CONTENT_TYPE,
JAXRSUtils.toMediaType(getMediaType()));
- context.getOutputStream().write((callback + getPaddingEnd()).getBytes("UTF-8"));
+ context.getOutputStream().write((callback + getPaddingEnd()).getBytes(StandardCharsets.UTF_8));
}
context.proceed();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index 934f763..0296764 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
import java.lang.annotation.Annotation;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -197,7 +197,7 @@ public class AtomPojoProviderTest extends Assert {
new Annotation[0],
MediaType.valueOf("application/atom+xml;type=entry"),
new MetadataMap<String, String>(),
- new ByteArrayInputStream(entryNoContent.getBytes(Charset.forName("UTF-8"))));
+ new ByteArrayInputStream(entryNoContent.getBytes(StandardCharsets.UTF_8)));
assertNull(type);
}
@@ -231,7 +231,7 @@ public class AtomPojoProviderTest extends Assert {
new Annotation[0],
MediaType.valueOf(mediaType),
new MetadataMap<String, String>(),
- new ByteArrayInputStream(entryWithContent.getBytes(Charset.forName("UTF-8"))));
+ new ByteArrayInputStream(entryWithContent.getBytes(StandardCharsets.UTF_8)));
assertNotNull(type);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index f4fa478..a0912a0 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.provider.dom4j;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.lang.annotation.Annotation;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
@@ -58,7 +59,7 @@ public class DOM4JProviderTest extends Assert {
p.setProviders(new ProvidersImpl(createMessage(false)));
org.dom4j.Document dom = p.readFrom(org.dom4j.Document.class, org.dom4j.Document.class,
new Annotation[] {}, ct, new MetadataMap<String, String>(),
- new ByteArrayInputStream(xml.getBytes("UTF-8")));
+ new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
return dom;
}
@@ -69,7 +70,7 @@ public class DOM4JProviderTest extends Assert {
p.setProviders(new ProvidersImpl(createMessage(false)));
org.dom4j.Document dom = p.readFrom(org.dom4j.Document.class, org.dom4j.Document.class,
new Annotation[]{}, MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, String>(),
- new ByteArrayInputStream(xml.getBytes("UTF-8")));
+ new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
String str = dom.asXML();
// starts with the xml PI
assertTrue(str.contains("<a><b>2</b></a>"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
index 8d466e4..453d609 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.jaxrs.ext.search.hbase;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -118,10 +118,10 @@ public class HBaseQueryVisitor<T> extends AbstractSearchConditionVisitor<T, Filt
String theFamily = family != null ? family : familyMap.get(qualifier);
ByteArrayComparable byteArrayComparable = regexCompRequired
? new RegexStringComparator(value.toString().replace("*", "."))
- : new BinaryComparator(getBytes(value.toString()));
+ : new BinaryComparator(value.toString().getBytes(StandardCharsets.UTF_8));
- Filter query = new SingleColumnValueFilter(getBytes(theFamily),
- getBytes(qualifier),
+ Filter query = new SingleColumnValueFilter(theFamily.getBytes(StandardCharsets.UTF_8),
+ qualifier.getBytes(StandardCharsets.UTF_8),
compareOp,
byteArrayComparable);
return query;
@@ -138,11 +138,4 @@ public class HBaseQueryVisitor<T> extends AbstractSearchConditionVisitor<T, Filt
return list;
}
- private byte[] getBytes(String value) {
- try {
- return value.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
index 83e3533..d28b1b7 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.jose.jaxrs;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.rs.security.jose.common.JoseUtils;
@@ -33,7 +34,8 @@ public class AbstractJweDecryptingFilter {
private JweDecryptionProvider decryption;
private String defaultMediaType;
protected JweDecryptionOutput decrypt(InputStream is) throws IOException {
- JweCompactConsumer jwe = new JweCompactConsumer(new String(IOUtils.readBytesFromStream(is), "UTF-8"));
+ JweCompactConsumer jwe = new JweCompactConsumer(new String(IOUtils.readBytesFromStream(is),
+ StandardCharsets.UTF_8));
JweDecryptionProvider theDecryptor = getInitializedDecryptionProvider(jwe.getJweHeaders());
JweDecryptionOutput out = new JweDecryptionOutput(jwe.getJweHeaders(), jwe.getDecryptedContent(theDecryptor));
JoseUtils.traceHeaders(out.getHeaders());
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
index 9522b9b..dc99b7c 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.jose.jaxrs;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -89,7 +90,7 @@ public class JwsJsonWriterInterceptor extends AbstractJwsJsonWriterProvider impl
CachedOutputStream cos = new CachedOutputStream();
ctx.setOutputStream(cos);
ctx.proceed();
- JwsJsonProducer p = new JwsJsonProducer(new String(cos.getBytes(), "UTF-8"));
+ JwsJsonProducer p = new JwsJsonProducer(new String(cos.getBytes(), StandardCharsets.UTF_8));
for (JwsSignatureProvider signer : sigProviders) {
JwsHeaders protectedHeader = prepareProtectedHeader(ctx, signer);
p.signWith(signer, protectedHeader, null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
index 4657c9e..e4d8aff 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.jose.jaxrs;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import javax.annotation.Priority;
import javax.ws.rs.WebApplicationException;
@@ -75,7 +76,7 @@ public class JwsWriterInterceptor extends AbstractJwsWriterProvider implements W
CachedOutputStream cos = new CachedOutputStream();
ctx.setOutputStream(cos);
ctx.proceed();
- JwsCompactProducer p = new JwsCompactProducer(headers, new String(cos.getBytes(), "UTF-8"));
+ JwsCompactProducer p = new JwsCompactProducer(headers, new String(cos.getBytes(), StandardCharsets.UTF_8));
setJoseMediaType(ctx);
writeJws(p, sigProvider, actualOs);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
index 4649517..225540e 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
@@ -20,8 +20,8 @@ package org.apache.cxf.rs.security.jose.common;
import java.io.File;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
@@ -110,12 +110,7 @@ public final class JoseUtils {
}
public static String decodeToString(String encoded) {
- try {
- return new String(decode(encoded), "UTF-8");
- } catch (UnsupportedEncodingException ex) {
- throw new JoseException(ex);
- }
-
+ return new String(decode(encoded), StandardCharsets.UTF_8);
}
public static byte[] decode(String encoded) {
return CryptoUtils.decodeSequence(encoded);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
index eb0c2a7..d508e36 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
@@ -19,7 +19,7 @@
package org.apache.cxf.rs.security.jose.jwe;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
@@ -27,7 +27,6 @@ import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64UrlUtility;
import org.apache.cxf.jaxrs.json.basic.JsonMapObject;
import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
-import org.apache.cxf.rs.security.jose.common.JoseException;
import org.apache.cxf.rs.security.jose.common.JoseUtils;
@@ -113,11 +112,7 @@ public class JweCompactConsumer {
return decryption.decrypt(jweDecryptionInput);
}
public String getDecryptedContentText(JweDecryptionProvider decryption) {
- try {
- return new String(getDecryptedContent(decryption), "UTF-8");
- } catch (UnsupportedEncodingException ex) {
- throw new JoseException(ex);
- }
+ return new String(getDecryptedContent(decryption), StandardCharsets.UTF_8);
}
public boolean validateCriticalHeaders() {
return JweUtils.validateCriticalHeaders(getJweHeaders());
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
index 3432236..bb68424 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
@@ -18,9 +18,7 @@
*/
package org.apache.cxf.rs.security.jose.jwe;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.cxf.rs.security.jose.common.JoseException;
+import java.nio.charset.StandardCharsets;
public class JweDecryptionOutput {
private JweHeaders headers;
@@ -36,10 +34,6 @@ public class JweDecryptionOutput {
return content;
}
public String getContentText() {
- try {
- return new String(getContent(), "UTF-8");
- } catch (UnsupportedEncodingException ex) {
- throw new JoseException(ex);
- }
+ return new String(getContent(), StandardCharsets.UTF_8);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
index 3535208..4c2a694 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.rs.security.jose.jwe;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -29,7 +29,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
-import org.apache.cxf.rs.security.jose.common.JoseException;
import org.apache.cxf.rs.security.jose.common.JoseUtils;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
@@ -175,11 +174,7 @@ public class JweJsonConsumer {
if (aad == null) {
return null;
}
- try {
- return new String(aad, "UTF-8");
- } catch (UnsupportedEncodingException ex) {
- throw new JoseException(ex);
- }
+ return new String(aad, StandardCharsets.UTF_8);
}
public List<JweJsonEncryptionEntry> getRecipients() {
return recipients;
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
index 247f84b..451b464 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
@@ -17,6 +17,7 @@
* under the License.
*/
package org.apache.cxf.rs.security.jose.jwe;
+import java.nio.charset.StandardCharsets;
import java.security.interfaces.RSAPrivateKey;
import javax.crypto.SecretKey;
@@ -59,7 +60,7 @@ public class JweJwtCompactConsumer {
}
private static String toString(byte[] bytes) {
try {
- return new String(bytes, "UTF-8");
+ return new String(bytes, StandardCharsets.UTF_8);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
index 0a17be5..b52b9bd 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
@@ -20,7 +20,7 @@ package org.apache.cxf.rs.security.jose.jwe;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
@@ -179,7 +179,7 @@ public class PbesHmacAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvi
return StringUtils.toBytesUTF8(str);
}
static byte[] charsToBytes(char[] chars) {
- ByteBuffer bb = Charset.forName("UTF-8").encode(CharBuffer.wrap(chars));
+ ByteBuffer bb = StandardCharsets.UTF_8.encode(CharBuffer.wrap(chars));
byte[] b = new byte[bb.remaining()];
bb.get(b);
return b;
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
index cd609f5..3fca28d 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.math.BigInteger;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
@@ -501,7 +502,7 @@ public final class JwkUtils {
}
private static String toString(byte[] bytes) {
try {
- return new String(bytes, "UTF-8");
+ return new String(bytes, StandardCharsets.UTF_8);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
index c93fb0e..0188d8e 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.rs.security.jose.jwe;
+import java.nio.charset.StandardCharsets;
import java.security.Security;
import java.security.interfaces.ECPrivateKey;
import java.security.interfaces.ECPublicKey;
@@ -107,7 +108,7 @@ public class JweCompactReaderWriterTest extends Assert {
CONTENT_ENCRYPTION_KEY_A3,
INIT_VECTOR_A3,
keyEncryption);
- String jweContent = encryption.encrypt(specPlainText.getBytes("UTF-8"), null);
+ String jweContent = encryption.encrypt(specPlainText.getBytes(StandardCharsets.UTF_8), null);
assertEquals(JWE_OUTPUT_A3, jweContent);
AesWrapKeyDecryptionAlgorithm keyDecryption = new AesWrapKeyDecryptionAlgorithm(cekEncryptionKey);
@@ -152,7 +153,7 @@ public class JweCompactReaderWriterTest extends Assert {
CONTENT_ENCRYPTION_KEY_A3,
INIT_VECTOR_A3,
keyEncryption);
- String jweContent = encryption.encrypt(specPlainText.getBytes("UTF-8"), null);
+ String jweContent = encryption.encrypt(specPlainText.getBytes(StandardCharsets.UTF_8), null);
RSAPrivateKey privateKey = CryptoUtils.getRSAPrivateKey(RSA_MODULUS_ENCODED_A1,
RSA_PRIVATE_EXPONENT_ENCODED_A1);
@@ -180,7 +181,7 @@ public class JweCompactReaderWriterTest extends Assert {
CONTENT_ENCRYPTION_KEY_A3,
INIT_VECTOR_A3,
keyEncryption);
- String jweContent = encryption.encrypt(specPlainText.getBytes("UTF-8"), null);
+ String jweContent = encryption.encrypt(specPlainText.getBytes(StandardCharsets.UTF_8), null);
AesGcmWrapKeyDecryptionAlgorithm keyDecryption = new AesGcmWrapKeyDecryptionAlgorithm(cekEncryptionKey);
JweDecryptionProvider decryption = new AesCbcHmacJweDecryption(keyDecryption);
@@ -228,12 +229,12 @@ public class JweCompactReaderWriterTest extends Assert {
new AesGcmContentEncryptionAlgorithm(key == null ? null : key.getEncoded(), INIT_VECTOR_A1,
ContentAlgorithm.getAlgorithm(jwtKeyName));
JweEncryptionProvider encryptor = new JweEncryption(keyEncryptionAlgo, contentEncryptionAlgo);
- return encryptor.encrypt(content.getBytes("UTF-8"), null);
+ return encryptor.encrypt(content.getBytes(StandardCharsets.UTF_8), null);
}
private String encryptContentDirect(SecretKey key, String content) throws Exception {
JweEncryption encryptor = new JweEncryption(new DirectKeyEncryptionAlgorithm(),
new AesGcmContentEncryptionAlgorithm(key, INIT_VECTOR_A1, ContentAlgorithm.A128GCM));
- return encryptor.encrypt(content.getBytes("UTF-8"), null);
+ return encryptor.encrypt(content.getBytes(StandardCharsets.UTF_8), null);
}
private void decrypt(String jweContent, String plainContent, boolean unwrap) throws Exception {
RSAPrivateKey privateKey = CryptoUtils.getRSAPrivateKey(RSA_MODULUS_ENCODED_A1,
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
index 8898bf0..ab00e97 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.rs.security.jose.jwe;
+import java.nio.charset.StandardCharsets;
import java.security.Security;
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
@@ -46,7 +47,7 @@ public class JwePbeHmacAesWrapTest extends Assert {
new PbesHmacAesWrapKeyEncryptionAlgorithm(password, KeyAlgorithm.PBES2_HS256_A128KW);
JweEncryptionProvider encryption = new AesCbcHmacJweEncryption(ContentAlgorithm.A128CBC_HS256,
keyEncryption);
- String jweContent = encryption.encrypt(specPlainText.getBytes("UTF-8"), null);
+ String jweContent = encryption.encrypt(specPlainText.getBytes(StandardCharsets.UTF_8), null);
PbesHmacAesWrapKeyDecryptionAlgorithm keyDecryption = new PbesHmacAesWrapKeyDecryptionAlgorithm(password);
JweDecryptionProvider decryption = new AesCbcHmacJweDecryption(keyDecryption);
@@ -65,7 +66,7 @@ public class JwePbeHmacAesWrapTest extends Assert {
new PbesHmacAesWrapKeyEncryptionAlgorithm(password, KeyAlgorithm.PBES2_HS256_A128KW);
JweEncryptionProvider encryption = new JweEncryption(keyEncryption,
new AesGcmContentEncryptionAlgorithm(ContentAlgorithm.A128GCM));
- String jweContent = encryption.encrypt(specPlainText.getBytes("UTF-8"), null);
+ String jweContent = encryption.encrypt(specPlainText.getBytes(StandardCharsets.UTF_8), null);
PbesHmacAesWrapKeyDecryptionAlgorithm keyDecryption = new PbesHmacAesWrapKeyDecryptionAlgorithm(password);
JweDecryptionProvider decryption = new JweDecryption(keyDecryption,
new AesGcmContentDecryptionAlgorithm(ContentAlgorithm.A128GCM));
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
index 708144e..aa8f820 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth.utils;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -130,7 +131,7 @@ public final class OAuthUtils {
OAuthMessage oAuthMessage) throws IOException {
List<Entry<String, String>> params = oAuthMessage.getParameters();
String enc = oAuthMessage.getBodyEncoding();
- enc = enc == null ? "UTF-8" : enc;
+ enc = enc == null ? StandardCharsets.UTF_8.name() : enc;
if (params.isEmpty()
&& MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
index f8597c4..71b876a 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.security.cert.Certificate;
import java.util.ArrayList;
@@ -81,7 +82,8 @@ public class Saml2BearerGrantHandler extends AbstractGrantHandler {
// AccessTokenService may be configured with the form provider
// which will not decode by default - so listing both the actual
// and encoded grant type value will help
- ENCODED_SAML2_BEARER_GRANT = HttpUtils.urlEncode(Constants.SAML2_BEARER_GRANT, "UTF-8");
+ ENCODED_SAML2_BEARER_GRANT = HttpUtils.urlEncode(Constants.SAML2_BEARER_GRANT,
+ StandardCharsets.UTF_8.name());
}
private Validator samlValidator = new SamlAssertionValidator();
private SamlOAuthValidator samlOAuthValidator = new SamlOAuthValidator();
@@ -164,7 +166,7 @@ public class Saml2BearerGrantHandler extends AbstractGrantHandler {
protected Element readToken(InputStream tokenStream) {
try {
- Document doc = StaxUtils.read(new InputStreamReader(tokenStream, "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(tokenStream, StandardCharsets.UTF_8));
return doc.getDocumentElement();
} catch (Exception ex) {
throw new OAuthServiceException(OAuthConstants.INVALID_GRANT);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index ae9f942..3e312a3 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth2.client;
import java.io.IOException;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import javax.annotation.Priority;
@@ -213,9 +214,9 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter {
MultivaluedMap<String, String> requestState = new MetadataMap<String, String>();
requestState.putAll(ui.getQueryParameters(decodeRequestParameters));
if (MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
- String body = FormUtils.readBody(rc.getEntityStream(), "UTF-8");
+ String body = FormUtils.readBody(rc.getEntityStream(), StandardCharsets.UTF_8.name());
FormUtils.populateMapFromString(requestState, JAXRSUtils.getCurrentMessage(), body,
- "UTF-8", decodeRequestParameters);
+ StandardCharsets.UTF_8.name(), decodeRequestParameters);
}
return requestState;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
index 4ee712c..971b481 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.oauth2.client;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Map;
@@ -285,7 +286,7 @@ public final class OAuthClientUtils {
sb.append("Basic ");
try {
String data = consumer.getKey() + ":" + consumer.getSecret();
- sb.append(Base64Utility.encode(data.getBytes("UTF-8")));
+ sb.append(Base64Utility.encode(data.getBytes(StandardCharsets.UTF_8)));
} catch (Exception ex) {
throw new ProcessingException(ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtBearerGrantHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtBearerGrantHandler.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtBearerGrantHandler.java
index 5bef103..674e4f8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtBearerGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtBearerGrantHandler.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.rs.security.oauth2.grants.jwt;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import javax.ws.rs.core.MultivaluedMap;
@@ -42,7 +43,7 @@ public class JwtBearerGrantHandler extends AbstractJwtHandler {
// AccessTokenService may be configured with the form provider
// which will not decode by default - so listing both the actual
// and encoded grant type value will help
- ENCODED_JWT_BEARER_GRANT = HttpUtils.urlEncode(Constants.JWT_BEARER_GRANT, "UTF-8");
+ ENCODED_JWT_BEARER_GRANT = HttpUtils.urlEncode(Constants.JWT_BEARER_GRANT, StandardCharsets.UTF_8.name());
}
public JwtBearerGrantHandler() {
super(Arrays.asList(Constants.JWT_BEARER_GRANT, ENCODED_JWT_BEARER_GRANT));
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
index fba68a9..c850cef 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -81,7 +82,7 @@ public class OAuthJSONProvider implements MessageBodyWriter<Object>,
sb.append("}");
String result = sb.toString();
- os.write(result.getBytes("UTF-8"));
+ os.write(result.getBytes(StandardCharsets.UTF_8));
os.flush();
}
@@ -110,7 +111,7 @@ public class OAuthJSONProvider implements MessageBodyWriter<Object>,
}
sb.append("}");
String result = sb.toString();
- os.write(result.getBytes("UTF-8"));
+ os.write(result.getBytes(StandardCharsets.UTF_8));
os.flush();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
index 0cc0db4..7026c9c 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oidc.rp;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -54,9 +55,9 @@ public class OidcIdTokenRequestFilter implements ContainerRequestFilter {
private MultivaluedMap<String, String> toFormData(ContainerRequestContext rc) {
MultivaluedMap<String, String> requestState = new MetadataMap<String, String>();
if (MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
- String body = FormUtils.readBody(rc.getEntityStream(), "UTF-8");
+ String body = FormUtils.readBody(rc.getEntityStream(), StandardCharsets.UTF_8.name());
FormUtils.populateMapFromString(requestState, JAXRSUtils.getCurrentMessage(), body,
- "UTF-8", false);
+ StandardCharsets.UTF_8.name(), false);
}
return requestState;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
index 415e2cc..de4cad0 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oidc.rp;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import javax.annotation.Priority;
import javax.ws.rs.Priorities;
@@ -85,9 +86,9 @@ public class OidcRpAuthenticationFilter implements ContainerRequestFilter {
MultivaluedMap<String, String> requestState = new MetadataMap<String, String>();
requestState.putAll(rc.getUriInfo().getQueryParameters(true));
if (MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
- String body = FormUtils.readBody(rc.getEntityStream(), "UTF-8");
+ String body = FormUtils.readBody(rc.getEntityStream(), StandardCharsets.UTF_8.name());
FormUtils.populateMapFromString(requestState, JAXRSUtils.getCurrentMessage(), body,
- "UTF-8", true);
+ StandardCharsets.UTF_8.name(), true);
}
return requestState;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
index 4d9638b..2de61ae 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
@@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.ResourceBundle;
import java.util.UUID;
@@ -235,7 +235,7 @@ public abstract class AbstractRequestAssertionConsumerHandler extends AbstractSS
// URL Decoding only applies for the re-direct binding
if (!postBinding) {
try {
- samlResponseDecoded = URLDecoder.decode(samlResponse, "UTF-8");
+ samlResponseDecoded = URLDecoder.decode(samlResponse, StandardCharsets.UTF_8);
} catch (UnsupportedEncodingException e) {
throw ExceptionUtils.toBadRequestException(null, null);
}
@@ -254,16 +254,12 @@ public abstract class AbstractRequestAssertionConsumerHandler extends AbstractSS
throw ExceptionUtils.toBadRequestException(ex, null);
}
} else {
- try {
- tokenStream = new ByteArrayInputStream(samlResponseDecoded.getBytes("UTF-8"));
- } catch (UnsupportedEncodingException ex) {
- throw ExceptionUtils.toBadRequestException(ex, null);
- }
+ tokenStream = new ByteArrayInputStream(samlResponseDecoded.getBytes(StandardCharsets.UTF_8));
}
Document responseDoc = null;
try {
- responseDoc = StaxUtils.read(new InputStreamReader(tokenStream, "UTF-8"));
+ responseDoc = StaxUtils.read(new InputStreamReader(tokenStream, StandardCharsets.UTF_8));
} catch (Exception ex) {
throw new WebApplicationException(400);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index fe9ef86..3d88dc8 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.URI;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.util.Map;
import java.util.ResourceBundle;
@@ -260,7 +261,7 @@ public abstract class AbstractServiceProviderFilter extends AbstractSSOSpHandler
getWebAppDomain(),
System.currentTimeMillis());
- String relayState = URLEncoder.encode(UUID.randomUUID().toString(), "UTF-8");
+ String relayState = URLEncoder.encode(UUID.randomUUID().toString(), StandardCharsets.UTF_8.name());
getStateProvider().setRequestState(relayState, requestState);
info.setRelayState(relayState);
info.setWebAppContext(webAppContext);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index 8363199..d85b9e5 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -20,6 +20,7 @@
package org.apache.cxf.rs.security.saml.sso;
import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
@@ -71,7 +72,7 @@ public class MetadataWriter {
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
- writer.writeStartDocument("UTF-8", "1.0");
+ writer.writeStartDocument(StandardCharsets.UTF_8.name(), "1.0");
String referenceID = IDGenerator.generateID("_");
writer.writeStartElement("md", "EntityDescriptor", SSOConstants.SAML2_METADATA_NS);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
index abc949a..d085a6e 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.saml.sso;
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.logging.Level;
@@ -481,7 +482,7 @@ public class SAMLProtocolResponseValidator {
Document payloadDoc = null;
try {
payloadDoc = StaxUtils.read(new InputStreamReader(new ByteArrayInputStream(decryptedPayload),
- "UTF-8"));
+ StandardCharsets.UTF_8));
return payloadDoc.getDocumentElement();
} catch (Exception ex) {
LOG.log(Level.FINE, "Payload document can not be created", ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
index 3f2f09f..9f2fe74 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.saml.sso;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
@@ -95,9 +96,9 @@ public class SamlPostBindingFilter extends AbstractServiceProviderFilter {
// Not correct according to the spec but required by some IDPs.
if (useDeflateEncoding) {
DeflateEncoderDecoder encoder = new DeflateEncoderDecoder();
- deflatedBytes = encoder.deflateToken(requestMessage.getBytes("UTF-8"));
+ deflatedBytes = encoder.deflateToken(requestMessage.getBytes(StandardCharsets.UTF_8));
} else {
- deflatedBytes = requestMessage.getBytes("UTF-8");
+ deflatedBytes = requestMessage.getBytes(StandardCharsets.UTF_8);
}
return Base64Utility.encode(deflatedBytes);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
index 1b0ed7a..ebfc7b8 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.saml.sso;
import java.io.IOException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.Signature;
import java.security.cert.X509Certificate;
@@ -54,7 +55,7 @@ public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter {
try {
SamlRequestInfo info = createSamlRequestInfo(m);
String urlEncodedRequest =
- URLEncoder.encode(info.getSamlRequest(), "UTF-8");
+ URLEncoder.encode(info.getSamlRequest(), StandardCharsets.UTF_8.name());
UriBuilder ub = UriBuilder.fromUri(getIdpServiceAddress());
@@ -89,7 +90,7 @@ public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter {
String requestMessage = DOM2Writer.nodeToString(authnRequest);
DeflateEncoderDecoder encoder = new DeflateEncoderDecoder();
- byte[] deflatedBytes = encoder.deflateToken(requestMessage.getBytes("UTF-8"));
+ byte[] deflatedBytes = encoder.deflateToken(requestMessage.getBytes(StandardCharsets.UTF_8));
return Base64Utility.encode(deflatedBytes);
}
@@ -136,7 +137,7 @@ public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter {
jceSigAlgo = "SHA1withDSA";
}
LOG.fine("Using Signature algorithm " + sigAlgo);
- ub.queryParam(SSOConstants.SIG_ALG, URLEncoder.encode(sigAlgo, "UTF-8"));
+ ub.queryParam(SSOConstants.SIG_ALG, URLEncoder.encode(sigAlgo, StandardCharsets.UTF_8.name()));
// Get the password
WSPasswordCallback[] cb = {new WSPasswordCallback(signatureUser, WSPasswordCallback.SIGNATURE)};
@@ -153,14 +154,14 @@ public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter {
String requestToSign =
SSOConstants.SAML_REQUEST + "=" + authnRequest + "&"
+ SSOConstants.RELAY_STATE + "=" + relayState + "&"
- + SSOConstants.SIG_ALG + "=" + URLEncoder.encode(sigAlgo, "UTF-8");
+ + SSOConstants.SIG_ALG + "=" + URLEncoder.encode(sigAlgo, StandardCharsets.UTF_8.name());
- signature.update(requestToSign.getBytes("UTF-8"));
+ signature.update(requestToSign.getBytes(StandardCharsets.UTF_8));
byte[] signBytes = signature.sign();
String encodedSignature = Base64.encode(signBytes);
- ub.queryParam(SSOConstants.SIGNATURE, URLEncoder.encode(encodedSignature, "UTF-8"));
+ ub.queryParam(SSOConstants.SIGNATURE, URLEncoder.encode(encodedSignature, StandardCharsets.UTF_8.name()));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
index a124d7f..c9f0cbf 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
@@ -22,6 +22,7 @@ package org.apache.cxf.rs.security.saml;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.security.PublicKey;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
@@ -101,7 +102,7 @@ public abstract class AbstractSamlInHandler implements ContainerRequestFilter {
protected Element readToken(Message message, InputStream tokenStream) {
try {
- Document doc = StaxUtils.read(new InputStreamReader(tokenStream, "UTF-8"));
+ Document doc = StaxUtils.read(new InputStreamReader(tokenStream, StandardCharsets.UTF_8));
return doc.getDocumentElement();
} catch (Exception ex) {
throwFault("Assertion can not be read as XML document", ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlOutInterceptor.java
index 04a1032..6632086 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlOutInterceptor.java
@@ -19,7 +19,7 @@
package org.apache.cxf.rs.security.saml;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
@@ -51,12 +51,8 @@ public abstract class AbstractSamlOutInterceptor extends AbstractPhaseIntercepto
}
protected String encodeToken(String assertion) throws Base64Exception {
- byte[] tokenBytes = null;
- try {
- tokenBytes = assertion.getBytes("UTF-8");
- } catch (UnsupportedEncodingException ex) {
- // won't happen
- }
+ byte[] tokenBytes = assertion.getBytes(StandardCharsets.UTF_8);
+
if (useDeflateEncoding) {
tokenBytes = new DeflateEncoderDecoder().deflateToken(tokenBytes);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java
index 01ef19f..ee10d35 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.saml;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.container.ContainerRequestContext;
@@ -58,7 +59,7 @@ public class SamlEnvelopedInHandler extends AbstractSamlInHandler {
InputStream is = message.getContent(InputStream.class);
if (is != null) {
try {
- doc = StaxUtils.read(new InputStreamReader(is, "UTF-8"));
+ doc = StaxUtils.read(new InputStreamReader(is, StandardCharsets.UTF_8));
} catch (Exception ex) {
throwFault("Invalid XML payload", ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
index 680e46d..5cd7603 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
@@ -22,6 +22,7 @@ package org.apache.cxf.rs.security.xml;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
@@ -82,7 +83,7 @@ public abstract class AbstractXmlEncInHandler extends AbstractXmlSecInHandler {
Document payloadDoc = null;
try {
payloadDoc = StaxUtils.read(new InputStreamReader(new ByteArrayInputStream(decryptedPayload),
- "UTF-8"));
+ StandardCharsets.UTF_8));
} catch (Exception ex) {
throwFault("Payload document can not be created", ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
index f65368e..8d79b1c 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.xml;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.logging.Logger;
import javax.ws.rs.core.Response;
@@ -78,7 +79,7 @@ public abstract class AbstractXmlSecInHandler {
InputStream is = message.getContent(InputStream.class);
if (is != null) {
try {
- doc = StaxUtils.read(new InputStreamReader(is, "UTF-8"));
+ doc = StaxUtils.read(new InputStreamReader(is, StandardCharsets.UTF_8));
} catch (Exception ex) {
throwFault("Invalid XML payload", ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index bec7fce..7b7d982 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.xml;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -418,7 +419,7 @@ public class XmlSecOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
if (encoding == null) {
- encoding = "UTF-8";
+ encoding = StandardCharsets.UTF_8.name();
message.put(Message.ENCODING, encoding);
}
return encoding;
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
----------------------------------------------------------------------
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
index 0c80fb4..df3b19c 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
@@ -22,6 +22,7 @@ package org.apache.cxf.rt.security.crypto;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.KeyFactory;
import java.security.KeyPair;
@@ -409,7 +410,7 @@ public final class CryptoUtils {
byte[] encryptedBytes = decodeSequence(encodedData);
byte[] bytes = decryptBytes(encryptedBytes, secretKey, props);
try {
- return new String(bytes, "UTF-8");
+ return new String(bytes, StandardCharsets.UTF_8);
} catch (Exception ex) {
throw new SecurityException(ex);
}
@@ -422,7 +423,7 @@ public final class CryptoUtils {
public static String encryptSequence(String sequence, Key secretKey,
KeyProperties keyProps) throws SecurityException {
try {
- byte[] bytes = encryptBytes(sequence.getBytes("UTF-8"), secretKey, keyProps);
+ byte[] bytes = encryptBytes(sequence.getBytes(StandardCharsets.UTF_8), secretKey, keyProps);
return encodeBytes(bytes);
} catch (Exception ex) {
throw new SecurityException(ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
----------------------------------------------------------------------
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
index bf50224..c40fe85 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.rt.security.crypto;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -86,11 +86,7 @@ public final class HmacUtils {
}
public static byte[] computeHmac(String key, Mac hmac, String data) {
- try {
- return computeHmac(key.getBytes("UTF-8"), hmac, data);
- } catch (UnsupportedEncodingException e) {
- throw new SecurityException(e);
- }
+ return computeHmac(key.getBytes(StandardCharsets.UTF_8), hmac, data);
}
public static byte[] computeHmac(byte[] key, Mac hmac, String data) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/MessageDigestUtils.java
----------------------------------------------------------------------
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/MessageDigestUtils.java b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/MessageDigestUtils.java
index 1c18df2..28b8597 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/MessageDigestUtils.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/MessageDigestUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.rt.security.crypto;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -53,9 +53,7 @@ public final class MessageDigestUtils {
public static byte[] createDigest(String input, String algo) {
try {
- return createDigest(input.getBytes("UTF-8"), algo);
- } catch (UnsupportedEncodingException e) {
- throw new SecurityException(e);
+ return createDigest(input.getBytes(StandardCharsets.UTF_8), algo);
} catch (NoSuchAlgorithmException e) {
throw new SecurityException(e);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 4692c3a..e10fb2a 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.transport.http_jetty;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -659,7 +660,7 @@ public class JettyHTTPDestinationTest extends Assert {
EasyMock.expect(request.getRequestURI()).andReturn("/foo");
EasyMock.expect(request.getRequestURL())
.andReturn(new StringBuffer("http://localhost/foo")).anyTimes();
- EasyMock.expect(request.getCharacterEncoding()).andReturn("UTF-8");
+ EasyMock.expect(request.getCharacterEncoding()).andReturn(StandardCharsets.UTF_8.name());
EasyMock.expect(request.getQueryString()).andReturn(query);
EasyMock.expect(request.getHeader("Accept")).andReturn("*/*");
EasyMock.expect(request.getContentType()).andReturn("text/xml charset=utf8").times(2);
@@ -754,7 +755,7 @@ public class JettyHTTPDestinationTest extends Assert {
request.getPathInfo();
EasyMock.expectLastCall().andReturn("/bar/foo");
request.getCharacterEncoding();
- EasyMock.expectLastCall().andReturn("UTF-8");
+ EasyMock.expectLastCall().andReturn(StandardCharsets.UTF_8.name());
request.getQueryString();
EasyMock.expectLastCall().andReturn("wsdl");
response.setContentType("text/xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
index a8db207..d3800a3 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
import java.net.FileNameMap;
import java.net.URLConnection;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -144,10 +145,10 @@ public final class Utils {
public static String sanitizeUri(String uri) {
// Decode the path.
try {
- uri = URLDecoder.decode(uri, "UTF-8");
+ uri = URLDecoder.decode(uri, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
try {
- uri = URLDecoder.decode(uri, "ISO-8859-1");
+ uri = URLDecoder.decode(uri, StandardCharsets.ISO_8859_1.name());
} catch (UnsupportedEncodingException e1) {
throw new Error();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index 2882b5d..f08bd2a 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.transport.http.netty.server;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -656,7 +657,7 @@ public class NettyHttpDestinationTest extends Assert {
EasyMock.expect(request.getRequestURI()).andReturn("/foo");
EasyMock.expect(request.getRequestURL())
.andReturn(new StringBuffer("http://localhost/foo")).anyTimes();
- EasyMock.expect(request.getCharacterEncoding()).andReturn("UTF-8");
+ EasyMock.expect(request.getCharacterEncoding()).andReturn(StandardCharsets.UTF_8.name());
EasyMock.expect(request.getQueryString()).andReturn(query).times(2);
EasyMock.expect(request.getHeader("Accept")).andReturn("*/*");
EasyMock.expect(request.getContentType()).andReturn("text/xml charset=utf8").times(2);
@@ -751,7 +752,7 @@ public class NettyHttpDestinationTest extends Assert {
request.getPathInfo();
EasyMock.expectLastCall().andReturn("/bar/foo");
request.getCharacterEncoding();
- EasyMock.expectLastCall().andReturn("UTF-8");
+ EasyMock.expectLastCall().andReturn(StandardCharsets.UTF_8.name());
request.getQueryString();
EasyMock.expectLastCall().andReturn("wsdl");
response.setContentType("text/xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/173ec897/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java
index fe48811..1c02bcc 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -53,7 +54,7 @@ public final class PublicSuffixMatcherLoader {
private static PublicSuffixMatcher load(final InputStream in) throws IOException {
final PublicSuffixList list = new PublicSuffixListParser().parse(
- new InputStreamReader(in, "UTF-8"));
+ new InputStreamReader(in, StandardCharsets.UTF_8));
return new PublicSuffixMatcher(list.getRules(), list.getExceptions());
}