Changeset 1913 for trunk/autoquest-plugin-uml/src/main/java

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

File:

• trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java (modified) (4 diffs)

trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java

@@ -486 +486 @@
                 String serviceName = getServiceNameFromEvent(event);
                 String methodName = getCalledMethodFromEvent(event);
+                String clientName = getClientNameFromEvent(event);
                 // determine lifelines
                 Lifeline msgTargetLifeline;
                 Lifeline msgSourceLifeline;
-
-                if (serviceName.equals(userLifeline.getName())) {
-                    // message being send to user
-                    // currently we just select the first lifeline that is not the user
-                    // this, obviously, has to be replaced with the real service.
-                    // however, identification of the source of a message is still an open issue
-                    msgSourceLifeline = null;
-                    for (Lifeline lifeline : interaction.getLifelines()) {
-                        if (!lifeline.equals(userLifeline)) {
-                            msgSourceLifeline = lifeline;
-                            break;
-                        }
-                    }
-                    msgTargetLifeline = userLifeline;
-                }
-                else {
-                    msgSourceLifeline = userLifeline;
-                    msgTargetLifeline = interaction.getLifeline(serviceName);
-                }
+                
+                msgSourceLifeline = interaction.getLifeline(clientName);
+                msgTargetLifeline = interaction.getLifeline(serviceName);
+                
                 if (msgSourceLifeline == null) {
                     throw new RuntimeException(
-                                               "Error creating message: could not determine source lifeline.");
+                                               "Error creating message: could not determine source lifeline for component: " + clientName);
                 }
                 if (msgTargetLifeline == null) {
                     throw new RuntimeException(
-                                               "Error creating message: could not determine target lifeline.");
+                                               "Error creating message: could not determine target lifeline for component: " + serviceName);
                 }
                 // determine correct target interface
@@ -666 +652 @@
                             .getName();
                 }
-                eventSequence.add(new Event(new SimpleSOAPEventType(methodName, serviceName)));
+                eventSequence.add(new Event(new SimpleSOAPEventType(methodName, serviceName,""))); // TODO add client name
             }
         }
@@ -809 +795 @@
         else if (event.getType() instanceof SimpleSOAPEventType) {
             return ((SimpleSOAPEventType) event.getType()).getCalledMethod();
+        }
+        else {
+            throw new RuntimeException(
+                                       "Wrong event type. Only SOAPEventType and SimpleSOAPEventType supported but was: " +
+                                           event.getType().getClass().getName());
+        }
+    }
+    
+    /**
+     * <p>
+     * Helper function to get the name of a client from a SOAP event.
+     * </p>
+     * 
+     * @param event
+     *            event for which the client name is retrieved
+     * @return service name
+     */
+    protected static String getClientNameFromEvent(Event event) {
+        if (event.getType() instanceof SOAPEventType) {
+            return ((SOAPEventType) event.getType()).getClientName();
+        }
+        else if (event.getType() instanceof SimpleSOAPEventType) {
+            return ((SimpleSOAPEventType) event.getType()).getClientName();
         }
         else {
@@ -1013 +1022 @@
         InstanceSpecification instSpec = (InstanceSpecification) serviceInstSpecPkg.createPackagedElement("instspec_"+type.getName(), UMLPackage.Literals.INSTANCE_SPECIFICATION);
         instSpec.getClassifiers().add(type);
-        System.out.println(type.getName());
         for( Property prop : type.getAllAttributes() ) {
             // TODO handle multiplicity