perfsonar development work

Author: krzjed
Date: 2009-06-22 04:55:25 -0400 (Mon, 22 Jun 2009)
New Revision: 5199

Added:
   
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/handlers/
   
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/handlers/NetworkInterfaceCollectionHandler.java
Modified:
   
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java
   
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/MeasuredInterfacesHandler.java
   
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/ResponseParser.java
Log:
Added the possibility of using parsed data parallelly with the parsing

Added: 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/handlers/NetworkInterfaceCollectionHandler.java

Modified: 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java
===================================================================
--- 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java
   2009-06-22 08:49:13 UTC (rev 5198)
+++ 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/level1/Level1Impl.java
   2009-06-22 08:55:25 UTC (rev 5199)
@@ -27,7 +27,9 @@
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
+import org.perfsonar.lsclient.handlers.NetworkInterfaceHandler;
 import org.perfsonar.lsclient.helpers.AbstractLevel1;
+import org.perfsonar.ri.lsclient.handlers.NetworkInterfaceCollectionHandler;
 import org.perfsonar.ri.lsclient.level1.jaxb.JaxbTools;
 import org.perfsonar.ri.lsclient.level1.jaxb.ServiceImpl;
 import org.perfsonar.ri.lsclient.xml.ResponseParser;
@@ -189,16 +191,28 @@
 
        /*
         * (non-Javadoc)
-        * @see 
org.perfsonar.lsclient.Level1LsClientInterface#getLSMeasuredInterfaces(org.perfsonar.lsclient.data.LookupService,
 org.perfsonar.lsclient.data.Service)
+        * 
+        * @see
+        * 
org.perfsonar.lsclient.Level1LsClientInterface#getLSMeasuredInterfaces
+        * (org.perfsonar.lsclient.data.LookupService,
+        * org.perfsonar.lsclient.data.Service)
         */
        public List<NetworkInterface> getLSMeasuredInterfaces(LookupService 
hls,
-                       Service service) throws LsQueryException{
+                       Service service) throws LsQueryException {
+               NetworkInterfaceCollectionHandler handler = new 
NetworkInterfaceCollectionHandler();
+               this.processLSMeasuredInterfaces(hls, service, handler);
+               return handler.getNetworkInterfaces();
+
+       }
+
+       public void processLSMeasuredInterfaces(LookupService hls, Service 
service,
+                       NetworkInterfaceHandler handler) throws 
LsQueryException {
                LSMeasuredServicesQuery query = new 
LSMeasuredServicesQuery(service);
                logger.info("Created query: \n" + query.toString());
                InputStream stream;
                stream = level0.getRawQueryResult(hls, query.toString());
                try {
-                       return ResponseParser.parseMeasuredInterfaces(stream);
+                       ResponseParser.parseMeasuredInterfaces(stream, 
handler);
                } catch (ParserConfigurationException e) {
                        throw new LsQueryException(e);
                } catch (SAXException e) {

Modified: 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/MeasuredInterfacesHandler.java
===================================================================
--- 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/MeasuredInterfacesHandler.java
       2009-06-22 08:49:13 UTC (rev 5198)
+++ 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/MeasuredInterfacesHandler.java
       2009-06-22 08:55:25 UTC (rev 5199)
@@ -1,11 +1,9 @@
 package org.perfsonar.ri.lsclient.xml;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.NetworkInterface;
 import org.perfsonar.lsclient.data.NetworkInterface.Direction;
+import org.perfsonar.lsclient.handlers.NetworkInterfaceHandler;
 import org.perfsonar.lsclient.lsinfo.Namespaces;
 import org.perfsonar.ri.lsclient.data.implementation.EventTypeImpl;
 import org.perfsonar.ri.lsclient.data.implementation.NetworkInterfaceImpl;
@@ -41,8 +39,19 @@
        private boolean inParameter;
        private String parameterName;
 
-       private List<NetworkInterface> interfaces = new 
ArrayList<NetworkInterface>();
+       private NetworkInterfaceHandler networkInterfaceHandler;
 
+       /**
+        * Constructor
+        * 
+        * @param networkInterfaceHandler
+        *            handler for handling parsed 
{@link
 NetworkInterface}
+        */
+       public MeasuredInterfacesHandler(
+                       NetworkInterfaceHandler networkInterfaceHandler) {
+               this.networkInterfaceHandler = networkInterfaceHandler;
+       }
+
        @Override
        public void characters(char[] ch, int start, int length)
                        throws SAXException {
@@ -71,7 +80,7 @@
                if (Namespaces.PSSERVICE.equals(uri)
                                && "datum".equalsIgnoreCase(localName)) {
                        this.inDatum = false;
-                       interfaces.add(actual);
+                       networkInterfaceHandler.interfaceParsed(actual);
                        return;
                } else if (Namespaces.NMWG.equals(uri)
                                && "eventType".equalsIgnoreCase(localName)) {
@@ -183,10 +192,6 @@
                this.subjectStartElement(uri, localName, name, attributes);
        }
 
-       public List<NetworkInterface> getNetworkInterfaces() {
-               return this.interfaces;
-       }
-
        public void netutilCharacters(char[] ch, int start, int length)
                        throws SAXException {
                this.subjectCharacters(ch, start, length);

Modified: 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/ResponseParser.java
===================================================================
--- 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/ResponseParser.java
  2009-06-22 08:49:13 UTC (rev 5198)
+++ 
trunk/ps-mdm-lsclient-impl/src/main/java/org/perfsonar/ri/lsclient/xml/ResponseParser.java
  2009-06-22 08:55:25 UTC (rev 5199)
@@ -9,13 +9,14 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.perfsonar.lsclient.data.NetworkInterface;
+import org.perfsonar.lsclient.handlers.NetworkInterfaceHandler;
 import org.perfsonar.ri.lsclient.level1.LSMeasuredServicesQuery;
 import org.xml.sax.SAXException;
 
 /**
  * Class for parsing XML response from Lookup Service
  * 
- * @author kjedrzejewski
+ * @author krzjed (PSNC)
  * 
  */
 public class ResponseParser {
@@ -33,15 +34,14 @@
         * @throws IOException
         *             Connection to LS problems
         */
-       public static List<NetworkInterface> 
parseMeasuredInterfaces(InputStream is)
+       public static void parseMeasuredInterfaces(
+                       InputStream is, NetworkInterfaceHandler 
networkInterfaceHandler)
                        throws ParserConfigurationException, SAXException, 
IOException {
 
                SAXParserFactory saxFact = SAXParserFactory.newInstance();
                saxFact.setNamespaceAware(true);
                SAXParser sax = saxFact.newSAXParser();
-               MeasuredInterfacesHandler handler = new 
MeasuredInterfacesHandler();
+               MeasuredInterfacesHandler handler = new 
MeasuredInterfacesHandler(networkInterfaceHandler);
                sax.parse(is, handler);
-
-               return handler.getNetworkInterfaces();
        }
 }