Merge branch 'release-5.5.2'

Author: itsshivaverma

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 5.5.2
+#### New Functionality
+- [#1329](https://github.com/marklogic/java-client-api/issues/1329) - Inspect information about columns in the plan before execution - Server release 10.0-9 or above required
+
+#### Improvements and Bug Fixes
+- [#1335](https://github.com/marklogic/java-client-api/issues/1335) - Project description on Maven Central corrected
+
 ## 5.5.1
 #### New Functionality
 - [#1296](https://github.com/marklogic/java-client-api/issues/1296) - Type anyDocument support for data service - Server release 10.0-7 or above required

NOTICE.txt

@@ -1,6 +1,6 @@
 MarkLogic® Java Client API
 
-Copyright © 2021 MarkLogic Corporation. MarkLogic and the MarkLogic logo are trademarks or registered trademarks of MarkLogic Corporation in the United States and other countries.  All other trademarks are the property of their respective owners.
+Copyright © 2022 MarkLogic Corporation. MarkLogic and the MarkLogic logo are trademarks or registered trademarks of MarkLogic Corporation in the United States and other countries.  All other trademarks are the property of their respective owners.
 
 This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at
 
@@ -10,9 +10,8 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 To the extent required by the applicable open source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by MarkLogic. To obtain such source code, send an email to legal@marklogic.com. Please specify the product and version for which you are requesting source code.
 
-The following software may be included in this project (last updated September 17, 2021):
+The following software may be included in this project (last updated January 15, 2022):
 
- 
 @angular-mdl/core 6.0.1
 Attribution Statements
 http://mseemann.io/angular2-mdl/
@@ -554,6 +553,17 @@ Copyright (C) 2017, The Apache Software Foundation
 License Text (http://spdx.org/licenses/Apache-2.0)
 Made available under the Apache License 2.0. See Appendix for full text.
 
+Source materials are available for download at: https://github.com/apache/httpcomponents-client
+Apache HttpComponents™ HttpClient 4.5.13
+Attribution Statements
+http://hc.apache.org/httpcomponents-client
+
+Copyright Statements
+Copyright (C) 2021, The Apache Software Foundation
+
+License Text (http://www.apache.org/licenses/LICENSE-2.0.txt)
+Made available under the Apache License 2.0. See Appendix for full text.
+
 Source materials are available for download at: https://github.com/apache/httpcomponents-client
 Apache HttpComponents™ HttpClient 4.5.3
 Attribution Statements
@@ -667,7 +677,7 @@ License Text (http://spdx.org/licenses/Apache-2.0)
 Made available under the Apache License 2.0. See Appendix for full text.
 
 Source materials are available for download at: https://github.com/apache/jena/tree/master/jena-iri
-Apache Log4j 2™ 2.11
+Apache Log4j 2™ 2.17.1
 Attribution Statements
 https://logging.apache.org/log4j/2.x/
 
@@ -687,7 +697,7 @@ picocli (http://picocli.info)
 Copyright 2017 Remko Popma
 
 Copyright Statements
-Copyright (C) 2018, The Apache Software Foundation
+Copyright (C) 2022, The Apache Software Foundation
 
 License Text (http://spdx.org/licenses/Apache-2.0.html)
 Made available under the Apache License 2.0. See Appendix for full text.
@@ -1787,6 +1797,17 @@ License Text (http://spdx.org/licenses/MIT)
 Made available under the MIT License. See Appendix for full text.
 
 Source materials are available for download at: https://github.com/trentm/node-bunyan
+Cascader
+Attribution Statements
+https://github.com/react-component/cascader
+
+Copyright Statements
+Copyright (c) 2014-present alipay.com
+
+License Text (http://spdx.org/licenses/MIT)
+Made available under the MIT License. See Appendix for full text.
+
+Source materials are available for download at: https://github.com/react-component/cascader
 Chai 4.2.0
 Attribution Statements
 https://www.chaijs.com/
@@ -1992,6 +2013,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Source materials are available for download at: https://github.com/dom4j/dom4j
+duplexify
+Attribution Statements
+https://github.com/mafintosh/duplexify
+
+Copyright Statements
+Copyright (c) 2014 Mathias Buus
+
+License Text (http://spdx.org/licenses/MIT)
+Made available under the MIT License. See Appendix for full text.
+
+Source materials are available for download at: https://github.com/mafintosh/duplexify
 EasyMock 3.4
 Attribution Statements
 http://easymock.org/
@@ -2951,7 +2983,18 @@ Copyright ©2009 FasterXML, LLC
 License Text (http://spdx.org/licenses/Apache-2.0)
 Made available under the Apache License 2.0. See Appendix for full text.
 
-Source materials are available for download at: http://github.com/FasterXML/jackson
+Source materials are available for download at: https://github.com/FasterXML/jackson-annotations
+Jackson Annotations 2.11.0
+Attribution Statements
+http://wiki.fasterxml.com/JacksonHome
+
+Copyright Statements
+Copyright ©2009 FasterXML, LLC
+
+License Text (http://spdx.org/licenses/Apache-2.0)
+Made available under the Apache License 2.0. See Appendix for full text.
+
+Source materials are available for download at: https://github.com/FasterXML/jackson-annotations
 Jackson Core 2.10.3
 Attribution Statements
 http://wiki.fasterxml.com/JacksonHome
@@ -5705,6 +5748,17 @@ Copyright (c) 2004-2007 QOS.ch. All rights reserved.
 License Text (http://spdx.org/licenses/MIT)
 Made available under the MIT License. See Appendix for full text.
 
+Source materials are available for download at: https://github.com/qos-ch/slf4j/tree/master/slf4j-api
+SLF4J 1.7.32
+Attribution Statements
+http://www.slf4j.org
+
+Copyright Statements
+Copyright (c) 2004-2007 QOS.ch. All rights reserved.
+
+License Text (http://spdx.org/licenses/MIT)
+Made available under the MIT License. See Appendix for full text.
+
 Source materials are available for download at: https://github.com/qos-ch/slf4j/tree/master/slf4j-api
 SockJS-client 1.3.0
 Attribution Statements
@@ -5762,6 +5816,17 @@ License Text (http://spdx.org/licenses/Apache-2.0)
 Made available under the Apache License 2.0. See Appendix for full text.
 
 Source materials are available for download at: https://github.com/spring-projects/spring-framework
+Stream to Array
+Attribution Statements
+https://github.com/stream-utils/stream-to-array#readme
+
+Copyright Statements
+Copyright (c) 2014 Jonathan Ong me@jongleberry.com
+
+License Text (http://spdx.org/licenses/MIT)
+Made available under the MIT License. See Appendix for full text.
+
+Source materials are available for download at: https://github.com/stream-utils/stream-to-array#readme
 Sunlight 1.22.0
 Attribution Statements
 http://sunlightjs.com/
@@ -6250,6 +6315,7 @@ Made available under the MIT License. See Appendix for full text.
 
 Source materials are available for download at: https://github.com/angular/zone.js
 
+
 
 Appendix
 
@@ -6575,14 +6641,14 @@ Creative Commons may be contacted at http://creativecommons.org/.
 Do What The F*ck You Want To Public License
 https://spdx.org/licenses/WTFPL.html
 
-DO WHAT THE F*CK YOU WANT TO PUBLIC LICENSE
+DO WHAT THE F*CK YOU WANT TO PUBLIC LICENSE 
 Version 2, December 2004
 
 Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
 
 Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long as the name is changed.
 
-DO WHAT THE F*CK YOU WANT TO PUBLIC LICENSE
+DO WHAT THE F*CK YOU WANT TO PUBLIC LICENSE 
 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 0. You just DO WHAT THE F*CK YOU WANT TO.

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=5.5.1
-releaseVersion=5.5.1
+version=5.5.2
+releaseVersion=5.5.2
 describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentFormat.java

@@ -26,6 +26,7 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import com.marklogic.client.Transaction;
 import org.custommonkey.xmlunit.exceptions.XpathException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -48,11 +49,95 @@ public class TestDocumentFormat extends BasicJavaClientREST {
   private static String[] fNames = { "TestDocumentFormat-1" };
 
   @BeforeClass
-  public static void setUp() throws Exception
-  {
+  public static void setUp() throws Exception {
     System.out.println("In setup");
-
     configureRESTServer(dbName, fNames);
+    // Create a user with minimal privs and test doc exists in a transaction.
+    createRESTUser("userInTrans", "x", "rest-writer");
+  }
+
+  @Test
+  public void testExistsInTransMinPrivs() throws KeyManagementException, NoSuchAlgorithmException, IOException, ParserConfigurationException, SAXException, XpathException
+  {
+    System.out.println("Running testExistsInTransMinPrivs");
+    DatabaseClient client1 = null;
+    try {
+      String filename = "json-original.json";
+      String uri1 = "/DocExistsInTransMinimalPriv/";
+
+      // user with minimal privs.
+      client1 = getDatabaseClient("userInTrans", "x", getConnType());
+
+      // create doc manager
+      DocumentManager docMgr1 = client1.newDocumentManager();
+      Transaction t1 = client1.openTransaction();
+
+      File file = new File("src/test/java/com/marklogic/client/functionaltest/data/" + filename);
+
+      // create a handle on the content
+      FileHandle handle = new FileHandle(file);
+      handle.set(file);
+
+      handle.setFormat(Format.JSON);
+
+      // create docIds
+      String docId1 = uri1 + filename;
+      docMgr1.write(docId1, handle);
+      String expectedUri1 = uri1 + filename;
+
+      String docUri1 = docMgr1.exists(expectedUri1, t1).getUri();
+      assertEquals("URI is not found", expectedUri1, docUri1);
+      t1.rollback();
+    }
+    catch(Exception ex) {
+      System.out.println(ex.getMessage());
+    } finally {
+      // release the clients
+      if (client1 != null)
+        client1.release();
+    }
+  }
+
+  @Test
+  public void testExistsInTransWithPrivs() throws KeyManagementException, NoSuchAlgorithmException, IOException, ParserConfigurationException, SAXException, XpathException
+  {
+    System.out.println("Running testExistsInTransWithPrivs");
+    DatabaseClient client2 = null;
+    try {
+      String filename = "json-original.json";
+      String uri2 = "/DocExistsTransWithPrivs/";
+
+      // user with privs.
+      client2 = getDatabaseClient("rest-writer", "x", getConnType());
+
+      // create doc manager
+      DocumentManager docMgr2 = client2.newDocumentManager();
+      Transaction t2 = client2.openTransaction();
+
+      File file = new File("src/test/java/com/marklogic/client/functionaltest/data/" + filename);
+
+      // create a handle on the content
+      FileHandle handle = new FileHandle(file);
+      handle.set(file);
+
+      handle.setFormat(Format.JSON);
+
+      // create docIds
+      String docId2 = uri2 + filename;
+      docMgr2.write(docId2, handle);
+
+      String expectedUri2 = uri2 + filename;
+      String docUri2 = docMgr2.exists(expectedUri2, t2).getUri();
+      assertEquals("URI is not found", expectedUri2, docUri2);
+      t2.rollback();
+    }
+    catch(Exception ex) {
+      System.out.println(ex.getMessage());
+    } finally {
+      // release the clients
+      if (client2 != null)
+        client2.release();
+    }
   }
 
   @Test
@@ -118,8 +203,7 @@ public void testJSONFormatOnXML() throws KeyManagementException, NoSuchAlgorithm
     String exception = "";
     String expectedException = "";
 
-    try
-    {
+    try {
       docMgr.write(docId, handle);
     } catch (Exception e) {
       exception = e.toString();
@@ -405,13 +489,11 @@ public void testXMLFormatOnBinary() throws KeyManagementException, NoSuchAlgorit
     String exception = "";
     String expectedException = "";
 
-    try
-    {
+    try {
       docMgr.write(docId, handle);
     } catch (Exception e) {
       exception = e.toString();
     }
-
     boolean isExceptionThrown = exception.contains(expectedException);
     assertTrue("Exception is not thrown", isExceptionThrown);
 
@@ -447,8 +529,7 @@ public void testJSONFormatOnBinary() throws KeyManagementException, NoSuchAlgori
     String exception = "";
     String expectedException = "";
 
-    try
-    {
+    try {
       docMgr.write(docId, handle);
     } catch (Exception e) {
       exception = e.toString();
@@ -489,8 +570,7 @@ public void testTextFormatOnBinary() throws KeyManagementException, NoSuchAlgori
     String exception = "";
     String expectedException = "";
 
-    try
-    {
+    try {
       docMgr.write(docId, handle);
     } catch (Exception e) {
       exception = e.toString();
@@ -601,8 +681,7 @@ public void testJSONFormatOnText() throws KeyManagementException, NoSuchAlgorith
     String exception = "";
     String expectedException = "";
 
-    try
-    {
+    try {
       docMgr.write(docId, handle);
     } catch (Exception e) {
       exception = e.toString();
@@ -667,19 +746,14 @@ public void testNegativeJSONFormatWithDOMHandle() throws KeyManagementException,
 
     Document readDoc = expectedXMLDocument(filename);
 
-    // File file = new
-    // File("src/test/java/com/marklogic/client/functionaltest/data/" +
-    // filename);
-
     // create a handle on the content
     DOMHandle handle = new DOMHandle();
     handle.set(readDoc);
 
     String exception = "";
     String expectedException = "java.lang.IllegalArgumentException: DOMHandle supports the XML format only";
 
-    try
-    {
+    try {
       handle.setFormat(Format.JSON);
     } catch (IllegalArgumentException e) {
       exception = e.toString();
@@ -697,5 +771,6 @@ public static void tearDown() throws Exception
   {
     System.out.println("In tear down");
     cleanupRESTServer(dbName, fNames);
+    deleteRESTUser("userInTrans");
   }
 }

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLexicons.java

@@ -416,7 +416,7 @@ public void testJoinInnerWithInnerDocfromLexicons() throws KeyManagementExceptio
     assertEquals("Element 3 (myCity) in date incorrect", "1999-04-22", jsonInnerDocNodes.get(2).path("myCity.date").path("value").asText());
     assertEquals("Element 4 (myCity) in date incorrect", "2006-06-23", jsonInnerDocNodes.get(3).path("myCity.date").path("value").asText());
 
-    // Verify lasst result, since records are ordered.
+    // Verify last result, since records are ordered.
     assertEquals("Element 5 (myCity) in date incorrect", "2007-01-01", jsonInnerDocNodes.get(4).path("myCity.date").path("value").asText());
     assertEquals("Element 5 (myCity) in URI1 incorrect", "/optic/lexicon/test/doc1.json", jsonInnerDocNodes.get(4).path("myCity.uri1").path("value").asText());
     assertEquals("Element 5 (myCity) in distance incorrect", "50.4", jsonInnerDocNodes.get(4).path("myCity.distance").path("value").asText());