Changeset 1913 for trunk/autoquest-plugin-http

Timestamp:

03/11/15 16:59:16 (10 years ago)

Author:

sherbold

Message:

• extended SimpleSOAPEventType with clientName
• modified UMLUtils.createInteraction... to use the client name to determine the source lifeline
• updated UMLUtilsTest to work with new service name definitions

Location:

trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http

Files:

• HTTPUtils.java (modified) (1 diff)
• eventcore/SimpleSOAPEventType.java (modified) (4 diffs)

trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/HTTPUtils.java

@@ -143 +143 @@
                     SOAPEventType eventType = (SOAPEventType) event.getType();
                     newSequence.add(new Event(new SimpleSOAPEventType(eventType.getCalledMethod(),
-                                                                      eventType.getServiceName())));
+                                                                      eventType.getServiceName(),
+                                                                      eventType.getClientName())));
                 }
                 else {

trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java

@@ -44 +44 @@
      */
     private final String serviceName;
+    
+    /**
+     * <p>
+     * the name of the client; this is either the host/ip and port of the sender or, if a path
+     * map is available, a human readable name that may be based also on the receiver
+     * </p>
+     */
+    private final String clientName;
 
     /**
@@ -51 +59 @@
      * 
      */
-    public SimpleSOAPEventType(String calledMethod, String serviceName) {
+    public SimpleSOAPEventType(String calledMethod, String serviceName, String clientName) {
         if (calledMethod == null) {
             throw new IllegalArgumentException("called method must not be null");
@@ -58 +66 @@
             throw new IllegalArgumentException("serviceName must not be null");
         }
+        if (clientName == null) {
+            throw new IllegalArgumentException("clientName must not be null");
+        }
         this.calledMethod = calledMethod;
         this.serviceName = serviceName;
+        this.clientName = clientName;
     }
 
@@ -82 +94 @@
     public String getServiceName() {
         return serviceName;
+    }
+    
+    /**
+     * <p>
+     * the name of the client calling in this request
+     * </p>
+     *
+     * @return the name of the client calling in this request
+     */
+    public String getClientName() {
+        return clientName;
     }