Merge remote-tracking branch 'origin/dev' into dev

sravanr · sravanr · commit e07dbc44bdcb · 2014-11-06T15:00:53.000-08:00
diff --git a/src/main/java/com/marklogic/client/alerting/RuleDefinition.java b/src/main/java/com/marklogic/client/alerting/RuleDefinition.java
@@ -262,12 +262,15 @@ public void write(OutputStream out) throws IOException {
 					"description", RequestConstants.RESTAPI_NS);
 			serializer.writeCharacters(getDescription());
 			serializer.writeEndElement();
+			serializer.flush();
 
 			// logger.debug("Send: " + new String(queryPayload));
 			XMLEventWriter eventWriter = factory.createXMLEventWriter(out);
 			for (XMLEvent event : this.queryPayload) {
 				eventWriter.add(event);
 			}
+			eventWriter.flush();
+			out.flush();
 
 			writeMetadataElement(serializer);
 
diff --git a/src/main/java/com/marklogic/client/eval/ServerEvaluationCall.java b/src/main/java/com/marklogic/client/eval/ServerEvaluationCall.java
@@ -15,6 +15,8 @@
  */
 package com.marklogic.client.eval;
 
+import com.marklogic.client.FailedRequestException;
+import com.marklogic.client.ForbiddenUserException;
 import com.marklogic.client.Transaction;
 import com.marklogic.client.io.marker.AbstractReadHandle;
 import com.marklogic.client.io.marker.AbstractWriteHandle;
@@ -37,7 +39,10 @@ public interface ServerEvaluationCall {
     public ServerEvaluationCall transaction(Transaction transaction);
     public ServerEvaluationCall addNamespace(String prefix, String namespaceURI);
     public ServerEvaluationCall namespaceContext(EditableNamespaceContext namespaces);
-    public <T> T evalAs(Class<T> responseType);
-    public <H extends AbstractReadHandle> H eval(H responseHandle);
-    public EvalResultIterator eval();
+    public <T> T evalAs(Class<T> responseType)
+        throws ForbiddenUserException, FailedRequestException;
+    public <H extends AbstractReadHandle> H eval(H responseHandle)
+        throws ForbiddenUserException, FailedRequestException;
+    public EvalResultIterator eval()
+        throws ForbiddenUserException, FailedRequestException;
 }
diff --git a/src/main/java/com/marklogic/client/impl/JerseyServices.java b/src/main/java/com/marklogic/client/impl/JerseyServices.java
@@ -3642,7 +3642,7 @@ public EvalResult.Type getType() {
 			}
 			String xPrimitive = content.getHeader("X-Primitive");
 			if ( xPrimitive == null ) {
-				return EvalResult.Type.NULL;
+				return EvalResult.Type.OTHER;
 			} else if ( "string".equals(xPrimitive) || "untypedAtomic".equals(xPrimitive) ) {
 				return EvalResult.Type.STRING;
 			} else if ( "boolean".equals(xPrimitive) ) {
@@ -3691,6 +3691,8 @@ public EvalResult.Type getType() {
 				return EvalResult.Type.QNAME;
 			} else if ( "time".equals(xPrimitive) ) {
 				return EvalResult.Type.TIME;
+			} else if ( "null".equals(xPrimitive) ) {
+				return EvalResult.Type.NULL;
 			}
 			return EvalResult.Type.OTHER;
 		}
diff --git a/src/main/java/com/marklogic/client/impl/ServerEvaluationCallImpl.java b/src/main/java/com/marklogic/client/impl/ServerEvaluationCallImpl.java
@@ -18,6 +18,8 @@
 import java.util.HashMap;
 
 import com.marklogic.client.DatabaseClientFactory.HandleFactoryRegistry;
+import com.marklogic.client.FailedRequestException;
+import com.marklogic.client.ForbiddenUserException;
 import com.marklogic.client.Transaction;
 import com.marklogic.client.eval.EvalResultIterator;
 import com.marklogic.client.eval.ServerEvaluationCall;
@@ -131,7 +133,9 @@ public ServerEvaluationCall transaction(Transaction transaction) {
     }
 
     @Override
-    public <T> T evalAs(Class<T> responseType) {
+    public <T> T evalAs(Class<T> responseType) 
+        throws ForbiddenUserException, FailedRequestException
+    {
         if (responseType == null) throw new IllegalArgumentException("responseType cannot be null");
 
         ContentHandle<T> readHandle = handleRegistry.makeHandle(responseType);
@@ -142,7 +146,9 @@ public <T> T evalAs(Class<T> responseType) {
     }
 
     @Override
-    public <H extends AbstractReadHandle> H eval(H responseHandle) {
+    public <H extends AbstractReadHandle> H eval(H responseHandle) 
+        throws ForbiddenUserException, FailedRequestException
+    {
         EvalResultIterator iterator = eval();
         try {
             if ( iterator == null || iterator.hasNext() == false ) return null;
@@ -151,7 +157,9 @@ public <H extends AbstractReadHandle> H eval(H responseHandle) {
     }
 
     @Override
-    public EvalResultIterator eval() {
+    public EvalResultIterator eval() 
+        throws ForbiddenUserException, FailedRequestException
+    {
         return services.postEvalInvoke(requestLogger, code, modulePath, evalContext,
             vars, namespaceContext, transactionId);
     }
diff --git a/src/main/java/com/marklogic/client/pojo/PojoRepository.java b/src/main/java/com/marklogic/client/pojo/PojoRepository.java
@@ -82,112 +82,112 @@ public interface PojoRepository<T, ID extends Serializable> {
      *  serialized JSON format.
      */
     public void write(T entity)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     /** Does everything in {@link #write(Object) write(T)} but also adds your collections to the 
      * persisted instance.
      */
     public void write(T entity, String... collections)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     /** Does everything in {@link #write(Object) write(T)} but in your 
      * <a href="http://docs.marklogic.com/guide/app-dev/transactions">
      * multi-statement transaction</a> context.
      */
     public void write(T entity, Transaction transaction)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     /** Does everything in {@link #write(Object) write(T)} but also adds your collections to the 
      * persisted instance and performs the write in your
      * <a href="http://docs.marklogic.com/guide/app-dev/transactions">
      * multi-statement transaction</a> context.
      * .
      */
     public void write(T entity, Transaction transaction, String... collections)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
 
     /** @return true if a document exists in the database with the id */
     public boolean exists(ID id)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
 
     /** @return in the context of transaction, true if a document exists in the database with 
      * the id */
     public boolean exists(ID id, Transaction transaction)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
 
     /** @return the number of documents of type T persisted in the database */
     public long count()
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
 
     /** @return in the context of transaction, the number of documents of type T persisted in 
      * the database */
     public long count(Transaction transaction)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
 
     /** @return the number of documents of type T persisted in the database with at least 
      * one of the criteria collections*/
     public long count(String... collection)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
 
     /** @return in the context of transaction, the number of documents of type T persisted in 
      * the database with at least one of the criteria collections*/
     public long count(String[] collections, Transaction transaction)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
 
     /** @return the number of documents of type T persisted in the database which match
      * the query */
     public long count(PojoQueryDefinition query)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
   
     /** @return in the context of transaction, the number of documents of type T persisted in the 
      * database which match the query */
     public long count(PojoQueryDefinition query, Transaction transaction)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
   
     /** Deletes from the database the documents with the corresponding ids */
     public void delete(ID... ids)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
 
     /** As part of transaction, deletes from the database the documents with the corresponding ids */
     public void delete(ID[] ids, Transaction transaction)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
 
     /** Deletes from the database all documents of type T persisted by the pojo facade */
     public void deleteAll()
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
 
     /** As part of transaction, deletes from the database all documents of type T persisted by 
      * the pojo facade */
     public void deleteAll(Transaction transaction)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
 
     /* REST API does not currently support DELETE /search with multiple collection arguments
     public void deleteAll(String... collections)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     */
   
     public T read(ID id)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     public T read(ID id, Transaction transaction)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     public PojoPage<T> read(ID[] ids)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     public PojoPage<T> read(ID[] ids, Transaction transaction)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     public PojoPage<T> readAll(long start)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     public PojoPage<T> readAll(long start, Transaction transaction)
-    	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
  
     public PojoPage<T> search(long start, String... collections)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
     public PojoPage<T> search(long start, Transaction transaction, String... collections)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
     public PojoPage<T> search(PojoQueryDefinition query, long start)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
     public PojoPage<T> search(PojoQueryDefinition query, long start, Transaction transaction)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
     public PojoPage<T> search(PojoQueryDefinition query, long start, SearchReadHandle searchHandle)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
     public PojoPage<T> search(PojoQueryDefinition query, long start, SearchReadHandle searchHandle, Transaction transaction)
-    	throws ForbiddenUserException, FailedRequestException;
+        throws ForbiddenUserException, FailedRequestException;
  
     public PojoQueryBuilder<T> getQueryBuilder();
 
diff --git a/src/test/java/com/marklogic/client/test/EvalTest.java b/src/test/java/com/marklogic/client/test/EvalTest.java
@@ -57,7 +57,7 @@ public class EvalTest {
     @BeforeClass
     public static void beforeClass() {
         Common.connectEval();
-        System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
+        //System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
     }
     @AfterClass
     public static void afterClass() {
@@ -326,6 +326,9 @@ private void runAndTest(ServerEvaluationCall call)
             result = results.next();
             assertEquals("myCtsQuery should be Type.OTHER", EvalResult.Type.OTHER, result.getType());
             assertEquals("myCtsQuery should be Format.TEXT", Format.TEXT, result.getFormat());
+            result = results.next();
+            assertEquals("myFunction should be Type.OTHER", EvalResult.Type.OTHER, result.getType());
+            assertEquals("myFunction should be Format.TEXT", Format.TEXT, result.getFormat());
         } finally { results.close(); }
     }
 
diff --git a/src/test/resources/evaltest.xqy b/src/test/resources/evaltest.xqy
@@ -33,11 +33,12 @@ let $myAttribute             := $myElement/@*
 let $myComment               := $myComment/comment() 
 let $myProcessingInstruction := $myProcessingInstruction/processing-instruction() 
 let $myCtsQuery := cts:word-query('a') 
+let $myFunction := xdmp:functions()[2]
 return (
     $test:myString, $myArray, $myObject, $myAnyUri, 
     $myBinary, $myBase64Binary, $myHexBinary, $myDuration, $myQName,
     $myDocument, $myAttribute, $myComment, $myElement, $myProcessingInstruction, $myText, 
     $myBool, $myInteger, $myBigInteger, $myDecimal, $myDouble, $myFloat,
     $myGDay, $myGMonth, $myGMonthDay, $myGYear, $myGYearMonth, $myDate, $myDateTime, $myTime,
-    $myNull, $myCtsQuery
+    $myNull, $myCtsQuery, $myFunction
 )

Original file line number	Diff line number	Diff line change
`@@ -3642,7 +3642,7 @@ public EvalResult.Type getType() {`
`3642`	`3642`	`}`
`3643`	`3643`	`String xPrimitive = content.getHeader("X-Primitive");`
`3644`	`3644`	`if ( xPrimitive == null ) {`
`3645`		`- return EvalResult.Type.NULL;`
	`3645`	`+ return EvalResult.Type.OTHER;`
`3646`	`3646`	`} else if ( "string".equals(xPrimitive) \|\| "untypedAtomic".equals(xPrimitive) ) {`
`3647`	`3647`	`return EvalResult.Type.STRING;`
`3648`	`3648`	`} else if ( "boolean".equals(xPrimitive) ) {`
`@@ -3691,6 +3691,8 @@ public EvalResult.Type getType() {`
`3691`	`3691`	`return EvalResult.Type.QNAME;`
`3692`	`3692`	`} else if ( "time".equals(xPrimitive) ) {`
`3693`	`3693`	`return EvalResult.Type.TIME;`
	`3694`	`+ } else if ( "null".equals(xPrimitive) ) {`
	`3695`	`+ return EvalResult.Type.NULL;`
`3694`	`3696`	`}`
`3695`	`3697`	`return EvalResult.Type.OTHER;`
`3696`	`3698`	`}`