perfsonar development work

Author: michael.bischoff
Date: 2008-10-18 09:45:50 -0400 (Sat, 18 Oct 2008)
New Revision: 4629

Added:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
   
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/AssertIllegalArgumentContract.java
Removed:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java
   
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java
Modified:
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.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/Level2LsClientInterface.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/LookupService.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/TopologyElement.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
   
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
Log:


Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
 2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
 2008-10-18 13:45:50 UTC (rev 4629)
@@ -40,5 +40,5 @@
         * @throws IllegalArgumentException is thrown if one or arguments are 
null or 
         *                 (this is Optional) the string doesn't contain a 
valid XQuery 
         */
-       InputStream getDiscoveryResponse(LookupService lookupService, String 
summaryDescription) throws LsQueryException;
+       InputStream getRawDiscoveryResponse(LookupService lookupService, 
String summaryDescription) throws LsQueryException;
 }

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
 2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level1LsClientInterface.java
 2008-10-18 13:45:50 UTC (rev 4629)
@@ -6,7 +6,7 @@
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.LookupService;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
-import org.perfsonar.lsclient.data.ServiceMetadata;
+import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
 
@@ -61,9 +61,9 @@
         */
        DiscoveryProcess startDiscovery(Set<TopologyElement> elements, 
Set<EventType> eventTypes, Set<ServiceType> types);
        /**
-        * Given some parameters this method returns a set of 
{@link
 ServiceMetadata}
+        * Given some parameters this method returns a set of 
{@link
 Service}
         * that is retrieved from a home lookup service. It returns all 
-        * 
{@link
 ServiceMetadata} of services that knows something about the 
+        * 
{@link
 Service} of services that knows something about the 
         * specified parameters. More formally it should be interpreted as 
         * any(topologyElement) AND any(eventType) AND any(serviceType) where 
any() 
         * is true if one or more of the elements within the specified set 
are 
@@ -79,11 +79,11 @@
         * 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<ServiceMetadata> getLSQueryLocation(AuthorativeLookupservice hls, 
Set<TopologyElement> elements, Set<EventType> eventTypes, Set<ServiceType> 
types);
+       Set<Service> getLSQueryLocation(AuthorativeLookupservice hls, 
Set<TopologyElement> elements, Set<EventType> eventTypes, Set<ServiceType> 
types);
        /** 
         * Given some parameters this method returns a set of 
         * 
{@link
 ServiceMeasurementMetadata} that is retrieved from a home lookup 
-        * service. It returns all 
{@link
 ServiceMetadata} of services that knows 
+        * service. It returns all 
{@link
 Service} of services that knows 
         * something about the specified parameters. More formally it should 
be 
         * interpreted as any(topologyElement) AND any(eventType) AND 
         * any(serviceType) where any() is true if one or more of the 
elements 

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
 2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level2LsClientInterface.java
 2008-10-18 13:45:50 UTC (rev 4629)
@@ -4,7 +4,7 @@
 
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
-import org.perfsonar.lsclient.data.ServiceMetadata;
+import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
 
@@ -26,7 +26,7 @@
         * @see Level1LsClientInterface#discover(Set, Set, Set)
         * @see 
Level1LsClientInterface#getLSQueryLocation(org.perfsonar.lsclient.data.AuthorativeLookupservice,
 Set, Set, Set)
         */
-       Set<ServiceMetadata> getLocation(Set<TopologyElement> elements, 
Set<EventType> eventTypes, Set<ServiceType> type);
+       Set<Service> getLocation(Set<TopologyElement> elements, 
Set<EventType> eventTypes, Set<ServiceType> type);
        /**
         * discovers home lookup services that have content about the 
specified parameters
         * it then queries each home lookup service and aggregates the data.

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/LookupService.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/LookupService.java
      2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/LookupService.java
      2008-10-18 13:45:50 UTC (rev 4629)
@@ -2,6 +2,6 @@
 
 import java.net.URI;
 
-public interface LookupService extends Comparable<LookupService> {
+public interface LookupService extends Service {
        URI getEndPoint();
 }

Copied: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
 (from rev 4599, 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java)


Property changes on: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/Service.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
 2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMeasurementMetadata.java
 2008-10-18 13:45:50 UTC (rev 4629)
@@ -1,9 +1,11 @@
 package org.perfsonar.lsclient.data;
 
+import java.util.Set;
+
 /**
  * @author michael.bischoff
  * This contains the information blob that services can register when they 
register themselves
  */
 public interface ServiceMeasurementMetadata {
- //TODO
+       Set<TopologyElement> getTopologyElements();
 }

Deleted: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/ServiceMetadata.java

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/TopologyElement.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/TopologyElement.java
    2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/data/TopologyElement.java
    2008-10-18 13:45:50 UTC (rev 4629)
@@ -4,5 +4,4 @@
 
 public interface TopologyElement {
        URI getURI();
-       void setURI(URI uri);
 }

Modified: 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
  2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLevel2.java
  2008-10-18 13:45:50 UTC (rev 4629)
@@ -9,7 +9,7 @@
 import org.perfsonar.lsclient.data.AuthorativeLookupservice;
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
-import org.perfsonar.lsclient.data.ServiceMetadata;
+import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
 
@@ -45,9 +45,9 @@
        /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level2LsClientInterface#getLocation(java.util.Set, 
java.util.Set, java.util.Set)
         */
-       public Set<ServiceMetadata> getLocation(Set<TopologyElement> 
elements, Set<EventType> eventTypes, Set<ServiceType> type) {
+       public Set<Service> getLocation(Set<TopologyElement> elements, 
Set<EventType> eventTypes, Set<ServiceType> type) {
                Set<AuthorativeLookupservice> authorativeLSes = 
level1.discover(elements, eventTypes, type);
-               Set<ServiceMetadata> result = new 
HashSet<ServiceMetadata>(authorativeLSes.size()*4);
+               Set<Service> result = new 
HashSet<Service>(authorativeLSes.size()*4);
                for(AuthorativeLookupservice authorativeLS : authorativeLSes) 
{
                        
result.addAll(level1.getLSQueryLocation(authorativeLS, elements, eventTypes, 
type));
                }               

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
        2008-10-15 14:44:21 UTC (rev 4628)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2008-10-18 13:45:50 UTC (rev 4629)
@@ -13,7 +13,7 @@
 import org.perfsonar.lsclient.data.EventType;
 import org.perfsonar.lsclient.data.LookupService;
 import org.perfsonar.lsclient.data.ServiceMeasurementMetadata;
-import org.perfsonar.lsclient.data.ServiceMetadata;
+import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
 
@@ -43,8 +43,8 @@
         /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level0LsClientInterface#getRawQueryResult(org.perfsonar.lsclient.data.LookupService,
 java.lang.String)
         */
-       public InputStream getDiscoveryResponse(LookupService lookupService, 
String summaryDescription) throws LsQueryException {
-               return getLevel0().getDiscoveryResponse(lookupService, 
summaryDescription);
+       public InputStream getRawDiscoveryResponse(LookupService 
lookupService, String summaryDescription) throws LsQueryException {
+               return getLevel0().getRawDiscoveryResponse(lookupService, 
summaryDescription);
        }
 
        // -- Level 1 --
@@ -64,7 +64,7 @@
        /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level1LsClientInterface#getLSQueryLocation(org.perfsonar.lsclient.data.HomeLookupService,
 java.util.Set, java.util.Set, java.util.Set)
         */
-       public Set<ServiceMetadata> 
getLSQueryLocation(AuthorativeLookupservice aLs, Set<TopologyElement> 
elements, Set<EventType> eventTypes,  Set<ServiceType> type) {
+       public Set<Service> getLSQueryLocation(AuthorativeLookupservice aLs, 
Set<TopologyElement> elements, Set<EventType> eventTypes,  Set<ServiceType> 
type) {
                return getLevel1().getLSQueryLocation(aLs, elements, 
eventTypes, type);
        }
        /* (non-Javadoc)
@@ -91,7 +91,7 @@
        /* (non-Javadoc)
         * @see 
org.perfsonar.lsclient.Level2LsClientInterface#getLocation(java.util.Set, 
java.util.Set, java.util.Set)
         */
-       public Set<ServiceMetadata> getLocation(Set<TopologyElement> 
elements, Set<EventType> eventTypes, Set<ServiceType> type) {
+       public Set<Service> getLocation(Set<TopologyElement> elements, 
Set<EventType> eventTypes, Set<ServiceType> type) {
                return getLevel2().getLocation(elements, eventTypes, type);
        }
 }

Copied: 
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/AssertIllegalArgumentContract.java
 (from rev 4599, 
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java)

Deleted: 
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java