Skip to content

Commit 1d8657d

Browse files
sammeffordsammefford
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents c44a589 + 9b148df commit 1d8657d

18 files changed

+1810
-1409
lines changed

‎src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java‎

Lines changed: 1170 additions & 1050 deletions
Large diffs are not rendered by default.

‎test-complete/src/test/java/com/marklogic/javaclient/ConnectedRESTQA.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void createDB(String dbName) {
5757
new UsernamePasswordCredentials("admin", "admin"));
5858

5959
HttpPost post = new HttpPost("http://localhost:8002"+ "/manage/v2/databases?format=json");
60-
String JSONString = "[{\"name\":\""+ dbName + "\"}]";
60+
String JSONString = "[{\"database-name\":\""+ dbName + "\"}]";
6161

6262
post.addHeader("Content-type", "application/json");
6363
post.setEntity( new StringEntity(JSONString));
@@ -364,7 +364,7 @@ public static void createUserRolesWithPrevilages(String roleName, String... priv
364364
ArrayNode roleArray = mapper.createArrayNode();
365365
ArrayNode privArray = mapper.createArrayNode();
366366
ArrayNode permArray = mapper.createArrayNode();
367-
mainNode.put("name",roleName);
367+
mainNode.put("role-name",roleName);
368368
mainNode.put("description", "role discription");
369369

370370
for(String rolename: roleNames)
@@ -434,7 +434,7 @@ public static void createRESTUser(String usrName, String pass, String... roleNam
434434
ObjectNode mainNode = mapper.createObjectNode();
435435
// ObjectNode childNode = mapper.createObjectNode();
436436
ArrayNode childArray = mapper.createArrayNode();
437-
mainNode.put("name",usrName);
437+
mainNode.put("user-name",usrName);
438438
mainNode.put("description", "user discription");
439439
mainNode.put("password", pass);
440440
for(String rolename: roleNames)
@@ -531,7 +531,7 @@ public static void createRESTUserWithPermissions(String usrName, String pass,Obj
531531
ObjectNode mainNode = mapper.createObjectNode();
532532
// ObjectNode childNode = mapper.createObjectNode();
533533
ArrayNode childArray = mapper.createArrayNode();
534-
mainNode.put("name",usrName);
534+
mainNode.put("user-name",usrName);
535535
mainNode.put("description", "user discription");
536536
mainNode.put("password", pass);
537537
for(String rolename: roleNames)
@@ -1616,10 +1616,15 @@ public static void updateTemporalCollectionForLSQT(String dbName, String collect
16161616
ObjectMapper mapper = new ObjectMapper();
16171617
ObjectNode rootNode = mapper.createObjectNode();
16181618
rootNode.put( "lsqt-enabled", enable);
1619+
1620+
// Set system time values
1621+
ObjectNode automation = mapper.createObjectNode();
1622+
automation.put("enabled", true);
1623+
1624+
rootNode.set("automation", automation);
16191625

16201626
System.out.println(rootNode.toString());
16211627

1622-
16231628
DefaultHttpClient client = new DefaultHttpClient();
16241629
client.getCredentialsProvider().setCredentials(
16251630
new AuthScope("localhost", 8002),

‎test-complete/src/test/java/com/marklogic/javaclient/TestAppServicesValueConstraint.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testWildcard() throws IOException, ParserConfigurationException, SAX
7575
assertXpathEvaluatesTo("0026", "string(//*[local-name()='result'][1]//*[local-name()='id'])", resultDoc);
7676
assertXpathEvaluatesTo("0012", "string(//*[local-name()='result'][2]//*[local-name()='id'])", resultDoc);
7777

78-
String expectedSearchReport = "(cts:search(fn:collection(), cts:or-query((cts:element-value-query(fn:QName(\"\",\"id\"), \"00*2\", (\"lang=en\"), 1), cts:element-value-query(fn:QName(\"\",\"id\"), \"0??6\", (\"lang=en\"), 1))), (\"score-logtfidf\"), 1))[1 to 10]";
78+
String expectedSearchReport = "(cts:search(fn:collection(), cts:or-query((cts:element-value-query(fn:QName(\"\",\"id\"), \"00*2\", (\"lang=en\"), 1), cts:element-value-query(fn:QName(\"\",\"id\"), \"0??6\", (\"lang=en\"), 1)), ()), (\"score-logtfidf\",cts:score-order(\"descending\")), 1))[1 to 10]";
7979

8080
assertXpathEvaluatesTo(expectedSearchReport, "string(//*[local-name()='report'])", resultDoc);
8181

@@ -121,7 +121,7 @@ public void testGoogleStyleGrammar() throws IOException, ParserConfigurationExce
121121
assertXpathEvaluatesTo("0113", "string(//*[local-name()='result'][1]//*[local-name()='id'])", resultDoc);
122122
assertXpathEvaluatesTo("0026", "string(//*[local-name()='result'][2]//*[local-name()='id'])", resultDoc);
123123

124-
String expectedSearchReport = "(cts:search(fn:collection(), cts:or-query((cts:element-value-query(fn:QName(\"\",\"title\"), \"The memex\", (\"lang=en\"), 1), cts:and-query((cts:element-value-query(fn:QName(\"\",\"id\"), \"0113\", (\"lang=en\"), 1), cts:element-value-query(fn:QName(\"http://purl.org/dc/elements/1.1/\",\"date\"), \"2007-03-03\", (\"lang=en\"), 1)), ()))), (\"score-logtfidf\"), 1))[1 to 10]";
124+
String expectedSearchReport = "(cts:search(fn:collection(), cts:or-query((cts:element-value-query(fn:QName(\"\",\"title\"), \"The memex\", (\"lang=en\"), 1), cts:and-query((cts:element-value-query(fn:QName(\"\",\"id\"), \"0113\", (\"lang=en\"), 1), cts:element-value-query(fn:QName(\"http://purl.org/dc/elements/1.1/\",\"date\"), \"2007-03-03\", (\"lang=en\"), 1)), ())), ()), (\"score-logtfidf\",cts:score-order(\"descending\")), 1))[1 to 10]";
125125

126126
assertXpathEvaluatesTo(expectedSearchReport, "string(//*[local-name()='report'])", resultDoc);
127127

@@ -164,7 +164,7 @@ public void testWithoutIndexSettingsAndNS() throws IOException, ParserConfigurat
164164
assertXpathEvaluatesTo("1", "string(//*[local-name()='result'][last()]//@*[local-name()='index'])", resultDoc);
165165
assertXpathEvaluatesTo("0012", "string(//*[local-name()='result'][1]//*[local-name()='id'])", resultDoc);
166166

167-
String expectedSearchReport = "(cts:search(fn:collection(), cts:element-value-query(fn:QName(\"\",\"id\"), \"0012\", (\"lang=en\"), 1), (\"score-logtfidf\"), 1))[1 to 10]";
167+
String expectedSearchReport = "(cts:search(fn:collection(), cts:element-value-query(fn:QName(\"\",\"id\"), \"0012\", (\"lang=en\"), 1), (\"score-logtfidf\",cts:score-order(\"descending\")), 1))[1 to 10]";
168168

169169
assertXpathEvaluatesTo(expectedSearchReport, "string(//*[local-name()='report'])", resultDoc);
170170

@@ -206,7 +206,7 @@ public void testWithIndexSettingsAndNS() throws IOException, ParserConfiguration
206206
assertXpathEvaluatesTo("1", "string(//*[local-name()='result'][last()]//@*[local-name()='index'])", resultDoc);
207207
assertXpathEvaluatesTo("2007-03-03", "string(//*[local-name()='result'][1]//*[local-name()='date'])", resultDoc);
208208

209-
String expectedSearchReport = "(cts:search(fn:collection(), cts:element-value-query(fn:QName(\"http://purl.org/dc/elements/1.1/\",\"date\"), \"2007-03-03\", (\"lang=en\"), 1), (\"score-logtfidf\"), 1))[1 to 10]";
209+
String expectedSearchReport = "(cts:search(fn:collection(), cts:element-value-query(fn:QName(\"http://purl.org/dc/elements/1.1/\",\"date\"), \"2007-03-03\", (\"lang=en\"), 1), (\"score-logtfidf\",cts:score-order(\"descending\")), 1))[1 to 10]";
210210

211211
assertXpathEvaluatesTo(expectedSearchReport, "string(//*[local-name()='report'])", resultDoc);
212212

@@ -250,7 +250,7 @@ public void testSpaceSeparated() throws IOException, ParserConfigurationExceptio
250250
assertXpathEvaluatesTo("Vannevar Bush", "string(//*[local-name()='result']//*[local-name()='title'])", resultDoc);
251251
assertXpathEvaluatesTo("0.1", "string(//*[local-name()='result']//@*[local-name()='amt'])", resultDoc);
252252

253-
String expectedSearchReport = "(cts:search(fn:collection(), cts:and-query((cts:element-value-query(fn:QName(\"\",\"title\"), \"Vannevar Bush\", (\"lang=en\"), 1), cts:element-attribute-value-query(fn:QName(\"http://cloudbank.com\",\"price\"), fn:QName(\"\",\"amt\"), \"0.1\", (\"lang=en\"), 1)), ()), (\"score-logtfidf\"), 1))[1 to 10]";
253+
String expectedSearchReport = "(cts:search(fn:collection(), cts:and-query((cts:element-value-query(fn:QName(\"\",\"title\"), \"Vannevar Bush\", (\"lang=en\"), 1), cts:element-attribute-value-query(fn:QName(\"http://cloudbank.com\",\"price\"), fn:QName(\"\",\"amt\"), \"0.1\", (\"lang=en\"), 1)), ()), (\"score-logtfidf\",cts:score-order(\"descending\")), 1))[1 to 10]";
254254

255255
assertXpathEvaluatesTo(expectedSearchReport, "string(//*[local-name()='report'])", resultDoc);
256256

0 commit comments

Comments
 (0)