Author: lquack
Date: Tue Jul 26 10:41:56 2016
New Revision: 1754105
URL: http://svn.apache.org/viewvc?rev=1754105&view=rev
Log:
QPID-7276: [Java Broker] Fix ReportRunner. Attributes representing time now
return Date objects
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessage.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessageHeader.java
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java?rev=1754105&r1=1754104&r2=1754105&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java
Tue Jul 26 10:41:56 2016
@@ -63,7 +63,6 @@ public class ReportRunner<T>
Float.class,
Double.class,
UUID.class,
- Date.class,
String.class
));
@@ -259,9 +258,9 @@ public class ReportRunner<T>
}
@Override
- public long getExpiration()
+ public Date getExpiration()
{
- return messageInfo.getExpirationTime() == null ? 0l :
messageInfo.getExpirationTime();
+ return messageInfo.getExpirationTime();
}
@Override
@@ -271,7 +270,7 @@ public class ReportRunner<T>
}
@Override
- public long getArrivalTime()
+ public Date getArrivalTime()
{
return messageInfo.getArrivalTime();
}
@@ -289,9 +288,9 @@ public class ReportRunner<T>
}
@Override
- public long getExpiration()
+ public Date getExpiration()
{
- return messageInfo.getExpirationTime() == null ? 0l :
messageInfo.getExpirationTime();
+ return messageInfo.getExpirationTime();
}
@Override
@@ -331,7 +330,7 @@ public class ReportRunner<T>
}
@Override
- public long getTimestamp()
+ public Date getTimestamp()
{
return messageInfo.getTimestamp();
}
@@ -404,6 +403,10 @@ public class ReportRunner<T>
}
return copy;
}
+ else if(value instanceof Date)
+ {
+ return new Date(((Date) value).getTime());
+ }
else return null;
}
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessage.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessage.java?rev=1754105&r1=1754104&r2=1754105&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessage.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessage.java
Tue Jul 26 10:41:56 2016
@@ -21,6 +21,7 @@
package org.apache.qpid.server.management.plugin.report;
import java.nio.ByteBuffer;
+import java.util.Date;
public interface ReportableMessage
{
@@ -28,15 +29,15 @@ public interface ReportableMessage
ReportableMessageHeader getMessageHeader();
- public ByteBuffer getContent();
+ ByteBuffer getContent();
boolean isPersistent();
long getSize();
- long getExpiration();
+ Date getExpiration();
long getMessageNumber();
- long getArrivalTime();
+ Date getArrivalTime();
}
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessageHeader.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessageHeader.java?rev=1754105&r1=1754104&r2=1754105&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessageHeader.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportableMessageHeader.java
Tue Jul 26 10:41:56 2016
@@ -21,13 +21,14 @@
package org.apache.qpid.server.management.plugin.report;
import java.util.Collection;
+import java.util.Date;
import java.util.Set;
public interface ReportableMessageHeader
{
String getCorrelationId();
- long getExpiration();
+ Date getExpiration();
String getUserId();
@@ -41,7 +42,7 @@ public interface ReportableMessageHeader
byte getPriority();
- long getTimestamp();
+ Date getTimestamp();
String getType();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
