Allow to set an argument explicitly to null, without falling back to the default value

tpietzsch · tpietzsch · commit dbb7330a8da8 · 2020-07-08T18:06:29.000+02:00
diff --git a/src/main/java/org/scijava/optional/AbstractOptions.java b/src/main/java/org/scijava/optional/AbstractOptions.java
@@ -73,9 +73,7 @@ public String toString()
 		@Override
 		public < T > T getValueOrDefault( final String key, final T defaultValue )
 		{
-			@SuppressWarnings( "unchecked" )
-			final T value = ( T ) theOptions.get( key );
-			return value == null ? defaultValue : value;
+			return theOptions.containsKey( key ) ? ( T ) theOptions.get( key ) : defaultValue;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,7 @@ public String toString()`
`73`	`73`	`@Override`
`74`	`74`	`public < T > T getValueOrDefault( final String key, final T defaultValue )`
`75`	`75`	`{`
`76`		`- @SuppressWarnings( "unchecked" )`
`77`		`- final T value = ( T ) theOptions.get( key );`
`78`		`- return value == null ? defaultValue : value;`
	`76`	`+ return theOptions.containsKey( key ) ? ( T ) theOptions.get( key ) : defaultValue;`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`