You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/13 14:12:43 UTC
svn commit: r1617707 - in /qpid/trunk/qpid/java:
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/
broker-plugins/manage...
Author: rgodfrey
Date: Wed Aug 13 12:12:43 2014
New Revision: 1617707
URL: http://svn.apache.org/r1617707
Log:
QPID-5992 : [Java Broker] Allow HTTP management responses to be compressed
Added:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Wed Aug 13 12:12:43 2014
@@ -111,6 +111,9 @@ public class HttpManagement extends Abst
@ManagedAttributeField
private int _sessionTimeout;
+ @ManagedAttributeField
+ private boolean _compressResponses;
+
private boolean _allowPortActivation;
@ManagedObjectFactoryConstructor
@@ -477,6 +480,12 @@ public class HttpManagement extends Abst
}
@Override
+ public boolean isCompressResponses()
+ {
+ return _compressResponses;
+ }
+
+ @Override
public AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress)
{
return getBroker().getAuthenticationProvider(localAddress);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java Wed Aug 13 12:12:43 2014
@@ -29,6 +29,7 @@ import org.apache.qpid.server.model.Plug
public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X>
{
+
@ManagedAttribute( defaultValue = "true" )
boolean isHttpsSaslAuthenticationEnabled();
@@ -44,6 +45,13 @@ public interface HttpManagementConfigura
@ManagedAttribute( defaultValue = "600" )
public int getSessionTimeout();
+ String HTTP_MANAGEMENT_COMPRESS_RESPONSES = "httpManagement.compressResponses";
+ @ManagedContextDefault(name = HTTP_MANAGEMENT_COMPRESS_RESPONSES)
+ boolean DEFAULT_COMPRESS_RESPONSES = false;
+
+ @ManagedAttribute( defaultValue = "${"+HTTP_MANAGEMENT_COMPRESS_RESPONSES+"}" )
+ public boolean isCompressResponses();
+
String MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME = "maxHttpFileUploadSize";
@ManagedContextDefault( name = MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME)
static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java Wed Aug 13 12:12:43 2014
@@ -20,17 +20,24 @@
*/
package org.apache.qpid.server.management.plugin;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.cert.X509Certificate;
import java.util.Collections;
+import java.util.zip.GZIPOutputStream;
import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.codec.binary.Base64;
@@ -71,6 +78,10 @@ public class HttpManagementUtil
private static final String ATTR_SUBJECT = "Qpid.subject";
private static final String ATTR_LOG_ACTOR = "Qpid.logActor";
+ private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
+ private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+ private static final String GZIP_CONTENT_ENCODING = "gzip";
+
public static Broker<?> getBroker(ServletContext servletContext)
{
return (Broker<?>) servletContext.getAttribute(ATTR_BROKER);
@@ -219,5 +230,42 @@ public class HttpManagementUtil
return null;
}
+ public static Writer getOutputWriter(final HttpServletRequest request, final HttpServletResponse response)
+ throws IOException
+ {
+ return getOutputWriter(request, response, getManagementConfiguration(request.getServletContext()));
+ }
+
+ public static Writer getOutputWriter(final HttpServletRequest request, final HttpServletResponse response, HttpManagementConfiguration managementConfiguration)
+ throws IOException
+ {
+ Writer writer;
+ writer = new BufferedWriter(new OutputStreamWriter(getOutputStream(request,response, managementConfiguration)));
+ return writer;
+ }
+
+ public static OutputStream getOutputStream(final HttpServletRequest request, final HttpServletResponse response)
+ throws IOException
+ {
+ return getOutputStream(request, response, getManagementConfiguration(request.getServletContext()));
+ }
+
+ public static OutputStream getOutputStream(final HttpServletRequest request, final HttpServletResponse response, HttpManagementConfiguration managementConfiguration)
+ throws IOException
+ {
+ OutputStream outputStream;
+ if(managementConfiguration.isCompressResponses()
+ && Collections.list(request.getHeaderNames()).contains(ACCEPT_ENCODING_HEADER)
+ && request.getHeader(ACCEPT_ENCODING_HEADER).contains(GZIP_CONTENT_ENCODING))
+ {
+ outputStream = new GZIPOutputStream(response.getOutputStream());
+ response.setHeader(CONTENT_ENCODING_HEADER, GZIP_CONTENT_ENCODING);
+ }
+ else
+ {
+ outputStream = response.getOutputStream();
+ }
+ return outputStream;
+ }
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java Wed Aug 13 12:12:43 2014
@@ -18,14 +18,16 @@ package org.apache.qpid.server.managemen
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.qpid.server.management.plugin.HttpManagementUtil;
+
public class DefinedFileServlet extends HttpServlet
{
@@ -57,7 +59,7 @@ public class DefinedFileServlet extends
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
- final ServletOutputStream output = response.getOutputStream();
+ final OutputStream output = HttpManagementUtil.getOutputStream(request, response);
InputStream fileInput = getClass().getResourceAsStream("/resources/"+_filename);
if(fileInput != null)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java Wed Aug 13 12:12:43 2014
@@ -22,17 +22,19 @@ package org.apache.qpid.server.managemen
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.qpid.server.management.plugin.HttpManagementUtil;
+
public class FileServlet extends HttpServlet
{
private static final String RESOURCES_PREFIX = "/resources";
@@ -97,7 +99,7 @@ public class FileServlet extends HttpSer
{
byte[] buffer = new byte[1024];
int read = 0;
- ServletOutputStream output = response.getOutputStream();
+ OutputStream output = HttpManagementUtil.getOutputStream(request, response);
try
{
while((read = fileInput.read(buffer)) != -1)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java Wed Aug 13 12:12:43 2014
@@ -21,7 +21,8 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.OutputStream;
+import java.io.Writer;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -32,16 +33,18 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.log4j.Logger;
-import org.apache.qpid.server.management.plugin.HttpManagementConfiguration;
-import org.apache.qpid.server.management.plugin.HttpManagementUtil;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
+import org.apache.qpid.server.management.plugin.HttpManagementConfiguration;
+import org.apache.qpid.server.management.plugin.HttpManagementUtil;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
+
public abstract class AbstractServlet extends HttpServlet
{
private static final Logger LOGGER = Logger.getLogger(AbstractServlet.class);
@@ -137,6 +140,18 @@ public abstract class AbstractServlet ex
);
}
+ public Writer getOutputWriter(final HttpServletRequest request, final HttpServletResponse response)
+ throws IOException
+ {
+ return HttpManagementUtil.getOutputWriter(request, response, _managementConfiguration);
+ }
+
+ public OutputStream getOutputStream(final HttpServletRequest request, final HttpServletResponse response)
+ throws IOException
+ {
+ return HttpManagementUtil.getOutputStream(request, response, _managementConfiguration);
+ }
+
/**
* Performs the PUT action as the logged-in {@link Subject}.
* Subclasses commonly override this method
@@ -247,7 +262,7 @@ public abstract class AbstractServlet ex
}
}
- protected void sendJsonResponse(Object object, HttpServletResponse response) throws IOException,
+ protected void sendJsonResponse(Object object, HttpServletRequest request, HttpServletResponse response) throws IOException,
JsonGenerationException, JsonMappingException
{
response.setStatus(HttpServletResponse.SC_OK);
@@ -257,7 +272,7 @@ public abstract class AbstractServlet ex
response.setDateHeader ("Expires", 0);
response.setContentType("application/json");
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, object);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java Wed Aug 13 12:12:43 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.management.plugin.servlet.rest;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
import java.util.Enumeration;
@@ -31,14 +30,15 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
import org.apache.qpid.server.management.plugin.servlet.rest.action.ListAccessControlProviderAttributes;
import org.apache.qpid.server.management.plugin.servlet.rest.action.ListAuthenticationProviderAttributes;
import org.apache.qpid.server.management.plugin.servlet.rest.action.ListBrokerAttribute;
import org.apache.qpid.server.management.plugin.servlet.rest.action.ListGroupProviderAttributes;
import org.apache.qpid.server.management.plugin.servlet.rest.action.ListTimeZones;
import org.apache.qpid.server.model.Broker;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
public class HelperServlet extends AbstractServlet
{
@@ -122,7 +122,7 @@ public class HelperServlet extends Abstr
return;
}
response.setContentType("application/json");
- final Writer writer = new BufferedWriter(response.getWriter());
+ final Writer writer = getOutputWriter(request, response);
_mapper.writeValue(writer, output);
response.setStatus(HttpServletResponse.SC_OK);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java Wed Aug 13 12:12:43 2014
@@ -18,7 +18,7 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
import java.util.Collections;
import java.util.List;
@@ -27,11 +27,12 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.LogManager;
-import org.apache.qpid.server.management.plugin.log.LogFileDetails;
-import org.apache.qpid.server.management.plugin.log.LogFileHelper;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
+import org.apache.qpid.server.management.plugin.log.LogFileDetails;
+import org.apache.qpid.server.management.plugin.log.LogFileHelper;
+
public class LogFileListingServlet extends AbstractServlet
{
private static final long serialVersionUID = 1L;
@@ -56,7 +57,7 @@ public class LogFileListingServlet exten
response.setContentType("application/json");
response.setStatus(HttpServletResponse.SC_OK);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, logFiles);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java Wed Aug 13 12:12:43 2014
@@ -17,18 +17,21 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.logging.LogRecorder;
+
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
+import org.apache.qpid.server.logging.LogRecorder;
+
public class LogRecordsServlet extends AbstractServlet
{
private static final long serialVersionUID = 2L;
@@ -77,7 +80,7 @@ public class LogRecordsServlet extends A
}
}
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request,response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, logRecords);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java Wed Aug 13 12:12:43 2014
@@ -33,11 +33,12 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.codehaus.jackson.map.ObjectMapper;
+
import org.apache.qpid.server.management.plugin.HttpManagementUtil;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.PreferencesProvider;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
-import org.codehaus.jackson.map.ObjectMapper;
public class LoggedOnUserPreferencesServlet extends AbstractServlet
{
@@ -59,7 +60,7 @@ public class LoggedOnUserPreferencesServ
{
preferences = Collections.<String, Object>emptyMap();
}
- sendJsonResponse(preferences, response);
+ sendJsonResponse(preferences, request, response);
}
/*
@@ -88,7 +89,7 @@ public class LoggedOnUserPreferencesServ
{
preferences = Collections.<String, Object>emptyMap();
}
- sendJsonResponse(preferences, response);
+ sendJsonResponse(preferences, request, response);
}
/*
@@ -115,7 +116,7 @@ public class LoggedOnUserPreferencesServ
{
preferences = Collections.<String, Object>emptyMap();
}
- sendJsonResponse(preferences, response);
+ sendJsonResponse(preferences, request, response);
}
private String getAuthenticatedUserName(HttpServletRequest request)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java Wed Aug 13 12:12:43 2014
@@ -60,7 +60,7 @@ public class MessageContentServlet exten
{
response.setContentType(finder.getMimeType());
response.setContentLength((int) finder.getSize());
- response.getOutputStream().write(finder.getContent());
+ getOutputStream(request, response).write(finder.getContent());
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java Wed Aug 13 12:12:43 2014
@@ -18,7 +18,7 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -85,7 +85,7 @@ public class MessageServlet extends Abst
response.setDateHeader ("Expires", 0);
response.setContentType("application/json");
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request,response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, messageFinder.getMessageObject());
@@ -119,7 +119,7 @@ public class MessageServlet extends Abst
response.setHeader("Pragma","no-cache");
response.setDateHeader ("Expires", 0);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request,response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, messages);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java Wed Aug 13 12:12:43 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.management.plugin.servlet.rest;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
import java.util.Collection;
@@ -69,7 +68,7 @@ public class MetaDataServlet extends Abs
classToDataMap.put(clazz.getSimpleName(), processCategory(clazz));
}
- final Writer writer = new BufferedWriter(response.getWriter());
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, classToDataMap);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Wed Aug 13 12:12:43 2014
@@ -16,7 +16,6 @@
*/
package org.apache.qpid.server.management.plugin.servlet.rest;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
import java.security.AccessControlException;
@@ -327,7 +326,7 @@ public class RestServlet extends Abstrac
depth, actuals, includeSystemContext));
}
- final Writer writer = new BufferedWriter(response.getWriter());
+ Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, output);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java Wed Aug 13 12:12:43 2014
@@ -21,7 +21,7 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
import java.net.SocketAddress;
import java.security.Principal;
import java.security.SecureRandom;
@@ -100,7 +100,7 @@ public class SaslServlet extends Abstrac
outputObject.put("mechanisms", (Object) mechanisms);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
@@ -268,7 +268,7 @@ public class SaslServlet extends Abstrac
Map<String, Object> outputObject = new LinkedHashMap<String, Object>();
outputObject.put("challenge", new String(Base64.encodeBase64(challenge)));
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
@@ -290,7 +290,7 @@ public class SaslServlet extends Abstrac
outputObject.put("id", id);
outputObject.put("challenge", new String(Base64.encodeBase64(challenge)));
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java Wed Aug 13 12:12:43 2014
@@ -17,7 +17,7 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -55,7 +55,7 @@ public class StructureServlet extends Ab
Map<String,Object> structure = generateStructure(getBroker(), Broker.class);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, structure);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java Wed Aug 13 12:12:43 2014
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.PreferencesProvider;
@@ -53,15 +54,15 @@ public class UserPreferencesServlet exte
String[] pathElements = getPathInfoElements(request);
if (pathElements != null && pathElements.length > 1)
{
- getUserPreferences(pathElements[0], pathElements[1], response);
+ getUserPreferences(pathElements[0], pathElements[1], request, response);
}
else
{
- getUserList(pathElements, response);
+ getUserList(pathElements, request, response);
}
}
- private void getUserPreferences(String authenticationProviderName, String userId, HttpServletResponse response)
+ private void getUserPreferences(String authenticationProviderName, String userId, HttpServletRequest request, HttpServletResponse response)
throws IOException
{
try
@@ -83,10 +84,10 @@ public class UserPreferencesServlet exte
}
preferences = preferencesProvider.getPreferences(userId);
- sendJsonResponse(preferences, response);
+ sendJsonResponse(preferences, request, response);
}
- private void getUserList(String[] pathElements, HttpServletResponse response) throws IOException
+ private void getUserList(String[] pathElements, HttpServletRequest request, HttpServletResponse response) throws IOException
{
List<Map<String, Object>> users = null;
try
@@ -98,7 +99,7 @@ public class UserPreferencesServlet exte
LOGGER.debug("Bad preferences request", e);
response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
}
- sendJsonResponse(users, response);
+ sendJsonResponse(users, request, response);
}
private PreferencesProvider getPreferencesProvider(String authenticationProviderName)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Wed Aug 13 12:12:43 2014
@@ -123,7 +123,16 @@ define(["dojo/_base/xhr",
name: "sessionTimeout"
});
}
+ }, {
+ name: "compressResponses",
+ createWidget: function(plugin) {
+ return new dijit.form.CheckBox({
+ required: false,
+ checked: plugin.compressResponses,
+ label: "Compress responses:",
+ name: "compressResponses"});
}
+ }
];
var data = this.managementHttpUpdater.pluginData;
util.showSetAttributesDialog(
@@ -143,6 +152,8 @@ define(["dojo/_base/xhr",
this.sessionTimeout = query(".sessionTimeout", node)[0];
this.httpsSaslAuthenticationEnabled = query(".httpsSaslAuthenticationEnabled", node)[0];
this.httpSaslAuthenticationEnabled = query(".httpSaslAuthenticationEnabled", node)[0];
+ this.compressResponses = query(".compressResponses", node)[0];
+
}
ManagementHttpUpdater.prototype.update = function(syncRequest)
@@ -161,6 +172,7 @@ define(["dojo/_base/xhr",
that.httpsBasicAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsBasicAuthenticationEnabled);
that.httpsSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsSaslAuthenticationEnabled);
that.httpSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpSaslAuthenticationEnabled);
+ that.compressResponses.innerHTML = showBoolean(that.pluginData.compressResponses);
that.sessionTimeout.innerHTML = that.pluginData.sessionTimeout;
});
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html?rev=1617707&r1=1617706&r2=1617707&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html Wed Aug 13 12:12:43 2014
@@ -40,6 +40,10 @@
<div class="formLabel-labelCell">Session timeout (s):</div>
<div class="sessionTimeout"></div>
</div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Compress content:</div>
+ <div class="compressResponses"></div>
+ </div>
</div>
<br/>
<div class="dijitDialogPaneActionBar">
Added: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java?rev=1617707&view=auto
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java (added)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java Wed Aug 13 12:12:43 2014
@@ -0,0 +1,141 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.systest.rest;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.util.LinkedHashMap;
+import java.util.zip.GZIPInputStream;
+
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import org.apache.qpid.server.model.Plugin;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
+
+public class CompressedResponsesRestTest extends QpidRestTestCase
+{
+
+ private boolean _compress;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ }
+
+ @Override
+ protected void customizeConfiguration() throws IOException
+ {
+ super.customizeConfiguration();
+ getBrokerConfiguration().setObjectAttribute(Plugin.class,
+ TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT,
+ "compressResponses",
+ _compress);
+ }
+
+ public void testCompressionOffAcceptOff() throws Exception
+ {
+ doCompressionTest(false, false);
+ }
+
+ public void testCompressionOffAcceptOn() throws Exception
+ {
+ doCompressionTest(false, true);
+ }
+
+ public void testCompressionOnAcceptOff() throws Exception
+ {
+ doCompressionTest(true, false);
+ }
+
+ public void testCompressionOnAcceptOn() throws Exception
+ {
+ doCompressionTest(true, true);
+
+ }
+
+ private void doCompressionTest(final boolean allowCompression,
+ final boolean acceptCompressed) throws Exception
+ {
+ final boolean expectCompression = allowCompression && acceptCompressed;
+ _compress = allowCompression;
+ super.setUp();
+
+ HttpURLConnection conn = getRestTestHelper().openManagementConnection("/service/metadata", "GET");
+ if(acceptCompressed)
+ {
+ conn.setRequestProperty("Accept-Encoding", "gzip");
+ }
+
+ conn.connect();
+
+ String contentEncoding = conn.getHeaderField("Content-Encoding");
+
+ if(expectCompression)
+ {
+ assertEquals("gzip", contentEncoding);
+ }
+ else
+ {
+ if(contentEncoding != null)
+ {
+ assertEquals("identity", contentEncoding);
+ }
+ }
+
+ ByteArrayOutputStream contentBuffer = new ByteArrayOutputStream();
+
+ InputStream connectionInputStream = conn.getInputStream();
+ byte[] buf = new byte[1024];
+ int read;
+ while((read = connectionInputStream.read(buf))!= -1)
+ {
+ contentBuffer.write(buf,0,read);
+ }
+
+ InputStream jsonStream;
+
+ if(expectCompression)
+ {
+ jsonStream = new GZIPInputStream(new ByteArrayInputStream(contentBuffer.toByteArray()));
+ }
+ else
+ {
+ jsonStream = new ByteArrayInputStream(contentBuffer.toByteArray());
+ }
+
+ ObjectMapper mapper = new ObjectMapper();
+ try
+ {
+ mapper.readValue(jsonStream, LinkedHashMap.class);
+ }
+ catch (JsonParseException | JsonMappingException e)
+ {
+ fail("Message was not in correct format");
+ }
+ }
+
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org