Changeset 1991 for trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/ExchangeListener.java

Timestamp:

07/08/15 09:03:46 (9 years ago)

Author:

pharms

Message:

• added ordering id for requests and responses

File:

• trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/ExchangeListener.java (modified) (10 diffs)

trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/ExchangeListener.java

@@ -27 +27 @@
 
 import de.ugoe.cs.autoquest.httpmonitor.HttpMonitorExchangeHandler;
+import de.ugoe.cs.autoquest.httpmonitor.IdGenerator;
 import de.ugoe.cs.autoquest.plugin.http.logdata.Address;
 import de.ugoe.cs.autoquest.plugin.http.logdata.Content;
@@ -46 +47 @@
  * recording an exchange can not be done in one step. This is due to the fact, that the proxy
  * servlet notifies different processing states for requests and response. An exchange listener
- * records all these event. On the occurrence of the final event, it compiles an
- * {@link HttpExchange} and forwards it to the exchange handler.
+ * records all these events. On the occurrence of the final event, it compiles an
+ * {@link HttpExchange} and forwards it to the exchange handler. When receiving the first event
+ * of the request, it also determines a respective ordering id. The same applies for the response.
+ * The ordering ids are retrieved from a provided id generator.
  * </p>
  * 
@@ -63 +66 @@
     /**
      * <p>
+     * the id generator used to generate ordering ids for requests and responses
+     * </p>
+     */
+    private IdGenerator idGenerator;
+    
+    /**
+     * <p>
      * the request of compiled exchange
      * </p>
      */
     private HttpServletRequest request;
+    
+    /**
+     * <p>
+     * the ordering id for the request
+     * </p>
+     */
+    private long requestOrderingId;
 
     /**
@@ -81 +98 @@
      */
     private HttpServletResponse response;
+    
+    /**
+     * <p>
+     * the ordering id for the response
+     * </p>
+     */
+    private long responseOrderingId;
 
     /**
@@ -99 +123 @@
      * <p>
      * initialized the exchange listener with the exchange handler to forward compiled exchanges to
+     * and the id generator to be used for generating ordering ids for requests and responses
      * </p>
      * 
      * @param exchangeHandler the exchange handler to forward compiled exchanges to
-     */
-    ExchangeListener(HttpMonitorExchangeHandler exchangeHandler) {
+     * @param idGenerator     the id generator to used for generating ordering ids
+     */
+    ExchangeListener(HttpMonitorExchangeHandler exchangeHandler, IdGenerator idGenerator) {
         this.exchangeHandler = exchangeHandler;
+        this.idGenerator = idGenerator;
     }
 
@@ -123 +150 @@
         lastUpdate = System.currentTimeMillis();
         this.request = request;
+        this.requestOrderingId = idGenerator.getNextId();
     }
 
@@ -159 +187 @@
         lastUpdate = System.currentTimeMillis();
         this.response = response;
+        this.responseOrderingId = idGenerator.getNextId();
     }
     
@@ -239 +268 @@
         exchange.setReceiver(address);
         
-        exchange.setRequest(map(request, eventObjectFactory));
-        exchange.setResponse(map(response, eventObjectFactory));
+        exchange.setRequest(map(request, requestOrderingId, eventObjectFactory));
+        exchange.setResponse(map(response, responseOrderingId, eventObjectFactory));
         
         exchangeHandler.handleHttpExchange(exchange);
@@ -250 +279 @@
      * </p>
      */
-    private HttpRequest map(HttpServletRequest request, ObjectFactory eventObjectFactory) {
+    private HttpRequest map(HttpServletRequest request,
+                            long               requestOrderingId,
+                            ObjectFactory      eventObjectFactory)
+    {
         HttpRequest eventRequest = eventObjectFactory.createHttpRequest();
+        eventRequest.setOrderingId(requestOrderingId);
         eventRequest.setMethod(Method.fromValue(request.getMethod()));
         eventRequest.setProtocol(Protocol.fromValue(request.getProtocol()));
@@ -311 +344 @@
      * </p>
      */
-    private HttpResponse map(HttpServletResponse response, ObjectFactory eventObjectFactory) {
+    private HttpResponse map(HttpServletResponse response,
+                             long                responseOrderingId,
+                             ObjectFactory       eventObjectFactory)
+    {
         HttpResponse eventResponse = eventObjectFactory.createHttpResponse();
         
         eventResponse.setStatus(BigInteger.valueOf(response.getStatus()));
+        eventResponse.setOrderingId(responseOrderingId);
 
         Headers headers = eventObjectFactory.createHeaders();