Skip to content

split AnonymizedFieldTypeNames #11811

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
stevenwinship merged 1 commit into from
Nov 7, 2025
Merged

split AnonymizedFieldTypeNames #11811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
import edu.harvard.iq.dataverse.util.BundleUtil;
import edu.harvard.iq.dataverse.util.MailUtil;
import edu.harvard.iq.dataverse.util.StringUtil;
import edu.harvard.iq.dataverse.util.SystemConfig;
import edu.harvard.iq.dataverse.UserNotification.Type;
Expand Down Expand Up @@ -51,7 +50,8 @@
public class SettingsWrapper implements java.io.Serializable {

static final Logger logger = Logger.getLogger(SettingsWrapper.class.getCanonicalName());

public static final String COMMA_BETWEEN_OPTIONAL_WHITE_SPACE = "\\s*,\\s*";

@EJB
SettingsServiceBean settingsService;

Expand Down Expand Up @@ -396,7 +396,7 @@ public boolean isRsyncOnly() {
if (uploadMethods==null){
rsyncOnly = false;
} else {
rsyncOnly = Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size() == 1 && uploadMethods.toLowerCase().equals(SystemConfig.FileUploadMethods.RSYNC.toString());
rsyncOnly = Arrays.asList(uploadMethods.toLowerCase().split(COMMA_BETWEEN_OPTIONAL_WHITE_SPACE)).size() == 1 && uploadMethods.toLowerCase().equals(SystemConfig.FileUploadMethods.RSYNC.toString());
}
}
}
Expand Down Expand Up @@ -428,7 +428,7 @@ public Integer getUploadMethodsCount() {
if (uploadMethods==null){
uploadMethodsCount = 0;
} else {
uploadMethodsCount = Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size();
uploadMethodsCount = Arrays.asList(uploadMethods.toLowerCase().split(COMMA_BETWEEN_OPTIONAL_WHITE_SPACE)).size();
}
}
return uploadMethodsCount;
Expand Down Expand Up @@ -502,7 +502,7 @@ public boolean shouldBeAnonymized(DatasetField df) {
if (anonymizedFieldTypes == null) {
anonymizedFieldTypes = new ArrayList<String>();
String names = get(SettingsServiceBean.Key.AnonymizedFieldTypeNames.toString(), "");
anonymizedFieldTypes.addAll(Arrays.asList(names.split(",\\s")));
anonymizedFieldTypes.addAll(Arrays.asList(names.split(COMMA_BETWEEN_OPTIONAL_WHITE_SPACE)));
}
return anonymizedFieldTypes.contains(df.getDatasetFieldType().getName());
}
Expand Down Expand Up @@ -830,7 +830,7 @@ private Boolean getUploadMethodAvailable(String method){
if (uploadMethods==null){
return false;
} else {
return Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).contains(method);
return Arrays.asList(uploadMethods.toLowerCase().split(COMMA_BETWEEN_OPTIONAL_WHITE_SPACE)).contains(method);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5345,7 +5345,7 @@ public Response getPrivateUrlDatasetVersion(@PathParam("privateUrlToken") String
}
JsonObjectBuilder responseJson;
if (isAnonymizedAccess) {
List<String> anonymizedFieldTypeNamesList = new ArrayList<>(Arrays.asList(anonymizedFieldTypeNames.split(",\\s")));
List<String> anonymizedFieldTypeNamesList = new ArrayList<>(Arrays.asList(anonymizedFieldTypeNames.split(SettingsWrapper.COMMA_BETWEEN_OPTIONAL_WHITE_SPACE)));
responseJson = json(dsv, anonymizedFieldTypeNamesList, true, returnOwners);
} else {
responseJson = json(dsv, null, true, returnOwners);
Expand All @@ -5371,7 +5371,7 @@ public Response getPreviewUrlDatasetVersion(@PathParam("previewUrlToken") String
}
JsonObjectBuilder responseJson;
if (isAnonymizedAccess) {
List<String> anonymizedFieldTypeNamesList = new ArrayList<>(Arrays.asList(anonymizedFieldTypeNames.split(",\\s")));
List<String> anonymizedFieldTypeNamesList = new ArrayList<>(Arrays.asList(anonymizedFieldTypeNames.split(SettingsWrapper.COMMA_BETWEEN_OPTIONAL_WHITE_SPACE)));
responseJson = json(dsv, anonymizedFieldTypeNamesList, true, returnOwners);
} else {
responseJson = json(dsv, null, true, returnOwners);
Expand Down