Changeset 1635 for trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java

Timestamp:

07/31/14 16:44:36 (10 years ago)

Author:

sherbold

Message:

• fixed SOAP event types hashCode and equals method to account for the serviceName
• added SimpleSOAPEventType that contains only the name of the called method and of the called service
• added convertToSimpleSOAPEvent method to HTTPUtils
• added tests for convertToSimpleSOAPEvent

File:

• trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java (modified) (6 diffs)

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

@@ -47 +47 @@
      * </p>
      */
-    transient private SOAPMessage soapRequest;
+    transient private final SOAPMessage soapRequest;
     
     /**
@@ -54 +54 @@
      * </p>
      */
-    transient private SOAPMessage soapResponse;
+    transient private final SOAPMessage soapResponse;
     
     /**
@@ -61 +61 @@
      * </p>
      */
-    private String calledMethod;
+    private final String calledMethod;
     
     /**
      * <p>
      * the name of the service; this is either the path or, if a path map is available
-     */
-    private String serviceName;
+     * </p>
+     */
+    private final String serviceName;
     
     /**
@@ -74 +75 @@
      * </p>
      */
-    private String name;
+    private final String name;
 
     /**
@@ -227 +228 @@
             return
                 super.equals(obj) &&
-                HTTPUtils.equals(calledMethod, ((SOAPEventType) obj).calledMethod);
+                HTTPUtils.equals(calledMethod, ((SOAPEventType) obj).calledMethod) &&
+                HTTPUtils.equals(serviceName, ((SOAPEventType) obj).serviceName);
         }
         else {
@@ -239 +241 @@
     @Override
     public int hashCode() {
+        int hashCode = super.hashCode();
         if (calledMethod != null) {
-            return super.hashCode() + calledMethod.hashCode();
-        }
-        else {
-            return super.hashCode();
-        }
+            hashCode += calledMethod.hashCode();
+        }
+        if( serviceName != null ) {
+            hashCode += serviceName.hashCode();
+        }
+        return hashCode;
     }