Updated the ArchivalRequest, RetrievalRequest and UserRequest classes

middletier/cta/ArchivalRequest.cpp

@@ -17,7 +17,9 @@ cta::ArchivalRequest::~ArchivalRequest() throw() {
 // constructor
 //------------------------------------------------------------------------------
 cta::ArchivalRequest::ArchivalRequest(const std::string &storageClassName,
-  const uint64_t priority):
+  const uint64_t priority, const std::string &id, const SecurityIdentity &user, 
+  const time_t creationTime):
+  UserRequest(id, user, creationTime),
   m_storageClassName(storageClassName),
   m_priority(priority) {
 }

middletier/cta/ArchivalRequest.hpp

@@ -28,8 +28,14 @@ public:
    *
    * @param storageClassName The name of the storage class.
    * @param priority The priority of the request.
+   * @param id The identifier of the request.
+   * @param user The identity of the user who made the request.
+   * @param creationTime Optionally the absolute time at which the user request
+   * was created.  If no value is given then the current time is used.
    */
-  ArchivalRequest(const std::string &storageClassName, const uint64_t priority);
+  ArchivalRequest(const std::string &storageClassName, const uint64_t priority,
+    const std::string &id, const SecurityIdentity &user,
+    const time_t creationTime = time(NULL));
 
   /**
    * Returns the name of the storage class.

middletier/cta/RetrievalRequest.cpp

@@ -16,7 +16,10 @@ cta::RetrievalRequest::~RetrievalRequest() throw() {
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::RetrievalRequest::RetrievalRequest(const uint64_t priority):
+cta::RetrievalRequest::RetrievalRequest(const uint64_t priority,
+  const std::string &id, const SecurityIdentity &user,
+  const time_t creationTime):
+  UserRequest(id, user, creationTime),
   m_priority(priority) {
 }
 

middletier/cta/RetrievalRequest.hpp

@@ -26,8 +26,13 @@ public:
    * Constructor.
    *
    * @param priority The priority of the request.
+   * @param id The identifier of the request.
+   * @param user The identity of the user who made the request.
+   * @param creationTime Optionally the absolute time at which the user request
+   * was created.  If no value is given then the current time is used.
    */
-  RetrievalRequest(const uint64_t priority);
+  RetrievalRequest(const uint64_t priority, const std::string &id,
+    const SecurityIdentity &user, const time_t creationTime = time(NULL));
 
   /**
    * Returns the priority of the request.

middletier/cta/UserRequest.cpp

@@ -12,10 +12,10 @@ cta::UserRequest::UserRequest():
 // constructor
 //------------------------------------------------------------------------------
 cta::UserRequest::UserRequest(const std::string &id,
-  const SecurityIdentity &user):
+  const SecurityIdentity &user, const time_t creationTime):
   m_id(id),
   m_user(user),
-  m_creationTime(time(NULL)) {
+  m_creationTime(creationTime) {
 }
 
 //------------------------------------------------------------------------------

middletier/cta/UserRequest.hpp

@@ -21,15 +21,18 @@ public:
   /**
    * Destructor.
    */
-  virtual ~UserRequest() throw();
+  virtual ~UserRequest() throw() = 0;
 
   /**
    * Constructor.
    *
    * @param id The identifier of the request.
    * @param user The identity of the user who made the request.
+   * @param creationTime Optionally the absolute time at which the user request
+   * was created.  If no value is given then the current time is used.
    */
-  UserRequest(const std::string &id, const SecurityIdentity &user);
+  UserRequest(const std::string &id, const SecurityIdentity &user,
+    const time_t creationTime = time(NULL));
 
   /**
    * Returns the identifier of the request.