[savara-commits] savara SVN: r587 - in branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor: impl and 1 other directory.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2011-01-16 16:58:53 -0500 (Sun, 16 Jan 2011)
New Revision: 587

Modified:
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
Log:
Update monitor API to optionally provide an explicit conversation instance id.

Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java	2011-01-16 21:52:35 UTC (rev 586)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java	2011-01-16 21:58:53 UTC (rev 587)
@@ -28,31 +28,41 @@
 	public void setMonitorListener(MonitorListener l);
 	
 	/**
-	 * This method sets the conversation store to use when
+	 * This method sets the session store to use when
 	 * monitoring.
 	 * 
-	 * @param store The conversation store
+	 * @param store The session store
 	 */
-	public void setConversationStore(SessionStore store);
+	public void setSessionStore(SessionStore store);
 	
 	/**
 	 * This method is used to indicate that a message has been
 	 * sent and should be monitored against the configured
 	 * behaviour.
 	 * 
+	 * If the conversation instance id is not explicitly
+	 * specified, then the protocol monitor will be responsible
+	 * for deriving the appropriate value.
+	 * 
+	 * @param cid The optional conversation instance id
 	 * @param mesg The message
 	 * @return Whether the message was valid
 	 */
-	public boolean sent(Message mesg);
+	public boolean sent(ConversationInstanceId cid, Message mesg);
 	
 	/**
 	 * This method is used to indicate that a message has been
 	 * received and should be monitored against the configured
 	 * behaviour.
 	 * 
+	 * If the conversation instance id is not explicitly
+	 * specified, then the protocol monitor will be responsible
+	 * for deriving the appropriate value.
+	 * 
+	 * @param cid The optional conversation instance id
 	 * @param mesg The message
 	 * @return Whether the message was valid
 	 */
-	public boolean received(Message mesg);
+	public boolean received(ConversationInstanceId cid, Message mesg);
 	
 }

Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java	2011-01-16 21:52:35 UTC (rev 586)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java	2011-01-16 21:58:53 UTC (rev 587)
@@ -17,6 +17,7 @@
  */
 package org.savara.monitor.impl;
 
+import org.savara.monitor.ConversationInstanceId;
 import org.savara.monitor.SessionStore;
 import org.savara.monitor.Message;
 import org.savara.monitor.Monitor;
@@ -55,12 +56,12 @@
 	}
 	
 	/**
-	 * This method sets the conversation store to use when
+	 * This method sets the session store to use when
 	 * monitoring.
 	 * 
-	 * @param store The conversation store
+	 * @param store The session store
 	 */
-	public void setConversationStore(SessionStore store) {
+	public void setSessionStore(SessionStore store) {
 		m_store = store;
 	}
 	
@@ -69,10 +70,15 @@
 	 * sent and should be monitored against the configured
 	 * behaviour.
 	 * 
+	 * If the conversation instance id is not explicitly
+	 * specified, then the protocol monitor will be responsible
+	 * for deriving the appropriate value.
+	 * 
+	 * @param cid The optional conversation instance id
 	 * @param mesg The message
 	 * @return Whether the message was valid
 	 */
-	public boolean sent(Message mesg) {
+	public boolean sent(ConversationInstanceId cid, Message mesg) {
 		boolean ret=false;
 		
 		// Should instance id be derived from message, or supplied
@@ -94,10 +100,15 @@
 	 * received and should be monitored against the configured
 	 * behaviour.
 	 * 
+	 * If the conversation instance id is not explicitly
+	 * specified, then the protocol monitor will be responsible
+	 * for deriving the appropriate value.
+	 * 
+	 * @param cid The optional conversation instance id
 	 * @param mesg The message
 	 * @return Whether the message was valid
 	 */
-	public boolean received(Message mesg) {
+	public boolean received(ConversationInstanceId cid, Message mesg) {
 		boolean ret=false;
 		
 		return(ret);