Skip to content

Commit

Permalink
Remove old pref validator; new, shorter version lives in UserPreferen…
Browse files Browse the repository at this point in the history
…ceRequest
  • Loading branch information
ryanrdoherty committed Apr 14, 2021
1 parent bef6ee3 commit 6d9815f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 50 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.gusdb.wdk.model.WdkModelException;
import org.gusdb.wdk.model.user.User;
import org.gusdb.wdk.model.user.UserPreferences;
import org.gusdb.wdk.service.UserPreferenceValidator;
import org.gusdb.wdk.service.annotation.InSchema;
import org.gusdb.wdk.service.annotation.OutSchema;
import org.gusdb.wdk.service.annotation.PATCH;
Expand Down Expand Up @@ -103,25 +102,19 @@ private Response patchUserPrefs(JSONObject body, Scope scope) throws WdkModelExc
}
}

private void updateGlobalPreferences(UserPreferences prefs, UserPreferencesRequest request) throws DataValidationException {
UserPreferenceValidator.validatePreferenceSizes(request.getPreferenceUpdates());

private void updateGlobalPreferences(UserPreferences prefs, UserPreferencesRequest request) {
for (String key : request.getPreferenceUpdates().keySet()) {
prefs.setGlobalPreference(key, request.getPreferenceUpdates().get(key));
}

for (String key : request.getPreferenceDeletes()) {
prefs.unsetGlobalPreference(key);
}
}

private void updateProjectPreferences(UserPreferences prefs, UserPreferencesRequest request) throws DataValidationException {
UserPreferenceValidator.validatePreferenceSizes(request.getPreferenceUpdates());

private void updateProjectPreferences(UserPreferences prefs, UserPreferencesRequest request) {
for (String key : request.getPreferenceUpdates().keySet()) {
prefs.setProjectPreference(key, request.getPreferenceUpdates().get(key));
}

for (String key : request.getPreferenceDeletes()) {
prefs.unsetProjectPreference(key);
}
Expand Down

0 comments on commit 6d9815f

Please sign in to comment.