QPID-6304: [Java Broker] Allow truststore and keystore (JKS) files to be stored as a data:// URL inside the config

* Added truststore/keystore unit tests too to cover both new and (most of) the existing functionality,
  retiring the equivilent slower REST system tests.
* Added single REST test exercising the creation of a keystore/teststore from data:// URL.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1651615 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 3 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 883da04b3d..71ec6e786f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -36,7 +36,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
-import javax.xml.bind.DatatypeConverter;
 
 import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -46,6 +45,7 @@ import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
+import org.apache.qpid.util.DataUrlUtils;
 
 public class RestServlet extends AbstractServlet
 {
@@ -439,8 +439,7 @@ public class RestServlet extends AbstractServlet
                 {
                     byte[] data = new byte[(int) part.getSize()];
                     part.getInputStream().read(data);
-                    StringBuilder inlineURL = new StringBuilder("data:;base64,");
-                    inlineURL.append(DatatypeConverter.printBase64Binary(data));
+                    String inlineURL = DataUrlUtils.getDataUrlForBytes(data);
                     fileUploads.put(part.getName(),inlineURL.toString());
                 }
             }