Add restrictions on names of domains #6140
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
labkey-susanh
requested changes
Dec 11, 2024
| inputs.get(inputsCategory).addAll(parents); | ||
| // TODO, parents broken |
| @@ -671,4 +671,10 @@ public boolean supportsPhiLevel() | |||
| { | |||
| return ComplianceService.get().isComplianceSupported(); | |||
| } | |||
|
|
|||
| @Override | |||
| public boolean supportNamingPattern() | |||
There was a problem hiding this comment.
Suggested change
| public boolean supportNamingPattern() | |
| public boolean supportsNamingPattern() |
| String prefix = "Invalid " + kindName + " name. "; | ||
|
|
||
| if (StringUtils.isBlank(domainName)) | ||
| return "Domain name must not be blank"; |
There was a problem hiding this comment.
Suggested change
| return "Domain name must not be blank"; | |
| return "Domain name must not be blank."; |
|
|
||
| char start = domainName.charAt(0); | ||
| if (!Character.isLetterOrDigit(start)) | ||
| return prefix + "Domain name must start with a letter or a number character."; |
There was a problem hiding this comment.
Suggested change
| return prefix + "Domain name must start with a letter or a number character."; | |
| return prefix + "Domain name must start with a letter or a number."; |
(or it could be "must not start with a letter or a digit")
| if (!Character.isLetterOrDigit(start)) | ||
| return prefix + "Domain name must start with a letter or a number character."; | ||
|
|
||
| //final String legalChars = " -_()&/.:"; |
| @@ -917,6 +935,32 @@ public static ValidationException updateDomainDescriptor(GWTDomain<? extends GWT | |||
| return validationException; | |||
| } | |||
|
|
|||
| public static @Nullable String validateDomainName(@NotNull String domainName, String kindName, boolean supportNamingPattern) | |||
There was a problem hiding this comment.
Suggested change
| public static @Nullable String validateDomainName(@NotNull String domainName, String kindName, boolean supportNamingPattern) | |
| public static @Nullable String validateDomainName(@NotNull String domainName, String kindName, boolean supportsNamingPattern) |
| @@ -917,6 +935,32 @@ public static ValidationException updateDomainDescriptor(GWTDomain<? extends GWT | |||
| return validationException; | |||
| } | |||
|
|
|||
| public static @Nullable String validateDomainName(@NotNull String domainName, String kindName, boolean supportNamingPattern) | |||
| { | |||
| String prefix = "Invalid " + kindName + " name. "; | |||
There was a problem hiding this comment.
Suggested change
| String prefix = "Invalid " + kindName + " name. "; | |
| String prefix = "Invalid " + kindName + " name '" + domainName + "'."; |
| } | ||
|
|
||
| @LogMethod | ||
| protected void renameDataset(String orgName, String newName, String orgLabel, String newLabel, String... fieldNames) | ||
| protected void renameDataset(String error, String orgName, String newName, String orgLabel, String newLabel, String... fieldNames) |
There was a problem hiding this comment.
Suggested change
| protected void renameDataset(String error, String orgName, String newName, String orgLabel, String newLabel, String... fieldNames) | |
| protected void renameDataset(@Nullable String error, String orgName, String newName, String orgLabel, String newLabel, String... fieldNames) |
labkey-susanh
approved these changes
Dec 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale
This set of PRs implement a set of rules what characters / patterns can be used as domain (sample, data class, list, etc) names for new domains as well as existing domains when they are re-named.
Related Pull Requests
Changes