Skip to content

Commit 0b0c2d1

Browse files
authored
Merge pull request #1940 from kkanthet/release/4.2.1
Release/4.2.1
2 parents a785fe9 + 10ebefd commit 0b0c2d1

File tree

85 files changed

+3568
-3468
lines changed

Some content is hidden

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

85 files changed

+3568
-3468
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- QuickStart - mlcp transform_param shows the wrong entity when defining input flow [\#1858](https://github.com/marklogic/marklogic-data-hub/issues/1858)
99
- flow name no longer stored for errors [\#1845](https://github.com/marklogic/marklogic-data-hub/issues/1845)
1010

11+
**Improvement**
12+
- [DHFPROD-1819] - Generate ES-created entity schema
13+
1114

1215
# [v4.2.0](https://github.com/marklogic/marklogic-data-hub/tree/v4.2.0) (2019-02-14)
1316
[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v4.1.1...v4.2.0)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Copyright © 2018 MarkLogic Corporation.
2+
Copyright © 2019 MarkLogic Corporation.
33

44
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
55

NOTICES.txt

Lines changed: 3294 additions & 3294 deletions
Large diffs are not rendered by default.
Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
(:
2-
Copyright 2012-2016 MarkLogic Corporation
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
:)
16-
xquery version "1.0-ml";
17-
18-
module namespace service = "http://marklogic.com/rest-api/resource/providers";
19-
20-
declare namespace es = "http://marklogic.com/entity-services";
21-
22-
declare option xdmp:mapping "false";
23-
24-
(:
25-
Given a patient-id, return the providers for that patient
26-
:)
27-
declare function get(
28-
$context as map:map,
29-
$params as map:map
30-
) as document-node()*
31-
{
32-
let $patient-id as xs:string := map:get($params, "patient-id")
33-
return
34-
document {
35-
/es:envelope/es:headers[patient-ssn = $patient-id]/providers
36-
}
37-
};
1+
(:
2+
Copyright 2012-2019 MarkLogic Corporation
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
:)
16+
xquery version "1.0-ml";
17+
18+
module namespace service = "http://marklogic.com/rest-api/resource/providers";
19+
20+
declare namespace es = "http://marklogic.com/entity-services";
21+
22+
declare option xdmp:mapping "false";
23+
24+
(:
25+
Given a patient-id, return the providers for that patient
26+
:)
27+
declare function get(
28+
$context as map:map,
29+
$params as map:map
30+
) as document-node()*
31+
{
32+
let $patient-id as xs:string := map:get($params, "patient-id")
33+
return
34+
document {
35+
/es:envelope/es:headers[patient-ssn = $patient-id]/providers
36+
}
37+
};

marklogic-data-hub/src/main/java/com/marklogic/hub/collector/DiskQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* * Copyright (c) 2004-2018 MarkLogic Corporation
2+
* * Copyright (c) 2004-2019 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.

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/LoadUserArtifactsCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 MarkLogic Corporation
2+
* copyright 2012-2019 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.

marklogic-data-hub/src/main/java/com/marklogic/hub/entity/DefinitionType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 MarkLogic Corporation
2+
* copyright 2012-2019 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.

marklogic-data-hub/src/main/java/com/marklogic/hub/entity/HubEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 MarkLogic Corporation
2+
* copyright 2012-2019 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.

marklogic-data-hub/src/main/java/com/marklogic/hub/entity/InfoType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 MarkLogic Corporation
2+
* copyright 2012-2019 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.

marklogic-data-hub/src/main/java/com/marklogic/hub/entity/ItemType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 MarkLogic Corporation
2+
* copyright 2012-2019 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.

0 commit comments

Comments
 (0)