Skip to content

ValidateDomainAndFieldNamesAction to use domainKind generateDomainURI() when applicable #6889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnathe merged 3 commits into from
Jul 31, 2025
Merged

ValidateDomainAndFieldNamesAction to use domainKind generateDomainURI() when applicable #6889

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f67988f
ValidateDomainAndFieldNamesAction to use domainKind generateDomainURI…
cnathe Jul 30, 2025
973b719
Merge branch 'develop' into fb_testDataGenValidateURI
cnathe Jul 30, 2025
364227f
add try/catch
cnathe Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions experiment/src/org/labkey/experiment/controllers/property/PropertyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,18 @@ public Object execute(DomainApiForm form, BindException errors)
DomainKind kind = PropertyService.get().getDomainKindByName(kindName);
if (kind == null)
throw new IllegalArgumentException("No domain kind matches name '" + kindName + "'");
String typeURI = "urn:lsid:labkey.com:" + kindName + ".Folder-1000.1001:1002"; // note using a fake lsid here, since not all domain kinds override generateDomainURI
Domain domain = PropertyService.get().createDomain(getContainer(), typeURI, "test");

// try using the DomainKind to generate a domain URI, if it supports it. default to using a fake / representative URI
String typeURI = null;
try
{
typeURI = kind.generateDomainURI("schemaName", "queryName", getContainer(), getUser());
}
catch (AssertionError ignored) {} // no-op if the DomainKind does not support generateDomainURI()
if (typeURI == null)
typeURI = "urn:lsid:labkey.com:" + kindName + ".Folder-21085:Test+Domain+Name-115c61b7-4faa-103e-8e7f-a47ad552213c";

Domain domain = PropertyService.get().createDomain(getContainer(), typeURI, "queryName");

boolean checkFieldNames = !domainDesign.getFields().isEmpty();
boolean checkDomainName = domainDesign.getName() != null;
Expand Down