File tree Expand file tree Collapse file tree
src/main/java/edu/harvard/iq/dataverse/settings Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3131import java .util .List ;
3232import java .util .Locale ;
3333import java .util .Map ;
34+ import java .util .Objects ;
3435import java .util .Set ;
3536import java .util .StringTokenizer ;
3637import java .util .function .Function ;
@@ -1114,6 +1115,10 @@ public JsonObject listAllAsJson() {
11141115 * @throws IllegalArgumentException if the JSON object contains invalid keys or invalid settings.
11151116 */
11161117 public void setAllFromJson (JsonObject settings ) {
1118+ if (settings == null ) {
1119+ throw new IllegalArgumentException ("Settings cannot be null" );
1120+ }
1121+
11171122 // Validate the input
11181123 List <String > invalidKeys = validateKeys (settings );
11191124 if (!invalidKeys .isEmpty ()) {
@@ -1331,6 +1336,7 @@ public static String convertToJsonKey(Setting setting) {
13311336 * @return a list of invalid keys as an unmodifiable list
13321337 */
13331338 public static List <String > validateKeys (JsonObject settings ) {
1339+ Objects .requireNonNull (settings , "The settings object cannot be null." );
13341340 List <String > invalidKeys = new ArrayList <>();
13351341 for (String key : settings .keySet ()) {
13361342 try {
You can’t perform that action at this time.
0 commit comments