Skip to content

Commit aa43a81

Browse files
author
ehennum
committed
revert cts.region changes for point release #1263 
1 parent b1dc4f9 commit aa43a81

File tree

3 files changed

+123
-124
lines changed

3 files changed

+123
-124
lines changed

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

+56-34
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,7 @@
1515
*/
1616
package com.marklogic.client.expression;
1717

18-
import com.marklogic.client.type.XsAnyAtomicTypeSeqVal;
19-
import com.marklogic.client.type.XsAnyAtomicTypeVal;
20-
import com.marklogic.client.type.XsDateTimeVal;
21-
import com.marklogic.client.type.XsDoubleVal;
22-
import com.marklogic.client.type.XsQNameSeqVal;
23-
import com.marklogic.client.type.XsQNameVal;
24-
import com.marklogic.client.type.XsStringSeqVal;
25-
import com.marklogic.client.type.XsStringVal;
26-
import com.marklogic.client.type.XsUnsignedLongVal;
27-
28-
import com.marklogic.client.type.ServerExpression;
29-
import com.marklogic.client.type.CtsPeriodExpr;
30-
import com.marklogic.client.type.CtsPeriodSeqExpr;
31-
import com.marklogic.client.type.CtsQueryExpr;
32-
import com.marklogic.client.type.CtsQuerySeqExpr;
33-
import com.marklogic.client.type.CtsReferenceExpr;
34-
import com.marklogic.client.type.CtsReferenceSeqExpr;
35-
import com.marklogic.client.type.CtsRegionExpr;
36-
import com.marklogic.client.type.CtsRegionSeqExpr;
18+
import com.marklogic.client.type.*;
3719

3820
// IMPORTANT: Do not edit. This file is generated.
3921

@@ -120,7 +102,7 @@ public interface CtsExpr {
120102
* @param east The eastern boundary of the box. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
121103
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a> server data type
122104
*/
123-
public ServerExpression box(double south, double west, double north, double east);
105+
public CtsBoxExpr box(double south, double west, double north, double east);
124106
/**
125107
* Returns a geospatial box value.
126108
*
@@ -134,7 +116,7 @@ public interface CtsExpr {
134116
* @param east The eastern boundary of the box. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
135117
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a> server data type
136118
*/
137-
public ServerExpression box(ServerExpression south, ServerExpression west, ServerExpression north, ServerExpression east);
119+
public CtsBoxExpr box(XsDoubleVal south, XsDoubleVal west, XsDoubleVal north, XsDoubleVal east);
138120
/**
139121
* Returns a box's eastern boundary.
140122
*
@@ -145,7 +127,7 @@ public interface CtsExpr {
145127
* @param box The box. (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
146128
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
147129
*/
148-
public ServerExpression boxEast(ServerExpression box);
130+
public ServerExpression boxEast(CtsBoxExpr box);
149131
/**
150132
* Returns a box's northern boundary.
151133
*
@@ -156,7 +138,7 @@ public interface CtsExpr {
156138
* @param box The box. (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
157139
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
158140
*/
159-
public ServerExpression boxNorth(ServerExpression box);
141+
public ServerExpression boxNorth(CtsBoxExpr box);
160142
/**
161143
* Returns a box's southern boundary.
162144
*
@@ -167,7 +149,7 @@ public interface CtsExpr {
167149
* @param box The box. (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
168150
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
169151
*/
170-
public ServerExpression boxSouth(ServerExpression box);
152+
public ServerExpression boxSouth(CtsBoxExpr box);
171153
/**
172154
* Returns a box's western boundary.
173155
*
@@ -178,7 +160,19 @@ public interface CtsExpr {
178160
* @param box The box. (of <a href="{@docRoot}/doc-files/types/cts_box.html">cts:box</a>)
179161
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
180162
*/
181-
public ServerExpression boxWest(ServerExpression box);
163+
public ServerExpression boxWest(CtsBoxExpr box);
164+
/**
165+
* Returns a geospatial circle value.
166+
*
167+
* <a name="ml-server-type-circle"></a>
168+
169+
* <p>
170+
* Provides a client interface to the <a href="http://docs.marklogic.com/cts:circle" target="mlserverdoc">cts:circle</a> server function.
171+
* @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>)
172+
* @param center A point representing the center of the circle. (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
173+
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_circle.html">cts:circle</a> server data type
174+
*/
175+
public CtsCircleExpr circle(double radius, double center);
182176
/**
183177
* Returns a geospatial circle value.
184178
*
@@ -190,7 +184,7 @@ public interface CtsExpr {
190184
* @param center A point representing the center of the circle. (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
191185
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_circle.html">cts:circle</a> server data type
192186
*/
193-
public ServerExpression circle(ServerExpression radius, ServerExpression center);
187+
public CtsCircleExpr circle(XsDoubleVal radius, XsDoubleVal center);
194188
/**
195189
* Returns a circle's center point.
196190
*
@@ -201,7 +195,7 @@ public interface CtsExpr {
201195
* @param circle The circle. (of <a href="{@docRoot}/doc-files/types/cts_circle.html">cts:circle</a>)
202196
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a> server data type
203197
*/
204-
public ServerExpression circleCenter(ServerExpression circle);
198+
public ServerExpression circleCenter(CtsCircleExpr circle);
205199
/**
206200
* Returns a circle's radius.
207201
*
@@ -212,7 +206,7 @@ public interface CtsExpr {
212206
* @param circle The circle. (of <a href="{@docRoot}/doc-files/types/cts_circle.html">cts:circle</a>)
213207
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
214208
*/
215-
public ServerExpression circleRadius(ServerExpression circle);
209+
public ServerExpression circleRadius(CtsCircleExpr circle);
216210
/**
217211
* 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.
218212
* <p>
@@ -263,7 +257,7 @@ public interface CtsExpr {
263257
* @param inner The innner (hole) polygons. (of <a href="{@docRoot}/doc-files/types/cts_polygon.html">cts:polygon</a>)
264258
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_complex-polygon.html">cts:complex-polygon</a> server data type
265259
*/
266-
public ServerExpression complexPolygon(ServerExpression outer, ServerExpression inner);
260+
public CtsPolygonExpr complexPolygon(CtsPolygonExpr outer, CtsPolygonExpr inner);
267261
/**
268262
* Returns a query matching documents in the directories with the given URIs.
269263
* <p>
@@ -2474,7 +2468,7 @@ public interface CtsExpr {
24742468
* @param longitude The longitude of the point. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
24752469
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a> server data type
24762470
*/
2477-
public ServerExpression point(double latitude, double longitude);
2471+
public CtsPointExpr point(double latitude, double longitude);
24782472
/**
24792473
* Returns a point value.
24802474
*
@@ -2486,7 +2480,7 @@ public interface CtsExpr {
24862480
* @param longitude The longitude of the point. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
24872481
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a> server data type
24882482
*/
2489-
public ServerExpression point(ServerExpression latitude, ServerExpression longitude);
2483+
public CtsPointExpr point(XsDoubleVal latitude, XsDoubleVal longitude);
24902484
/**
24912485
* Returns a point's latitude value.
24922486
*
@@ -2497,7 +2491,7 @@ public interface CtsExpr {
24972491
* @param point The point. (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
24982492
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
24992493
*/
2500-
public ServerExpression pointLatitude(ServerExpression point);
2494+
public ServerExpression pointLatitude(CtsPointExpr point);
25012495
/**
25022496
* Returns a point's longitude value.
25032497
*
@@ -2508,7 +2502,7 @@ public interface CtsExpr {
25082502
* @param point The point. (of <a href="{@docRoot}/doc-files/types/cts_point.html">cts:point</a>)
25092503
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_numeric.html">xs:numeric</a> server data type
25102504
*/
2511-
public ServerExpression pointLongitude(ServerExpression point);
2505+
public ServerExpression pointLongitude(CtsPointExpr point);
25122506
/**
25132507
* Returns a geospatial polygon value.
25142508
*
@@ -2519,7 +2513,7 @@ public interface CtsExpr {
25192513
* @param vertices The vertices of the polygon, given in order. No edge may cover more than 180 degrees of either latitude or longitude. The polygon as a whole may not encompass both poles. These constraints are necessary to ensure an unambiguous interpretation of the polygon. There must be at least three vertices. The first vertex should be identical to the last vertex to close the polygon. vertexes. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
25202514
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_polygon.html">cts:polygon</a> server data type
25212515
*/
2522-
public ServerExpression polygon(ServerExpression vertices);
2516+
public CtsPolygonExpr polygon(XsAnyAtomicTypeSeqVal vertices);
25232517
/**
25242518
* Returns a query that matches all documents where query matches document-properties. When searching documents or document-locks, this query type provides a convenient way to additionally constrain the search against document-properties fragments.
25252519
* <p>
@@ -2852,13 +2846,41 @@ public interface CtsExpr {
28522846
* @return a CtsQueryExpr server expression
28532847
*/
28542848
public CtsQueryExpr wordQuery(XsStringSeqVal text, XsStringSeqVal options, XsDoubleVal weight);
2849+
/**
2850+
* Constructs a sequence of CtsBoxExpr items.
2851+
* @param items the CtsBoxExpr items collected by the sequence
2852+
* @return a CtsBoxSeqExpr sequence
2853+
*/
2854+
public CtsBoxSeqExpr boxSeq(CtsBoxExpr... items);
2855+
2856+
/**
2857+
* Constructs a sequence of CtsCircleExpr items.
2858+
* @param items the CtsCircleExpr items collected by the sequence
2859+
* @return a CtsCircleSeqExpr sequence
2860+
*/
2861+
public CtsCircleSeqExpr circleSeq(CtsCircleExpr... items);
2862+
28552863
/**
28562864
* Constructs a sequence of CtsPeriodExpr items.
28572865
* @param items the CtsPeriodExpr items collected by the sequence
28582866
* @return a CtsPeriodSeqExpr sequence
28592867
*/
28602868
public CtsPeriodSeqExpr periodSeq(CtsPeriodExpr... items);
28612869

2870+
/**
2871+
* Constructs a sequence of CtsPointExpr items.
2872+
* @param items the CtsPointExpr items collected by the sequence
2873+
* @return a CtsPointSeqExpr sequence
2874+
*/
2875+
public CtsPointSeqExpr pointSeq(CtsPointExpr... items);
2876+
2877+
/**
2878+
* Constructs a sequence of CtsPolygonExpr items.
2879+
* @param items the CtsPolygonExpr items collected by the sequence
2880+
* @return a CtsPolygonSeqExpr sequence
2881+
*/
2882+
public CtsPolygonSeqExpr polygonSeq(CtsPolygonExpr... items);
2883+
28622884
/**
28632885
* Constructs a sequence of CtsQueryExpr items.
28642886
* @param items the CtsQueryExpr items collected by the sequence

0 commit comments

Comments
 (0)