FRI-398 Force branch paths to be in UPPER CASE

IHTSDO · Dec 28, 2022 · 16477a7 · 16477a7
1 parent e989674
commit 16477a7
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 58 deletions.
diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/SBranchService.java b/src/main/java/org/snomed/snowstorm/core/data/services/SBranchService.java
@@ -9,6 +9,7 @@
 import io.kaicode.elasticvc.repositories.BranchRepository;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.sort.SortBuilders;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snomed.snowstorm.core.data.domain.CodeSystem;
@@ -66,6 +67,10 @@ public Branch create(String branch) {
 	}
 
 	public Branch create(String branchPath, Map<String, Object> metadataMap) {
+		if (!branchPath.toUpperCase().equals(branchPath)) {
+			throw new IllegalArgumentException("Branch path must be in UPPER CASE.");
+		}
+
 		// Copy classification state from parent branch
 		final String parentPath = PathUtil.getParentPath(branchPath);
 		final Metadata metadata = new Metadata(metadataMap);

diff --git a/src/test/java/org/snomed/snowstorm/core/data/services/CodeSystemServiceTest.java b/src/test/java/org/snomed/snowstorm/core/data/services/CodeSystemServiceTest.java
@@ -30,7 +30,7 @@ void createCodeSystems() {
 	void createCodeSystemWithBadBranchPath() {
 		codeSystemService.createCodeSystem(new CodeSystem("SNOMEDCT", "MAIN"));
 		assertEquals(1, codeSystemService.findAll().size());
-		CodeSystem codeSystemBe = new CodeSystem("SNOMEDCT-TEST", "MAIN.test");
+		CodeSystem codeSystemBe = new CodeSystem("SNOMEDCT-TEST", "MAIN.TEST");
 		assertThrows(IllegalArgumentException.class, () -> codeSystemService.createCodeSystem(codeSystemBe));
 	}