perfsonar development work

Author: krzjed
Date: 2009-08-26 03:40:06 -0400 (Wed, 26 Aug 2009)
New Revision: 5264

Removed:
   trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/data/
Modified:
   trunk/perfsonar_java-lsclient-api/pom.xml
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterfaceExtension.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterfaceExtension.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
Log:
Added throw declaration to getLSQueryContent method

Modified: trunk/perfsonar_java-lsclient-api/pom.xml
===================================================================
--- trunk/perfsonar_java-lsclient-api/pom.xml   2009-08-19 10:45:23 UTC (rev 
5263)
+++ trunk/perfsonar_java-lsclient-api/pom.xml   2009-08-26 07:40:06 UTC (rev 
5264)
@@ -6,7 +6,7 @@
        <artifactId>LS-client-api</artifactId>
        <packaging>jar</packaging>
        <name>The Lookupservice client API</name>
-       <version>1.0RC2</version>
+       <version>1.1</version>
        <inceptionYear>2008</inceptionYear>
 
        <organization>

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
   2009-08-19 10:45:23 UTC (rev 5263)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/DiscoveryStep.java
   2009-08-26 07:40:06 UTC (rev 5264)
@@ -5,38 +5,38 @@
 import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 
 /**
- * Represents a step in the discovery process.
- * A step involves asking all Referral lookup
- * services for information. If this information
- * contains referral services then these make up 
- * the services to be queried in the next 
- * 
{@link
 DiscoveryStep} if there are no referral
- * services then this step is the last one.
- *  
+ * Represents a step in the discovery process. A step involves asking all
+ * Referral lookup services for information. If this information contains
+ * referral services then these make up the services to be queried in the 
next
+ * 
{@link
 DiscoveryStep} if there are no referral services then this step is the
+ * last one.
+ * 
  * @author michael.bischoff (SURFnet)
  * @version 1.0
  * @since 1.0
  */
 public interface DiscoveryStep {
 
-       /**
-        * returns a set of Authoratative lookup services 
-        * that belong to this step.
-        * @return a (possibly empty) set of Authoratative lookup services 
-        * or null if this step failed.
-        */
-       Set<AuthorativeLookupservice> getServices();
+    /**
+     * returns a set of Authoratative lookup services that belong to this 
step.
+     * 
+     * @return a (possibly empty) set of Authoratative lookup services or 
null
+     *         if this step failed.
+     */
+    Set<AuthorativeLookupservice> getServices();
 
-       /**
-        * If this step has completely failed.
-        * @return true on complete failure, no LookupService could be 
-        * queried successfully during this step.
-        */
-       boolean hasFailed();
-       
-       /**
-        * TODO
-        * @return exception that occurred while executing this step.
-        */
-       Throwable getException();
+    /**
+     * If this step has completely failed.
+     * 
+     * @return true on complete failure, no LookupService could be queried
+     *         successfully during this step.
+     */
+    boolean hasFailed();
+
+    /**
+     * Returns 
{@link
 Exception} instance representing problem that occured
+     * 
+     * @return exception that occurred while executing this step.
+     */
+    Throwable getException();
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
 2009-08-19 10:45:23 UTC (rev 5263)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
 2009-08-26 07:40:06 UTC (rev 5264)
@@ -126,19 +126,14 @@
      *            a set of serviceTypes of which one or more should match
      * @return a non-null Set of (home)LookupServices that know about any
      *         elements AND any eventTypes AND types
-     * 
-     * @throws 
{@link
 UnsupportedOperationException} if a 
{@link
 ServiceType} is
-     *         non-null this is because currently there isn't a way to 
determine
-     *         the serviceType in the LS at this point. Also it's use during
-     *         discovery is questionable.
      */
     Set<ServiceMeasurementMetadata> getLSQueryContent(
             AuthorativeLookupservice hls, Set<TopologyElement> elements,
             Set<EventType> eventTypes, Set<ServiceType> types);
 
     /**
-     * TODO evaluate Given a service this method returns a set of
-     * 
{@link
 ServiceMetadata} that is retrieved from a home lookup service.
+     * Given a service this method returns a set of 
{@link
 ServiceMetadata} that
+     * is retrieved from a home lookup service.
      * 
      * @param hls
      *            home lookup service
@@ -147,48 +142,19 @@
     // Set<ServiceMetadata> getLSQueryLocation(AuthorativeLookupservice hls,
     // Service service);
     /**
-     * TODO evaluate Given a service returns a set of
-     * 
{@link
 ServiceMeasurementMetadata} that is retrieved from a home lookup
-     * service.
+     * Given a service returns a set of 
{@link
 ServiceMeasurementMetadata} that
+     * is retrieved from a home lookup service.
      * 
      * @param hls
      *            home lookup service
-     * @param servicegetLSMeasuredInterfaces
-     *            (LookupService hls, Service service) throws 
LsQueryException
+     * @param service
+     *            service that retrieved data have to refer to
+     * 
+     * @throws LsQueryException
+     *             when problems with executing query occurs
      */
     Set<ServiceMeasurementMetadata> getLSQueryContent(
-            AuthorativeLookupservice hls, Service service);
-    // /**
-    // * Finds interfaces measured by given measurement service. If this 
method
-    // * result is stored only temporary, method processLSMeasuredInterfaces
-    // * should be used instead, because it uses less memory.
-    // *
-    // * @param hls
-    // * Lookup Service that contains information that are searched for
-    // * @param service
-    // * service that measures interfaces that are searched for
-    // * @return 
{@link
 List} of interfaces given service collect informations
-    // of
-    // *
-    // * @throws LsQueryException
-    // * when problems with connection or response parsing occurs
-    // */
-    // List<NetworkInterface> getLSMeasuredInterfaces(LookupService hls,
-    // Service service) throws LsQueryException;
-    // /**
-    // * Finds interfaces measured by given measurement service and 
processes it
-    // * using given handler.
-    // *
-    // * @param hls
-    // * Lookup Service that contains information thar are searched for
-    // * @param service
-    // * service that measures interfaces that are searched for
-    // * @param handler
-    // * 
{@link
 NetworkInterfaceHandler} containing instructions for
-    // * processing found 
{@link
 NetworkInterface}s
-    // * @throws LsQueryException
-    // * when problems with connection or response parsing occurs
-    // */
-    // void processLSMeasuredInterfaces(LookupService hls, Service service,
-    // NetworkInterfaceHandler handler) throws LsQueryException;
+            AuthorativeLookupservice hls, Service service)
+            throws LsQueryException;
+
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterfaceExtension.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterfaceExtension.java
        2009-08-19 10:45:23 UTC (rev 5263)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterfaceExtension.java
        2009-08-26 07:40:06 UTC (rev 5264)
@@ -8,5 +8,5 @@
  * @see Level1LsClientInterface
  */
 public interface Level1LsClientInterfaceExtension extends 
Level1LsClientInterface {
-       /* TODO empty */
+       /* empty */
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterfaceExtension.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterfaceExtension.java
        2009-08-19 10:45:23 UTC (rev 5263)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterfaceExtension.java
        2009-08-26 07:40:06 UTC (rev 5264)
@@ -8,5 +8,5 @@
  * @see Level2LsClientInterface
  */
 public interface Level2LsClientInterfaceExtension extends 
Level2LsClientInterface {
-        /* TODO empty */
+        /* empty */
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2009-08-19 10:45:23 UTC (rev 5263)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2009-08-26 07:40:06 UTC (rev 5264)
@@ -26,161 +26,146 @@
  */
 public abstract class AbstractLsClient implements LsClient {
 
-       public AbstractLsClient() { /* no arg constructor */
-       }
+    public AbstractLsClient() { /* no arg constructor */
+    }
 
-       abstract protected Level0LsClientInterface getLevel0();
+    abstract protected Level0LsClientInterface getLevel0();
 
-       abstract protected Level1LsClientInterface getLevel1();
+    abstract protected Level1LsClientInterface getLevel1();
 
-       abstract protected Level2LsClientInterface getLevel2();
+    abstract protected Level2LsClientInterface getLevel2();
 
-       // -- Level 0 --
+    // -- Level 0 --
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level0LsClientInterface#getRawQueryResult(org.
-        * perfsonar.lsclient.data.LookupService, java.lang.String)
-        */
-       public InputStream getRawQueryResult(LookupService lookupService,
-                       String xquery) throws LsQueryException, 
IllegalArgumentException {
-               return getLevel0().getRawQueryResult(lookupService, xquery);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.perfsonar.lsclient.Level0LsClientInterface#getRawQueryResult(org.
+     * perfsonar.lsclient.data.LookupService, java.lang.String)
+     */
+    public InputStream getRawQueryResult(LookupService lookupService,
+            String xquery) throws LsQueryException, IllegalArgumentException 
{
+        return getLevel0().getRawQueryResult(lookupService, xquery);
+    }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level0LsClientInterface#getRawQueryResult(org.
-        * perfsonar.lsclient.data.LookupService, java.lang.String)
-        */
-       public InputStream getRawDiscoveryResponse(LookupService 
lookupService,
-                       String summaryDescription) throws LsQueryException {
-               return getLevel0().getRawDiscoveryResponse(lookupService,
-                               summaryDescription);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.perfsonar.lsclient.Level0LsClientInterface#getRawQueryResult(org.
+     * perfsonar.lsclient.data.LookupService, java.lang.String)
+     */
+    public InputStream getRawDiscoveryResponse(LookupService lookupService,
+            String summaryDescription) throws LsQueryException {
+        return getLevel0().getRawDiscoveryResponse(lookupService,
+                summaryDescription);
+    }
 
-       // -- Level 1 --
+    // -- Level 1 --
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#discover(java.util.Set,
-        * java.util.Set, java.util.Set)
-        */
-       public Set<AuthorativeLookupservice> discover(
-                       Set<TopologyElement> elements, Set<EventType> 
eventTypes,
-                       Set<ServiceType> type) {
-               return getLevel1().discover(elements, eventTypes, type);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.perfsonar.lsclient.Level1LsClientInterface#discover(java.util.Set,
+     * java.util.Set, java.util.Set)
+     */
+    public Set<AuthorativeLookupservice> discover(
+            Set<TopologyElement> elements, Set<EventType> eventTypes,
+            Set<ServiceType> type) {
+        return getLevel1().discover(elements, eventTypes, type);
+    }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#getLSQueryContent(org.
-        * perfsonar.lsclient.data.HomeLookupService, java.util.Set, 
java.util.Set,
-        * java.util.Set)
-        */
-       public Set<ServiceMeasurementMetadata> getLSQueryContent(
-                       AuthorativeLookupservice aLs, Set<TopologyElement> 
elements,
-                       Set<EventType> eventTypes, Set<ServiceType> type) {
-               return getLevel1().getLSQueryContent(aLs, elements, 
eventTypes, type);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.perfsonar.lsclient.Level1LsClientInterface#getLSQueryContent(org.
+     * perfsonar.lsclient.data.HomeLookupService, java.util.Set, 
java.util.Set,
+     * java.util.Set)
+     */
+    public Set<ServiceMeasurementMetadata> getLSQueryContent(
+            AuthorativeLookupservice aLs, Set<TopologyElement> elements,
+            Set<EventType> eventTypes, Set<ServiceType> type) {
+        return getLevel1().getLSQueryContent(aLs, elements, eventTypes, 
type);
+    }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#getLSQueryLocation(org
-        * .perfsonar.lsclient.data.HomeLookupService, java.util.Set, 
java.util.Set,
-        * java.util.Set)
-        */
-       public Set<Service> getLSQueryLocation(AuthorativeLookupservice aLs,
-                       Set<TopologyElement> elements, Set<EventType> 
eventTypes,
-                       Set<ServiceType> type) {
-               return getLevel1().getLSQueryLocation(aLs, elements, 
eventTypes, type);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.perfsonar.lsclient.Level1LsClientInterface#getLSQueryLocation(org
+     * .perfsonar.lsclient.data.HomeLookupService, java.util.Set, 
java.util.Set,
+     * java.util.Set)
+     */
+    public Set<Service> getLSQueryLocation(AuthorativeLookupservice aLs,
+            Set<TopologyElement> elements, Set<EventType> eventTypes,
+            Set<ServiceType> type) {
+        return getLevel1().getLSQueryLocation(aLs, elements, eventTypes, 
type);
+    }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#setKnownGlobalLookupServices
-        * (java.util.Set)
-        */
-       public void setKnownLookupServices(Set<LookupService> rootServices) {
-               getLevel1().setKnownLookupServices(rootServices);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * 
org.perfsonar.lsclient.Level1LsClientInterface#setKnownGlobalLookupServices
+     * (java.util.Set)
+     */
+    public void setKnownLookupServices(Set<LookupService> rootServices) {
+        getLevel1().setKnownLookupServices(rootServices);
+    }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level1LsClientInterface#startDiscovery(java.util
-        * .Set, java.util.Set, java.util.Set)
-        */
-       public DiscoveryProcess startDiscovery(Set<TopologyElement> elements,
-                       Set<EventType> eventTypes, Set<ServiceType> types) {
-               return getLevel1().startDiscovery(elements, eventTypes, 
types);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * 
org.perfsonar.lsclient.Level1LsClientInterface#startDiscovery(java.util
+     * .Set, java.util.Set, java.util.Set)
+     */
+    public DiscoveryProcess startDiscovery(Set<TopologyElement> elements,
+            Set<EventType> eventTypes, Set<ServiceType> types) {
+        return getLevel1().startDiscovery(elements, eventTypes, types);
+    }
 
-       // -- Level 2 --
+    // -- Level 2 --
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level2LsClientInterface#getContent(java.util.Set,
-        * java.util.Set, java.util.Set)
-        */
-       public Set<ServiceMeasurementMetadata> getContent(
-                       Set<TopologyElement> elements, Set<EventType> 
eventTypes,
-                       Set<ServiceType> type) {
-               return getLevel2().getContent(elements, eventTypes, type);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * 
org.perfsonar.lsclient.Level2LsClientInterface#getContent(java.util.Set,
+     * java.util.Set, java.util.Set)
+     */
+    public Set<ServiceMeasurementMetadata> getContent(
+            Set<TopologyElement> elements, Set<EventType> eventTypes,
+            Set<ServiceType> type) {
+        return getLevel2().getContent(elements, eventTypes, type);
+    }
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * 
org.perfsonar.lsclient.Level2LsClientInterface#getLocation(java.util.Set,
-        * java.util.Set, java.util.Set)
-        */
-       public Set<Service> getLocation(Set<TopologyElement> elements,
-                       Set<EventType> eventTypes, Set<ServiceType> type) {
-               return getLevel2().getLocation(elements, eventTypes, type);
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * 
org.perfsonar.lsclient.Level2LsClientInterface#getLocation(java.util.Set,
+     * java.util.Set, java.util.Set)
+     */
+    public Set<Service> getLocation(Set<TopologyElement> elements,
+            Set<EventType> eventTypes, Set<ServiceType> type) {
+        return getLevel2().getLocation(elements, eventTypes, type);
+    }
 
-    // /*
-    // * (non-Javadoc)
-    // *
-    // * @see
-    // * 
org.perfsonar.lsclient.Level1LsClientInterface#getLSMeasuredInterfaces(
-    // * org.perfsonar.lsclient.data.AuthorativeLookupservice,
-    // * org.perfsonar.lsclient.data.Service)
-    // */
-    // public List<NetworkInterface> getLSMeasuredInterfaces(LookupService 
hls,
-    // Service service) throws LsQueryException {
-    // return getLevel1().getLSMeasuredInterfaces(hls, service);
-    // }
-    //
-    // /*
-    // * (non-Javadoc)
-    // *
-    // * @see
-    // *
-    // 
org.perfsonar.lsclient.Level1LsClientInterface#processLSMeasuredInterfaces
-    // * (org.perfsonar.lsclient.data.LookupService,
-    // * org.perfsonar.lsclient.data.Service,
-    // * org.perfsonar.lsclient.handlers.NetworkInterfaceHandler)
-    // */
-    // public void processLSMeasuredInterfaces(LookupService hls, Service
-    // service,
-    // NetworkInterfaceHandler handler) throws LsQueryException {
-    // getLevel1().processLSMeasuredInterfaces(hls, service, handler);
-    // }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.perfsonar.lsclient.Level1LsClientInterface#getLSQueryContent(org.
+     * perfsonar.lsclient.data.AuthorativeLookupservice,
+     * org.perfsonar.lsclient.data.Service)
+     */
+    public Set<ServiceMeasurementMetadata> getLSQueryContent(
+            AuthorativeLookupservice arg0, Service arg1)
+            throws LsQueryException {
+        return this.getLevel1().getLSQueryContent(arg0, arg1);
+    }
 }