Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development

Former-commit-id: 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]
Former-commit-id: e88f5777a7
This commit is contained in:
Richard Peter 2013-11-13 16:43:26 -06:00 committed by Gerrit Code Review
commit 64afe42e74

View file

@ -22,6 +22,8 @@ package com.raytheon.uf.edex.registry.ebxml.services.query.plugins;
import javax.jws.WebMethod; import javax.jws.WebMethod;
import javax.jws.WebParam; import javax.jws.WebParam;
import javax.jws.WebResult; import javax.jws.WebResult;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.MsgRegistryException; import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.MsgRegistryException;
@ -71,6 +73,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil;
* 3/18/2013 1802 bphillip Modified to use transaction boundaries and spring dao injection * 3/18/2013 1802 bphillip Modified to use transaction boundaries and spring dao injection
* 4/9/2013 1802 bphillip Changed abstract method signature, modified return processing, and changed static variables * 4/9/2013 1802 bphillip Changed abstract method signature, modified return processing, and changed static variables
* 10/8/2013 1682 bphillip Refactored querying * 10/8/2013 1682 bphillip Refactored querying
* 11/13/2013 1686 bphillip Fixed the arguments of this query
* *
* </pre> * </pre>
* *
@ -99,10 +102,24 @@ public class GetAuditTrailByTimeInterval extends RegistryQueryPlugin {
@WebParam(name = "QueryRequest", targetNamespace = EbxmlNamespaces.QUERY_URI, partName = "partQueryRequest") QueryRequest queryRequest) @WebParam(name = "QueryRequest", targetNamespace = EbxmlNamespaces.QUERY_URI, partName = "partQueryRequest") QueryRequest queryRequest)
throws MsgRegistryException { throws MsgRegistryException {
QueryType queryType = queryRequest.getQuery(); QueryType queryType = queryRequest.getQuery();
XMLGregorianCalendar startTime = queryType
.getSlotValue(QueryConstants.START_TIME); XMLGregorianCalendar startTime = null;
XMLGregorianCalendar endTime = queryType XMLGregorianCalendar endTime = null;
.getSlotValue(QueryConstants.END_TIME); try {
startTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(
(String) queryType.getSlotValue(QueryConstants.START_TIME));
} catch (DatatypeConfigurationException e) {
throw EbxmlExceptionUtil.createMsgRegistryException(
"Error parsing start time", e);
}
try {
endTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(
(String) queryType.getSlotValue(QueryConstants.END_TIME));
} catch (DatatypeConfigurationException e) {
throw EbxmlExceptionUtil.createMsgRegistryException(
"Error parsing end time", e);
}
// Start time defaults to current Time // Start time defaults to current Time
long currentTime = TimeUtil.currentTimeMillis(); long currentTime = TimeUtil.currentTimeMillis();