Skip to content

Commit e8f6d21

Browse files
author
ehennum
committed
#1334 for 10.0-9 server release
1 parent ed5cb77 commit e8f6d21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+759
-400
lines changed

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

Lines changed: 76 additions & 2 deletions
Large diffs are not rendered by default.

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 MarkLogic Corporation
2+
* Copyright (c) 2022 MarkLogic Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package com.marklogic.client.expression;
1718

1819
import com.marklogic.client.type.XsAnyAtomicTypeSeqVal;
@@ -408,6 +409,27 @@ public interface FnExpr {
408409
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_time.html">xs:time</a> server data type
409410
*/
410411
public ServerExpression currentTime();
412+
/**
413+
* Returns an xs:dateTime value created by combining an xs:date and an xs:time.
414+
* <p>
415+
* Provides a client interface to the <a href="http://docs.marklogic.com/fn:dateTime" target="mlserverdoc">fn:dateTime</a> server function.
416+
* @param arg1 The date to be combined with the time argument. (of <a href="{@docRoot}/doc-files/types/xs_date.html">xs:date</a>)
417+
* @param arg2 The time to be combined with the date argument. (of <a href="{@docRoot}/doc-files/types/xs_time.html">xs:time</a>)
418+
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_dateTime.html">xs:dateTime</a> server data type
419+
*/
420+
public ServerExpression dateTime(ServerExpression arg1, String arg2);
421+
/**
422+
* Returns an xs:dateTime value created by combining an xs:date and an xs:time.
423+
*
424+
* <a name="ml-server-type-dateTime"></a>
425+
426+
* <p>
427+
* Provides a client interface to the <a href="http://docs.marklogic.com/fn:dateTime" target="mlserverdoc">fn:dateTime</a> server function.
428+
* @param arg1 The date to be combined with the time argument. (of <a href="{@docRoot}/doc-files/types/xs_date.html">xs:date</a>)
429+
* @param arg2 The time to be combined with the date argument. (of <a href="{@docRoot}/doc-files/types/xs_time.html">xs:time</a>)
430+
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_dateTime.html">xs:dateTime</a> server data type
431+
*/
432+
public ServerExpression dateTime(ServerExpression arg1, ServerExpression arg2);
411433
/**
412434
* Returns an xs:integer between 1 and 31, both inclusive, representing the day component in the localized value of arg.
413435
*

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 MarkLogic Corporation
2+
* Copyright (c) 2022 MarkLogic Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package com.marklogic.client.expression;
1718

1819
import com.marklogic.client.type.CtsBoxExpr;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 MarkLogic Corporation
2+
* Copyright (c) 2022 MarkLogic Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package com.marklogic.client.expression;
1718

1819
import com.marklogic.client.type.XsBooleanVal;

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 MarkLogic Corporation
2+
* Copyright (c) 2022 MarkLogic Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package com.marklogic.client.expression;
1718

1819
import com.marklogic.client.type.XsBooleanVal;
@@ -123,4 +124,22 @@ public interface MapExpr {
123124
* @return a server expression with the <a href="{@docRoot}/doc-files/types/map_map.html">map:map</a> server data type
124125
*/
125126
public ServerExpression map(ServerExpression map);
127+
/**
128+
* Constructs a new map by combining the keys from the maps given as an argument. If a given key exists in more than one argument map, the value from the last such map is used.
129+
*
130+
* <a name="ml-server-type-new"></a>
131+
132+
* <p>
133+
* Provides a client interface to the <a href="http://docs.marklogic.com/map:new" target="mlserverdoc">map:new</a> server function.
134+
* @return a server expression with the <a href="{@docRoot}/doc-files/types/map_map.html">map:map</a> server data type
135+
*/
136+
public ServerExpression newExpr();
137+
/**
138+
* Constructs a new map by combining the keys from the maps given as an argument. If a given key exists in more than one argument map, the value from the last such map is used.
139+
* <p>
140+
* Provides a client interface to the <a href="http://docs.marklogic.com/map:new" target="mlserverdoc">map:new</a> server function.
141+
* @param maps The argument maps. (of <a href="{@docRoot}/doc-files/types/map_map.html">map:map</a>)
142+
* @return a server expression with the <a href="{@docRoot}/doc-files/types/map_map.html">map:map</a> server data type
143+
*/
144+
public ServerExpression newExpr(ServerExpression maps);
126145
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 MarkLogic Corporation
2+
* Copyright (c) 2022 MarkLogic Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package com.marklogic.client.expression;
1718

1819
import com.marklogic.client.type.XsAnyAtomicTypeSeqVal;

0 commit comments

Comments
 (0)