Skip to content

Test: Use copied implementation of FileUtil.makeLegalName() #7089

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
labkey-nicka merged 2 commits into from
Oct 2, 2025
Merged

Test: Use copied implementation of FileUtil.makeLegalName() #7089

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10b598e
Test: Use copied implementation of FileUtil.makeLegalName()
labkey-nicka Sep 30, 2025
2e8d063
CRLF
labkey-nicka Oct 1, 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
5 changes: 2 additions & 3 deletions api/src/org/labkey/api/util/FileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ public static void startRequest()
tempPaths.get().clear();
}


@SuppressWarnings("RedundantOperationOnEmptyContainer")
public static void stopRequest()
{
Expand Down Expand Up @@ -1484,7 +1483,7 @@ public static void copyData(InputStream is, DataOutput os) throws IOException
os.write(buf,0,r);
}


// NOTE: Keep in sync with the copied constants in TestFileUtils
private static final char[] ILLEGAL_CHARS = {'/','\\',':','?','<','>','*','|','"','^', '\n', '\r', '\''};
public static final String ILLEGAL_CHARS_STRING = new String(ILLEGAL_CHARS);

Expand All @@ -1499,7 +1498,7 @@ public static boolean isLegalName(String name)
return !StringUtils.containsAny(name, ILLEGAL_CHARS);
}


// NOTE: Keep in sync with the copied implementation in TestFileUtils.makeLegalFileName()
public static String makeLegalName(String name)
{
if (name == null)
Expand Down