Author: kwall
Date: Tue Aug 30 14:18:35 2016
New Revision: 1758395
URL: http://svn.apache.org/viewvc?rev=1758395&view=rev
Log:
QPID-7408: [Java Broker] Stream compressed message content with a
Content-Encoding HTTP header
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1758395&r1=1758394&r2=1758395&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Tue Aug 30 14:18:35 2016
@@ -2725,6 +2725,12 @@ public abstract class AbstractQueue<X ex
return
_messageReference.getMessage().getMessageHeader().getMimeType();
}
+ @RestContentHeader("Content-Encoding")
+ public String getContentEncoding()
+ {
+ return
_messageReference.getMessage().getMessageHeader().getEncoding();
+ }
+
}
private static class AcquireAllQueueEntryFilter implements QueueEntryFilter
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java?rev=1758395&r1=1758394&r2=1758395&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
Tue Aug 30 14:18:35 2016
@@ -348,7 +348,11 @@ public abstract class AbstractServlet ex
final String headerName = entry.getKey().value();
try
{
- response.setHeader(headerName,
String.valueOf(entry.getValue().invoke(customRestHeaders)));
+ final Object headerValue =
entry.getValue().invoke(customRestHeaders);
+ if (headerValue != null)
+ {
+ response.setHeader(headerName,
String.valueOf(headerValue));
+ }
}
catch (Exception e)
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html?rev=1758395&r1=1758394&r2=1758395&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
Tue Aug 30 14:18:35 2016
@@ -64,6 +64,10 @@
<td><span class="message-mimeType"></span></td>
</tr>
<tr style="margin-bottom: 4pt">
+ <td style="width: 10em; vertical-align: top"><span
style="font-weight: bold;">Encoding:</span></td>
+ <td><span class="message-encoding"></span></td>
+ </tr>
+ <tr style="margin-bottom: 4pt">
<td style="width: 10em; vertical-align: top"><span
style="font-weight: bold;">User:</span></td>
<td><span class="message-userId"></span></td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
