bug:21777 list query options in queryOptionsManager

git-svn-id: svn+ssh://svn.marklogic.com/project/engsvn/client-api/java/branches/b1_0@140992 62cac252-8da6-4816-9e9d-6dc37b19578c

Author: cgreer

src/main/java/com/marklogic/client/admin/QueryOptionsManager.java

@@ -15,6 +15,8 @@
  */
 package com.marklogic.client.admin;
 
+import com.marklogic.client.io.StringHandle;
+import com.marklogic.client.io.marker.QueryOptionsListReadHandle;
 import com.marklogic.client.io.marker.QueryOptionsReadHandle;
 import com.marklogic.client.io.marker.QueryOptionsWriteHandle;
 
@@ -52,5 +54,12 @@ public interface QueryOptionsManager {
      */
     public void deleteOptions(String name);
 
+    /**
+     * Retrieves the list of available named query options.
+     * @param listHandle a handle for reading the list of name options
+     * @return the handle populated with the names
+     */
+    public <T extends QueryOptionsListReadHandle> T optionsList(T listHandle);
+
 
 }

src/main/java/com/marklogic/client/impl/QueryOptionsManagerImpl.java

@@ -15,8 +15,10 @@
  */
 package com.marklogic.client.impl;
 
+import com.marklogic.client.Transaction;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.admin.QueryOptionsManager;
+import com.marklogic.client.io.marker.QueryOptionsListReadHandle;
 import com.marklogic.client.io.marker.QueryOptionsReadHandle;
 import com.marklogic.client.io.marker.QueryOptionsWriteHandle;
 
@@ -96,4 +98,26 @@ public void writeOptions(String name,
 
 		services.putValue(requestLogger, QUERY_OPTIONS_BASE, name, mimetype, queryOptionsBase);
 	}
+
+	@Override
+    public <T extends QueryOptionsListReadHandle> T optionsList(T optionsHandle) {
+		    	HandleImplementation optionsBase = HandleAccessor.checkHandle(optionsHandle, "optionslist");
+
+		        Format optionsFormat = optionsBase.getFormat();
+		        switch(optionsFormat) {
+		        case UNKNOWN:
+		        	optionsFormat = Format.XML;
+		        	break;
+		        case JSON:
+		        case XML:
+		        	break;
+		        default:
+		            throw new UnsupportedOperationException("Only XML and JSON options list results are possible.");
+		        }
+
+		        String mimetype = optionsFormat.getDefaultMimetype();
+
+		        optionsBase.receiveContent(services.optionsList(optionsBase.receiveAs(), mimetype, null));
+		        return optionsHandle;
+		    }
 }

src/main/java/com/marklogic/client/query/QueryManager.java

@@ -327,10 +327,10 @@ public enum QueryView {
 
     /**
      * Retrieves the list of available named query options.
-     * @param valueHandle a handle for reading the list of name options
+     * @param listHandle a handle for reading the list of name options
      * @return the handle populated with the names
      */
-    public <T extends QueryOptionsListReadHandle> T optionsList(T valueHandle);
+    public <T extends QueryOptionsListReadHandle> T optionsList(T listHandle);
 
     /**
      * Retrieves the list of available named query options.

src/test/java/com/marklogic/client/test/QueryOptionsListHandleTest.java

@@ -33,7 +33,9 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import com.marklogic.client.admin.QueryOptionsManager;
 import com.marklogic.client.io.QueryOptionsListHandle;
+import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.query.QueryManager;
 
 public class QueryOptionsListHandleTest {
@@ -74,6 +76,23 @@ public void serverOptionsList() throws IOException, ParserConfigurationException
         assertEquals("Map should contain two keys", map.size(), 2);
         assertEquals("photos should have this uri", map.get("photos"), "/v1/config/query/photos");
     }
+    
+    @Test
+    public void serverOptionsListRaw() throws IOException, ParserConfigurationException, SAXException {
+        QueryManager queryMgr = Common.client.newQueryManager();
+        QueryOptionsManager queryOptionsMgr = Common.client.newServerConfigManager().newQueryOptionsManager();
+
+        StringHandle results = queryMgr.optionsList(new StringHandle());
+        assertNotNull(results);
+        String resultsString = results.get();
+        assertNotNull(resultsString);
+        
+        StringHandle results2 = queryOptionsMgr.optionsList(new StringHandle());
+        assertNotNull(results2);
+        assertEquals(resultsString, results2.get());
+        assertNotNull(resultsString);
+        
+    }
 
 
     public class MyQueryOptionsListHandle extends QueryOptionsListHandle {