MLE-24171 TDE loader no longer improperly lowercases role names

Author: rjrudin

ml-javaclient-util/src/main/java/com/marklogic/client/ext/schemasloader/impl/DefaultSchemasLoader.java

@@ -152,9 +152,9 @@ private String buildTdeBatchInsertQuery(List<DocumentFile> documentFiles) {
 			List<String> permissionList = new ArrayList<>();
 			documentPermissions.keySet().forEach(key -> {
 				Set<DocumentMetadataHandle.Capability> values = documentPermissions.get(key);
-				values.forEach(value -> permissionList.add(String.format("xdmp.permission('%s', '%s')", key, value)));
+				values.forEach(value -> permissionList.add(String.format("xdmp.permission('%s', '%s')", key, value.toString().toLowerCase())));
 			});
-			String permissions = "[".concat(permissionList.stream().map(String::toLowerCase).collect(Collectors.joining(", "))).concat("]");
+			String permissions = "[".concat(permissionList.stream().collect(Collectors.joining(", "))).concat("]");
 
 			// Collections
 			List<String> collectionsList = new ArrayList<>();

ml-javaclient-util/src/test/java/com/marklogic/client/ext/schemasloader/impl/LoadSchemasTest.java

@@ -12,15 +12,14 @@
 
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class LoadSchemasTest extends AbstractSchemasTest {
+class LoadSchemasTest extends AbstractSchemasTest {
 
 	@Test
-	public void test() {
+	void test() {
 		DefaultSchemasLoader loader = new DefaultSchemasLoader(client, null);
 		RestBatchWriter writer = (RestBatchWriter) loader.getBatchWriter();
 		assertEquals(1, writer.getThreadCount(), "Should default to 1 so that any error from loading a document " +
@@ -42,7 +41,7 @@ public void test() {
 	}
 
 	@Test
-	public void testTemplateBatchInsert() {
+	void testTemplateBatchInsert() {
 		DefaultSchemasLoader loader = new DefaultSchemasLoader(client, newContentClient());
 		List<DocumentFile> files = loader.loadSchemas(Paths.get("src", "test", "resources", "good-schemas", "originals").toString());
 		assertEquals(2, files.size());
@@ -53,21 +52,20 @@ public void testTemplateBatchInsert() {
 		assertTrue(uris.contains("/tde/good-schema.json"));
 		assertTrue(uris.contains("/tde/good-schema.xml"));
 
-		DocumentMetadataHandle handle = helper.getMetadata("/tde/good-schema.json");
-		assertTrue(handle.getPermissions().get("rest-reader").contains(DocumentMetadataHandle.Capability.READ),
-			"Permissions defined in permissions.properties should be applied on the document");
-		assertTrue(handle.getPermissions().get("rest-writer").contains(DocumentMetadataHandle.Capability.UPDATE),
-			"Permissions defined in permissions.properties should be applied on the document");
 
-		handle = helper.getMetadata("/tde/good-schema.xml");
-		assertTrue(handle.getPermissions().get("rest-reader").contains(DocumentMetadataHandle.Capability.READ),
-			"Permissions defined in permissions.properties should be applied on the document");
-		assertTrue(handle.getPermissions().get("rest-writer").contains(DocumentMetadataHandle.Capability.UPDATE),
-			"Permissions defined in permissions.properties should be applied on the document");
+		Stream.of("/tde/good-schema.json", "/tde/good-schema.xml").forEach(uri -> {
+			DocumentMetadataHandle.DocumentPermissions perms = helper.getMetadata(uri).getPermissions();
+			String message = "Permissions defined in permissions.properties should be applied on the document";
+			assertTrue(perms.get("rest-reader").contains(DocumentMetadataHandle.Capability.READ), message);
+			assertTrue(perms.get("rest-writer").contains(DocumentMetadataHandle.Capability.UPDATE), message);
+			assertTrue(perms.get("Mixed-CASE").contains(DocumentMetadataHandle.Capability.READ),
+				"This feature from its inception through 6.0.0 was improperly lower-casing not just the " +
+					"capability but also the role name. Role names should not be lower-cased.");
+		});
 	}
 
 	@Test
-	public void invalidClientAndNoFilesToLoad() {
+	void invalidClientAndNoFilesToLoad() {
 		DefaultSchemasLoader loader = new DefaultSchemasLoader(newClient("invalid-database-doesnt-exist"), null);
 		List<DocumentFile> files = loader.loadSchemas(Paths.get("src", "test", "resources", "no-schemas").toString());
 		assertEquals(0, files.size(),
@@ -76,7 +74,7 @@ public void invalidClientAndNoFilesToLoad() {
 	}
 
 	@Test
-	public void invalidClientWithFilesToLoad() {
+	void invalidClientWithFilesToLoad() {
 		DefaultSchemasLoader loader = new DefaultSchemasLoader(newClient("invalid-database-doesnt-exist"), null);
 		FailedRequestException ex = assertThrows(FailedRequestException.class,
 			() -> loader.loadSchemas(Paths.get("src", "test", "resources", "good-schemas").toString()));

ml-javaclient-util/src/test/resources/good-schemas/originals/tde/permissions.properties

@@ -1 +1 @@
-*=rest-reader,read,rest-writer,update
+*=rest-reader,read,rest-writer,update,Mixed-CASE,read

test-app/src/main/ml-config/security/roles/mixed-case.json

@@ -0,0 +1,4 @@
+{
+	"role-name": "Mixed-CASE",
+	"description": "Verifies that role names aren't improperly lowercased by any ml-gradle feature."
+}