Changeset 1622

Timestamp:

07/29/14 10:29:27 (10 years ago)

Author:

sherbold

Message:

• added possibility to map paths to logical service names to HTTPLogParser
• extended SOAPEventType with serviceName attribute

Location:

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

Files:

• HTTPLogParser.java (modified) (3 diffs)
• eventcore/SOAPEventType.java (modified) (5 diffs)

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

@@ -19 +19 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Properties;
 import java.util.logging.Level;
 
@@ -69 +71 @@
      */
     private MessageFactory soapMessageFactory;
+    
+    /**
+     * <p>
+     * properties used to map the path of a service to its logical name
+     * </p>
+     */
+    private Properties urlNameMap = null;
+    
+    /**
+     * <p>
+     * Constructor. Creates a new HTTPLogParser without a urlNameMap. 
+     * </p>
+     */
+    public HTTPLogParser() {
+        
+    }
+    
+    /**
+     * <p>
+     * Constructor. Creates a new HTTPLogParser with a urlNameMap
+     * </p>
+     *
+     * @param urlNameMapFile properties file with the path to logical name map
+     * @throws IOException 
+     * @throws  
+     */
+    public HTTPLogParser(File urlNameMapFile) throws IOException {
+        super();
+        urlNameMap = new Properties();
+        urlNameMap.load(new FileInputStream(urlNameMapFile));
+    }
 
     /**
@@ -171 +204 @@
         
         if (soapRequest != null) {
-            return new SOAPEventType(exchange, soapRequest, soapResponse);
+            return new SOAPEventType(exchange, soapRequest, soapResponse, urlNameMap);
         }
         else {

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

@@ -17 +17 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Properties;
 import java.util.logging.Level;
 
@@ -64 +65 @@
     /**
      * <p>
+     * the name of the service; this is either the path or, if a path map is available
+     */
+    private String serviceName;
+    
+    /**
+     * <p>
      * the human readable name of this event type
      * </p>
@@ -78 +85 @@
      * @param soapRequest  the already extracted SOAP request
      * @param soapResponse the already extracted SOAP response
-     */
-    public SOAPEventType(HttpExchange exchange, SOAPMessage soapRequest, SOAPMessage soapResponse) {
+     * @param urlNameMap   used to map paths of servives to logical names
+     */
+    public SOAPEventType(HttpExchange exchange, SOAPMessage soapRequest, SOAPMessage soapResponse, Properties urlNameMap) {
         super(exchange);
         this.soapRequest = soapRequest;
@@ -102 +110 @@
         if (path != null) {
             nameBuffer.append("(");
-            nameBuffer.append(path);
-            somethingAdded = true;
+            if( urlNameMap==null ) {
+                serviceName = path;
+            } else {
+                String value = urlNameMap.getProperty(path);
+                if( value!=null ) {
+                    serviceName = value;
+                } else {
+                    serviceName = path;
+                }
+            }
+            nameBuffer.append(serviceName);
+            somethingAdded = true;
+        } else {
+            serviceName = "NA";
         }
         
@@ -149 +169 @@
     public String getCalledMethod() {
         return calledMethod;
+    }
+    
+    /**
+     * <p>
+     * the name of the service called in this request
+     * </p>
+     *
+     * @return the name of the service called in this request
+     */
+    public String getServiceName() {
+        return serviceName;
     }