##1311 synch master with develop

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java

@@ -168,7 +168,7 @@ public interface CtsExpr {
   * @param box  The box.  (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression boxEast(CtsBoxExpr box);
+  public ServerExpression boxEast(ServerExpression box);
 /**
   * Returns a box's northern boundary.
   *
@@ -179,7 +179,7 @@ public interface CtsExpr {
   * @param box  The box.  (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression boxNorth(CtsBoxExpr box);
+  public ServerExpression boxNorth(ServerExpression box);
 /**
   * Returns a box's southern boundary.
   *
@@ -190,7 +190,7 @@ public interface CtsExpr {
   * @param box  The box.  (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression boxSouth(CtsBoxExpr box);
+  public ServerExpression boxSouth(ServerExpression box);
 /**
   * Returns a box's western boundary.
   *
@@ -201,17 +201,7 @@ public interface CtsExpr {
   * @param box  The box.  (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression boxWest(CtsBoxExpr box);
-  /**
-   * Returns a geospatial circle value.
-   *
-   * <p>
-   * Provides a client interface to the <a href="http://docs.marklogic.com/cts:circle" target="mlserverdoc">cts:circle</a> server function.
-   * @param radius  The radius of the circle. The units for the radius is determined at runtime by the query options (miles is currently the only option).  (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
-   * @param center  A point representing the center of the circle.  (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
-   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/cts_circle.html">cts:circle</a> server data type
-   */
-  public CtsCircleExpr circle(double radius, double center);
+  public ServerExpression boxWest(ServerExpression box);
 /**
   * Returns a geospatial circle value.
   * <p>
@@ -254,7 +244,7 @@ public interface CtsExpr {
   * @param circle  The circle.  (of <a href="{@docRoot}/doc-files/types/cts_circle.html">cts:circle</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression circleRadius(CtsCircleExpr circle);
+  public ServerExpression circleRadius(ServerExpression circle);
 /**
   * Match documents in at least one of the specified collections. It will match both documents and properties documents in the collections with the given URIs.
   * <p>
@@ -2677,7 +2667,7 @@ public interface CtsExpr {
   * @param point  The point.  (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression pointLatitude(CtsPointExpr point);
+  public ServerExpression pointLatitude(ServerExpression point);
 /**
   * Returns a point's longitude value.
   *
@@ -2688,7 +2678,7 @@ public interface CtsExpr {
   * @param point  The point.  (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
   * @return  a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
   */
-  public ServerExpression pointLongitude(CtsPointExpr point);
+  public ServerExpression pointLongitude(ServerExpression point);
 /**
   * Returns a geospatial polygon value.
   *
@@ -3057,20 +3047,6 @@ public interface CtsExpr {
   */
   public CtsBoxSeqExpr boxSeq(CtsBoxExpr... items);
 
-/**
-  * Constructs a sequence of CtsCircleExpr items.
-  * @param items  the CtsCircleExpr items collected by the sequence
-  * @return  a CtsCircleSeqExpr sequence
-  */
-  public CtsCircleSeqExpr circleSeq(CtsCircleExpr... items);
- 
-/**
-  * Constructs a sequence of CtsBoxExpr items.
-  * @param items  the CtsBoxExpr items collected by the sequence
-  * @return  a CtsBoxSeqExpr sequence
-  */
-  public CtsBoxSeqExpr boxSeq(CtsBoxExpr... items);
-
 /**
   * Constructs a sequence of CtsCircleExpr items.
   * @param items  the CtsCircleExpr items collected by the sequence

marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java

@@ -148,7 +148,7 @@ public CtsBoxExpr box(ServerExpression south, ServerExpression west, ServerExpre
 
 
   @Override
-  public ServerExpression boxEast(CtsBoxExpr box) {
+  public ServerExpression boxEast(ServerExpression box) {
     if (box == null) {
       throw new IllegalArgumentException("box parameter for boxEast() cannot be null");
     }
@@ -157,7 +157,7 @@ public ServerExpression boxEast(CtsBoxExpr box) {
 
 
   @Override
-  public ServerExpression boxNorth(CtsBoxExpr box) {
+  public ServerExpression boxNorth(ServerExpression box) {
     if (box == null) {
       throw new IllegalArgumentException("box parameter for boxNorth() cannot be null");
     }
@@ -166,7 +166,7 @@ public ServerExpression boxNorth(CtsBoxExpr box) {
 
 
   @Override
-  public ServerExpression boxSouth(CtsBoxExpr box) {
+  public ServerExpression boxSouth(ServerExpression box) {
     if (box == null) {
       throw new IllegalArgumentException("box parameter for boxSouth() cannot be null");
     }
@@ -175,13 +175,14 @@ public ServerExpression boxSouth(CtsBoxExpr box) {
 
 
   @Override
-  public ServerExpression boxWest(CtsBoxExpr box) {
+  public ServerExpression boxWest(ServerExpression box) {
     if (box == null) {
       throw new IllegalArgumentException("box parameter for boxWest() cannot be null");
     }
     return new XsExprImpl.NumericCallImpl("cts", "box-west", new Object[]{ box });
   }
 
+
   @Override
   public CtsCircleExpr circle(double radius, ServerExpression center) {
     return circle(xs.doubleVal(radius), center);
@@ -210,7 +211,7 @@ public CtsPointExpr circleCenter(ServerExpression circle) {
 
 
   @Override
-  public ServerExpression circleRadius(CtsCircleExpr circle) {
+  public ServerExpression circleRadius(ServerExpression circle) {
     if (circle == null) {
       throw new IllegalArgumentException("circle parameter for circleRadius() cannot be null");
     }
@@ -1764,7 +1765,7 @@ public CtsPointExpr point(ServerExpression latitude, ServerExpression longitude)
 
 
   @Override
-  public ServerExpression pointLatitude(CtsPointExpr point) {
+  public ServerExpression pointLatitude(ServerExpression point) {
     if (point == null) {
       throw new IllegalArgumentException("point parameter for pointLatitude() cannot be null");
     }
@@ -1773,7 +1774,7 @@ public ServerExpression pointLatitude(CtsPointExpr point) {
 
 
   @Override
-  public ServerExpression pointLongitude(CtsPointExpr point) {
+  public ServerExpression pointLongitude(ServerExpression point) {
     if (point == null) {
       throw new IllegalArgumentException("point parameter for pointLongitude() cannot be null");
     }