DHFPROD-2673: New NOTICE.txt from Legal (#2671) (#2672)

* DHFPROD-2673 New NOTICE.txt from Legal (#2671)

Switched to singular (NOTICE) again. The old rename seems to be undone.

* DHFPROD-2449: Headers and triples no longer contain empty XML elements

Also moved buildInvokeHookOptions into a directory based on its module name

* update page object

* update verification

* add await

* undo the wrong lines

* Updated Changelog and ReadMe (#2674)

* Updated release branch

* Release/5.0.0 (#2478)

* updated Read me and Contributing for the release 5.0

* updated change log for 5.0.0

* Update README.md

Co-Authored-By: Akshay Sonvane <[email protected]>

* Update marklogic-data-hub/src/main/resources/scaffolding/build_gradle

Co-Authored-By: Akshay Sonvane <[email protected]>

* Update marklogic-data-hub/src/main/resources/scaffolding/build_gradle

Co-Authored-By: Akshay Sonvane <[email protected]>

* updated font

* Updated the spaces

* Updated the spaces

* Updated the spaces

* Updated the spaces

* Updated the spaces

* Updated the spaces

* Updated the spaces

* updated gradle org and vcs url

* missing file (#2676)

* Update CHANGELOG.md (#2675)

adding change log for 5.0.1

Author: SameeraPriyathamTadikonda

CHANGELOG.md

@@ -1,44 +1,48 @@
-# MarkLogic Data Hub
-
-Go from nothing to an Operational Data Hub in a matter of minutes.  
-
-The MarkLogic Data Hub Framework is a data integration framework and toolset to quickly and efficiently integrate data from many sources into a single MarkLogic database and then expose that data.
-
-# Version Support
-MarkLogic 9.0-5 or later is required with version 4.0.0+ of the DHF.
-
-# Getting Started
-Grab the [latest release](https://github.com/marklogic/marklogic-data-hub/releases) then visit our [Data Hub Framework website](https://marklogic.github.io/marklogic-data-hub/) to get started.
-
-
-## Advanced Hub Usage
-Ready to go beyond the Developer QuickStart and start using DHF in your own Java or Gradle project? The [Data Hub Framework website](https://marklogic.github.io/marklogic-data-hub/) also provides that.
-
-## Don't get this code
-You don't need to checkout this repo unless you plan to actively contribute changes to the Data Hub Framework. Go to [our website](https://marklogic.github.io/marklogic-data-hub/) to get started with DHF.
-
-If you really do want to contribute, see our [Contributing Guide](https://github.com/marklogic/marklogic-data-hub/blob/master/CONTRIBUTING.md) to get started.
-
-# Support
-
-The MarkLogic Data Hub Framework is maintained by [MarkLogic][marklogic] 
-Engineering and is made available under the [Apache License 2.0][apache]. _The 
-Data Hub Framework core Java libraries and gradle commands are supported 
-software for production use with MarkLogic Server. The QuickStart UI is 
-designed for use in a development environment and is not currently supported 
-for production use._ Everyone is encouraged to file bug reports, feature 
-requests, and pull requests through [GitHub][issues]. This input is critical 
-and will be carefully considered. However, we can't promise a specific 
-resolution or timeframe for any request. In addition, MarkLogic provides 
-technical support for [release tags][releases] of the MarkLogic Data Hub 
-Framework to licensed customers under the terms outlined in the [MarkLogic 
-Technical Support Handbook][handbook]. Customers with an active maintenance 
-contract can sign up for MarkLogic Technical Support on our 
-[support portal][support].
-
-[marklogic]: https://www.marklogic.com/
-[apache]: https://www.apache.org/licenses/LICENSE-2.0
-[issues]: https://github.com/marklogic/marklogic-data-hub/issues
-[releases]: https://github.com/marklogic/marklogic-data-hub/releases
-[handbook]: http://www.marklogic.com/files/Mark_Logic_Support_Handbook.pdf
-[support]: https://help.marklogic.com/
+# MarkLogic Data Hub
+
+Go from nothing to an Operational Data Hub in a matter of minutes.
+
+MarkLogic Data Hub is a data integration platform and toolset that helps you quickly and efficiently integrate data from many sources into a single MarkLogic database and then expose that data.
+
+
+# Version Support
+
+For Data Hub version 5.0, you need:
+
+  - MarkLogic 9.0-7 or later
+  - Gradle 4.6 or later
+  - Java JDK 8 or later
+
+
+# Getting Started
+Grab the [latest release](https://github.com/marklogic/marklogic-data-hub/releases). Visit our [Data Hub website](https://docs.marklogic.com/datahub/) to get started.
+
+
+## Advanced Hub Usage
+You can also go beyond the QuickStart app and start using Data Hub in your own Java or Gradle project. Visit our [Data Hub website](https://docs.marklogic.com/datahub/) for more information.
+
+
+## Contribute
+You do not need to download the code in the repository to use MarkLogic Data Hub.
+
+If you would like to plan to actively contribute changes to the Data Hub.
+
+If you really do want to contribute, see our [Contributing Guide](https://github.com/marklogic/marklogic-data-hub/blob/master/CONTRIBUTING.md) to get started.
+
+
+# Support
+The MarkLogic Data Hub is maintained by [MarkLogic][marklogic] Engineering and is made available under the [Apache License 2.0][apache].
+
+_The Data Hub core Java libraries and Gradle commands are supported software for production use with MarkLogic Server. QuickStart is designed for use in a development environment and is not currently supported for production use._
+
+Everyone is encouraged to file bug reports, feature requests, and pull requests through [GitHub][issues]. This input is critical and will be carefully considered. However, we cannot promise a specific resolution or timeframe for any request.
+
+In addition, MarkLogic provides technical support for [release tags][releases] of MarkLogic Data Hub to licensed customers under the terms outlined in the [MarkLogic Technical Support Handbook][handbook]. Customers with an active maintenance contract can sign up for MarkLogic Technical Support on our [support portal][support].
+
+
+[marklogic]: https://www.marklogic.com/
+[apache]: https://www.apache.org/licenses/LICENSE-2.0
+[issues]: https://github.com/marklogic/marklogic-data-hub/issues
+[releases]: https://github.com/marklogic/marklogic-data-hub/releases
+[handbook]: http://www.marklogic.com/files/Mark_Logic_Support_Handbook.pdf
+[support]: https://help.marklogic.com/

CONTRIBUTING.md

@@ -531,15 +531,21 @@ class FlowUtils {
 
   getHeaders(doc) {
     let headers = fn.head(doc.xpath('/*:envelope/*:headers'));
-    if(fn.count(headers) === 0) {
+    if (fn.count(headers) === 0) {
+      headers = null;
+    }
+    else if (fn.count(fn.head(doc.xpath('/*:envelope/*:headers/*'))) == 0) {
       headers = null;
     }
     return headers;
   }
 
   getTriples(doc) {
     let triples = doc.xpath('/*:envelope/*:triples');
-    if(fn.count(triples) === 0) {
+    if (fn.count(triples) === 0) {
+      triples = null;
+    }
+    else if (fn.count(fn.head(doc.xpath('/*:envelope/*:triples/*'))) == 0) {
       triples = null;
     }
     return triples;

NOTICE.txt

@@ -1,36 +1,37 @@
-buildscript {
-  repositories {
-    maven {url 'http://developer.marklogic.com/maven2/'}
-  }
-}
-
-plugins {
-    id 'java'
-    id 'eclipse'
-    id 'idea'
-
-    // This plugin allows you to create different environments
-    // for your gradle deploy. Each environment is represented
-    // by a gradle-${env}.properties file
-    // See https://github.com/stevesaliman/gradle-properties-plugin
-    // specify the env on the command line with:
-    // gradle -PenvironmentName=x ...
-    id 'net.saliman.properties' version '1.4.6'
-
-    // This gradle plugin extends the ml-gradle plugin with
-    // commands that make the Data Hub Framework do its magic
-    id 'com.marklogic.ml-data-hub' version '5.0-SNAPSHOT'
-}
-
-repositories {
-    jcenter()
-    maven {url 'http://developer.marklogic.com/maven2/'}
-}
-
-dependencies {
-    // this allows you to write custom java code that depends
-    // on the Data Hub Framework library
-    compile 'com.marklogic:marklogic-data-hub:5.0-SNAPSHOT'
-    compile 'com.marklogic:marklogic-xcc:9.0.7'
-}
-
+buildscript {
+  repositories {
+    maven {url 'http://developer.marklogic.com/maven2/'}
+  }
+}
+
+plugins {
+    id 'java'
+    id 'eclipse'
+    id 'idea'
+
+    // This plugin allows you to create different environments
+    // for your gradle deploy. Each environment is represented
+    // by a gradle-${env}.properties file
+    // See https://github.com/stevesaliman/gradle-properties-plugin
+    // specify the env on the command line with:
+    // gradle -PenvironmentName=x ...
+    id 'net.saliman.properties' version '1.4.6'
+
+    // This gradle plugin extends the ml-gradle plugin with
+    // commands that make the Data Hub Framework do its magic
+    id 'com.marklogic.ml-data-hub' version '5.0-SNAPSHOT'
+}
+
+repositories {
+    jcenter()
+    maven {url 'http://developer.marklogic.com/maven2/'}
+}
+
+dependencies {
+    // this allows you to write custom java code that depends
+    // on the Data Hub Framework library
+    compile 'com.marklogic:marklogic-data-hub:5.0-SNAPSHOT'
+    compile 'com.marklogic:marklogic-xcc:9.0.7'
+}
+
+

NOTICES.txt

@@ -0,0 +1,29 @@
+const test = require("/test/test-helper.xqy");
+
+const FlowUtils = require("/data-hub/5/impl/flow-utils.sjs");
+const flowUtils = new FlowUtils();
+
+const results = [];
+
+function getHeadersFromXml(xml) {
+  return flowUtils.getHeaders(fn.head(xdmp.unquote(xml)));
+}
+
+let headers = getHeadersFromXml('<envelope xmlns="http://marklogic.com/entity-services"><headers></headers></envelope>');
+results.push(test.assertEqual(null, headers));
+
+headers = getHeadersFromXml('<envelope xmlns="http://marklogic.com/entity-services"><headers><hello>world</hello></headers></envelope>');
+results.push(test.assertEqual(
+  '<headers xmlns="http://marklogic.com/entity-services"><hello>world</hello></headers>',
+  xdmp.quote(headers)
+));
+
+headers = flowUtils.getHeaders(xdmp.toJSON({"envelope": {"headers": {}}}));
+results.push(test.assertEqual(null, headers));
+
+headers = flowUtils.getHeaders(xdmp.toJSON({"envelope": {"headers": {"hello": "world"}}}));
+results.push(test.assertEqual("world", xs.string(headers.hello)));
+
+results;
+
+

README.md

@@ -0,0 +1,59 @@
+const test = require("/test/test-helper.xqy");
+
+const FlowUtils = require("/data-hub/5/impl/flow-utils.sjs");
+const flowUtils = new FlowUtils();
+
+const results = [];
+
+function getTriplesFromXml(xml) {
+  return flowUtils.getTriples(fn.head(xdmp.unquote(xml)));
+}
+
+let triples = getTriplesFromXml('<envelope xmlns="http://marklogic.com/entity-services"><triples></triples></envelope>');
+results.push(test.assertEqual(null, triples));
+
+// We don't need real triples inside the "triples" element, just need at least one element to verify that it's returned
+triples = getTriplesFromXml('<envelope xmlns="http://marklogic.com/entity-services">' +
+  '<triples><test/></triples>' +
+  '</envelope>');
+results.push(test.assertEqual(
+  '<triples xmlns="http://marklogic.com/entity-services"><test/></triples>',
+  xdmp.quote(triples)
+));
+
+triples = flowUtils.getTriples(xdmp.toJSON({"envelope": {"triples": {}}}));
+results.push(test.assertEqual(null, triples));
+
+triples = flowUtils.getTriples(xdmp.toJSON({
+  "envelope": {
+    "triples": [
+      {
+        "triple": {
+          "subject": "s1",
+          "predicate": "p1",
+          "object": "o1"
+        }
+      },
+      {
+        "triple": {
+          "subject": "s2",
+          "predicate": "p2",
+          "object": "o2"
+        }
+      }
+    ]
+  }
+})).toArray();
+
+results.push(
+  test.assertEqual("s1", xs.string(triples[0].triple.subject)),
+  test.assertEqual("p1", xs.string(triples[0].triple.predicate)),
+  test.assertEqual("o1", xs.string(triples[0].triple.object)),
+  test.assertEqual("s2", xs.string(triples[1].triple.subject)),
+  test.assertEqual("p2", xs.string(triples[1].triple.predicate)),
+  test.assertEqual("o2", xs.string(triples[1].triple.object))
+);
+
+results;
+
+