Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 5216eb5

Browse files
authored
Merge pull request #156 from marklogic-community/bug/DHFPROD-9443
DHFPROD-9443: Lowercase Permission Capability value when using tde.templateBatchInsert
2 parents 4b7af0e + 1d0b3e2 commit 5216eb5

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

src/main/java/com/marklogic/client/ext/schemasloader/impl/DefaultSchemasLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private String buildTdeBatchInsertQuery(List<DocumentFile> documentFiles) {
155155
Set<DocumentMetadataHandle.Capability> values = documentPermissions.get(key);
156156
values.forEach(value -> permissionList.add(String.format("xdmp.permission('%s', '%s')", key, value)));
157157
});
158-
String permissions = "[".concat(permissionList.stream().collect(Collectors.joining(", "))).concat("]");
158+
String permissions = "[".concat(permissionList.stream().map(String::toLowerCase).collect(Collectors.joining(", "))).concat("]");
159159

160160
// Collections
161161
List<String> collectionsList = new ArrayList<>();

src/test/java/com/marklogic/client/ext/schemasloader/impl/LoadSchemasTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.marklogic.client.ext.batch.RestBatchWriter;
44
import com.marklogic.client.ext.file.DocumentFile;
55
import com.marklogic.client.ext.helper.ClientHelper;
6+
import com.marklogic.client.io.DocumentMetadataHandle;
67
import org.junit.jupiter.api.Test;
78

89
import java.nio.file.Paths;
@@ -43,5 +44,17 @@ public void testTemplateBatchInsert() {
4344
assertEquals(2, uris.size());
4445
assertTrue(uris.contains("/tde/good-schema.json"));
4546
assertTrue(uris.contains("/tde/good-schema.xml"));
47+
48+
DocumentMetadataHandle handle = helper.getMetadata("/tde/good-schema.json");
49+
assertTrue(handle.getPermissions().get("rest-reader").contains(DocumentMetadataHandle.Capability.READ),
50+
"Permissions defined in permissions.properties should be applied on the document");
51+
assertTrue(handle.getPermissions().get("rest-writer").contains(DocumentMetadataHandle.Capability.UPDATE),
52+
"Permissions defined in permissions.properties should be applied on the document");
53+
54+
handle = helper.getMetadata("/tde/good-schema.xml");
55+
assertTrue(handle.getPermissions().get("rest-reader").contains(DocumentMetadataHandle.Capability.READ),
56+
"Permissions defined in permissions.properties should be applied on the document");
57+
assertTrue(handle.getPermissions().get("rest-writer").contains(DocumentMetadataHandle.Capability.UPDATE),
58+
"Permissions defined in permissions.properties should be applied on the document");
4659
}
4760
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*=rest-reader,read,rest-writer,update

0 commit comments

Comments
 (0)