perfsonar development work

Author: michael.bischoff
Date: 2008-07-22 19:35:00 -0400 (Tue, 22 Jul 2008)
New Revision: 4275

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/helpers/AbstractLsClient.java
   
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java
Log:
cleanup

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-07-22 23:34:32 UTC (rev 4274)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/Level0LsClientInterface.java
 2008-07-22 23:35:00 UTC (rev 4275)
@@ -30,32 +30,5 @@
         * @throws IllegalArgumentException is thrown if one or arguments are 
null or 
         *                 (this is Optional) the string doesn't contain a 
valid XQuery 
         */
-       InputStream getRawDiscovery(LookupService lookupService, String 
xquery) throws LsQueryException;
-       /**
-        * @param lookupService (should not be null.)
-        * @param xquery A string that should contain a valid XQuery (should 
not be null.)
-        * @return a InputStream of the XQuery result
-        * @throws LsQueryException when there are problems with querying the 
LookupService
-        * @throws IllegalArgumentException is thrown if one or arguments are 
null or 
-        *                 (this is Optional) the string doesn't contain a 
valid XQuery 
-        */
        InputStream getRawQueryResult(LookupService lookupService, String 
xquery) throws LsQueryException;
-       /**
-        * @param lookupService (should not be null.)
-        * @param xquery A string that should contain a valid XQuery (should 
not be null.)
-        * @return a InputStream of the XQuery result
-        * @throws LsQueryException when there are problems with querying the 
LookupService
-        * @throws IllegalArgumentException is thrown if one or arguments are 
null or 
-        *                 (this is Optional) the string doesn't contain a 
valid XQuery 
-        */
-       InputStream getRawSummaryControl(LookupService lookupService, String 
xquery) throws LsQueryException;
-       /**
-        * @param lookupService (should not be null.)
-        * @param xquery A string that should contain a valid XQuery (should 
not be null.)
-        * @return a InputStream of the XQuery result
-        * @throws LsQueryException when there are problems with querying the 
LookupService
-        * @throws IllegalArgumentException is thrown if one or arguments are 
null or 
-        *                 (this is Optional) the string doesn't contain a 
valid XQuery 
-        */
-       InputStream getRawRegistrationControl(LookupService lookupService, 
String xquery) throws LsQueryException;
 }

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-07-22 23:34:32 UTC (rev 4274)
+++ 
trunk/perfsonar_java-lsclient-api/src/main/java/org/perfsonar/lsclient/helpers/AbstractLsClient.java
        2008-07-22 23:35:00 UTC (rev 4275)
@@ -34,29 +34,11 @@
        // -- Level 0 --
 
        /* (non-Javadoc)
-        * @see 
org.perfsonar.lsclient.Level0LsClientInterface#getRawDiscovery(org.perfsonar.lsclient.data.LookupService,
 java.lang.String)
-        */
-       public InputStream getRawDiscovery(LookupService lookupService, 
String xquery) throws LsQueryException, IllegalArgumentException {
-               return getLevel0().getRawDiscovery(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#getRawRegistrationControl(org.perfsonar.lsclient.data.LookupService,
 java.lang.String)
-        */
-       public InputStream getRawRegistrationControl(LookupService 
lookupService, String xquery) throws LsQueryException, 
IllegalArgumentException {
-               return getLevel0().getRawRegistrationControl(lookupService, 
xquery);
-       }
-       /* (non-Javadoc)
-        * @see 
org.perfsonar.lsclient.Level0LsClientInterface#getRawSummaryControl(org.perfsonar.lsclient.data.LookupService,
 java.lang.String)
-        */
-       public InputStream getRawSummaryControl(LookupService lookupService, 
String xquery) throws LsQueryException, IllegalArgumentException {
-               return getLevel0().getRawSummaryControl(lookupService, 
xquery);
-       }
 
        // -- Level 1 --
        

Modified: 
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java
===================================================================
--- 
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java
      2008-07-22 23:34:32 UTC (rev 4274)
+++ 
trunk/perfsonar_java-lsclient-api/src/tck/java/org/perfsonar/lsclient/test/tck/level0/TestNotNull.java
      2008-07-22 23:35:00 UTC (rev 4275)
@@ -14,28 +14,11 @@
        public void lookupTestedImplementation() {
                this.testedImplementation = null;
        }
-       
+               
        @Test(expected = IllegalArgumentException.class)
-       public void testGetRawDiscoveryParameters() throws Exception {
-               testedImplementation.getRawDiscovery(null, "");
-               fail("Should throw a IllegalArgumentException because 
lookupservice is null");
-       }
-       
-       @Test(expected = IllegalArgumentException.class)
        public void testGetRawQueryResultParameters() throws Exception {
                testedImplementation.getRawQueryResult(null, "");
                fail("Should throw a IllegalArgumentException because 
lookupservice is null");
        }
-       
-       @Test(expected = IllegalArgumentException.class)
-       public void testGetRawRegistrationControlParameters() throws 
Exception {
-               testedImplementation.getRawRegistrationControl(null, "");
-               fail("Should throw a IllegalArgumentException because 
lookupservice is null");
-       }
-       
-       @Test(expected = IllegalArgumentException.class)
-       public void testGetRawSummaryControlParameters() throws Exception {
-               testedImplementation.getRawSummaryControl(null, "");
-               fail("Should throw a IllegalArgumentException because 
lookupservice is null");
-       }
+
 }