perfsonar development work

Author: psnc.trzaszczka
Date: 2010-03-08 14:13:37 +0000 (Mon, 08 Mar 2010)
New Revision: 5530

Modified:
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
Log:
url result code changed to dotted notation, request message validation 
-data/metadata

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
    2010-03-08 12:11:51 UTC (rev 5529)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
    2010-03-08 14:13:37 UTC (rev 5530)
@@ -8,8 +8,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
 import org.perfsonar.base2.service.authn.component.AuthNComponent;
 import org.perfsonar.base2.service.configuration.Configuration;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
@@ -21,9 +23,7 @@
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Metadata;
 
-import org.apache.log4j.Logger;
 
-
 /**
  * Abstract class that does all the things that a "request" message
  * handler will need to do.
@@ -112,7 +112,13 @@
 
         ArrayList<MessagePair> output = new ArrayList<MessagePair>();
 
-        for (Message inputMessage: extractMultipleRequests(reqMessage)) {
+        List<Message> inputMessages=extractMultipleRequests(reqMessage);
+        if(inputMessages.isEmpty()){
+                       //TODO:  url event types
+               throw new 
PerfSONARException("error.common.no_metadata_data_pair","There were no 
metadata/data pairs found in the message");
+        }
+        
+        for (Message inputMessage: inputMessages) {
 
             ServiceMessage reqSM = new ServiceMessage(inputMessage);
             ServiceMessage resSM = new ServiceMessage();
@@ -138,7 +144,7 @@
                 //if an exception was thrown, convert it to result code
                 //and add as a new message (to be joined) to array
                 logger.error("Message handler result code: "+e);
-                resSM.setElement(ResultCodesUtil.generateResultMessage(null, 
e));
+                
resSM.setElement(ResultCodesUtil.generateResultMessage(e.getResultCode(),e.getMessage()));
 
             }
 
@@ -160,7 +166,6 @@
     }
 
 
-    @SuppressWarnings("unchecked")
     protected ArrayList<Message> extractMultipleRequests(Message reqMessage) 
{
 
         ArrayList<Message> messages = new ArrayList<Message>();
@@ -215,10 +220,9 @@
     }
 
 
-    @SuppressWarnings("unchecked")
     protected MessagePair mergeMultipleResponses(ArrayList<MessagePair> 
messagePairs) {
 
-        if (messagePairs == null && messagePairs.size() == 0)
+        if (messagePairs == null || messagePairs.size() == 0)
             return null;
         else if (messagePairs.size() == 1)
             return messagePairs.get(0);

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2010-03-08 12:11:51 UTC (rev 5529)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2010-03-08 14:13:37 UTC (rev 5530)
@@ -131,14 +131,16 @@
 
             //return successful response
             return outOMElement;
-
+        }catch(PerfSONARException ex){
+               return generateErrorMessage(ex);
         } catch (Exception excp) {
 
             //perfSONAR result code if request message cannot be server 
(parsing, etc.)
             logger.error("Parse error: "+excp.toString());
 
             //return error response
-            return generateErrorMessage(new 
PerfSONARException("error/request",
+            //TODO: URL event types
+            return generateErrorMessage(new 
PerfSONARException("error.request",
                     "Error in Request Handler, nested exception was: "
                         +excp.toString()));