Changeset 1924

Timestamp:

03/18/15 09:58:50 (9 years ago)

Author:

sherbold

Message:

• SimpleSOAPEvent now contains body of the SOAP request
• SOAPUtils created

Location:

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

Files:

• HTTPUtils.java (modified) (2 diffs)
• SOAPUtils.java (added)
• eventcore/SOAPEventType.java (modified) (2 diffs)
• eventcore/SimpleSOAPEventType.java (modified) (7 diffs)

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.http;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import de.ugoe.cs.autoquest.eventcore.Event;
-import de.ugoe.cs.autoquest.plugin.http.eventcore.SOAPEventType;
-import de.ugoe.cs.autoquest.plugin.http.eventcore.SimpleSOAPEventType;
 import de.ugoe.cs.autoquest.plugin.http.logdata.Address;
 
@@ -128 +121 @@
     /**
      * <p>
-     * Replaces events with a {@link SOAPEventType} with new events of {@link SimpleSOAPEventType}
-     * and no target.
-     * </p>
-     * 
-     * @param sequence
-     *            sequence where the events are replaced
-     * @param keepOnlySOAPEvents
-     *            if true, all events that are not of SOAPEventType or SimpleSOAPEventType are
-     *            removed
-     * @return sequence with {@link SimpleSOAPEventType}s instead of {@link SOAPEventType}s
-     */
-    public static List<Event> convertToSimpleSOAPEvent(List<Event> sequence,
-                                                       boolean keepOnlySOAPEvents)
-    {
-        List<Event> newSequence = null;
-        if (sequence != null) {
-            newSequence = new LinkedList<>();
-            for (Event event : sequence) {
-                if (event.getType() instanceof SOAPEventType) {
-                    SOAPEventType eventType = (SOAPEventType) event.getType();
-                    newSequence.add(new Event(new SimpleSOAPEventType(eventType.getCalledMethod(),
-                                                                      eventType.getServiceName(),
-                                                                      eventType.getClientName())));
-                }
-                else {
-                    if (!keepOnlySOAPEvents || event.getType() instanceof SimpleSOAPEventType) {
-                        newSequence.add(event);
-                    }
-                }
-            }
-        }
-        return newSequence;
-    }
-    
-    /**
-     * <p>
-     * Removes all non SOAP events from a sequence. Warning: this change is performed in-place!
-     * </p>
-     * 
-     * @param sequence
-     *            sequence where the events are replaced
-     */
-    public static void removeNonSOAPEvents(List<Event> sequence)
-    {
-        for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) {
-            Event event = eventIter.next();
-            if (!(event.getType() instanceof SOAPEventType)) {
-                eventIter.remove();
-            }
-        }
-    }
-
-    /**
-     * <p>
      * prevent instantiation
      * </p>

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

@@ -23 +23 @@
 import javax.xml.soap.SOAPMessage;
 
+import org.w3c.dom.Element;
+
 import de.ugoe.cs.autoquest.plugin.http.HTTPUtils;
 import de.ugoe.cs.autoquest.plugin.http.logdata.Header;
@@ -256 +258 @@
         return soapResponse;
     }
+    
+    /**
+     * @return the body of the soapRequest
+     */
+    public Element getSoapRequestBody() {
+        try {
+            return soapRequest.getSOAPBody();
+        }
+        catch (SOAPException e) {
+            return null;
+        }
+    }
 
     /* (non-Javadoc)

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.http.eventcore;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.plugin.http.HTTPUtils;
+import de.ugoe.cs.autoquest.plugin.http.SOAPUtils;
 
 /**
@@ -44 +54 @@
      */
     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
+     * 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;
+
+    /**
+     * <p>
+     * the body of the SOAP request; storage as serialized XML string to allow object serialization
+     * </p>
+     */
+    private final String soapRequestBody;
 
     /**
@@ -59 +76 @@
      * 
      */
-    public SimpleSOAPEventType(String calledMethod, String serviceName, String clientName) {
+    public SimpleSOAPEventType(String calledMethod,
+                               String serviceName,
+                               String clientName,
+                               Element soapRequestBody)
+    {
         if (calledMethod == null) {
             throw new IllegalArgumentException("called method must not be null");
@@ -69 +90 @@
             throw new IllegalArgumentException("clientName must not be null");
         }
+        if (soapRequestBody == null) {
+            throw new IllegalArgumentException("soapRequestBody must not be null");
+        }
         this.calledMethod = calledMethod;
         this.serviceName = serviceName;
         this.clientName = clientName;
+        this.soapRequestBody = SOAPUtils.getSerialization(soapRequestBody);
     }
 
@@ -95 +120 @@
         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;
+    }
+
+    public Element getSoapRequestBody() {
+        try {
+            return DocumentBuilderFactory.newInstance().newDocumentBuilder()
+                .parse(new ByteArrayInputStream(soapRequestBody.getBytes())).getDocumentElement();
+        }
+        catch (SAXException | IOException | ParserConfigurationException e) {
+            return null;
+        }
     }
 
@@ -129 +164 @@
         else if (obj instanceof SimpleSOAPEventType) {
             return HTTPUtils.equals(calledMethod, ((SimpleSOAPEventType) obj).calledMethod) &&
-                HTTPUtils.equals(serviceName, ((SimpleSOAPEventType) obj).serviceName);
+                HTTPUtils.equals(serviceName, ((SimpleSOAPEventType) obj).serviceName) &&
+                HTTPUtils.equals(clientName, ((SimpleSOAPEventType) obj).clientName);
         }
         else {
@@ -143 +179 @@
     @Override
     public int hashCode() {
-        int hashCode = calledMethod.hashCode() + serviceName.hashCode();
+        int hashCode = calledMethod.hashCode() + serviceName.hashCode() + clientName.hashCode();
         return hashCode;
     }
-    
-    /* (non-Javadoc)
+
+    /*
+     * (non-Javadoc)
+     * 
      * @see java.lang.Object#toString()
      */