Commitd0a8045

committed

Require non-null values for Option typed fields, and also for directly setting an Option object as well.

This prevents Option fields being set to `Some(null)`, which is unexpected and can lead to bugs.#27

1 parentf80022d commitd0a8045Copy full SHA for d0a8045

File tree

+38

-5

lines changed

vavr-encodings/src/main/java/org/immutables/vavr/encodings
- VavrOptionEncoding.java
vavr-examples/src/test/java/org/immutables/vavr/tests/examples
- ExampleOptionTest.java

+38

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,11 @@`
`16`	`16`
`17`	`17`	`packageorg.immutables.vavr.encodings;`
`18`	`18`
`19`		`-importio.vavr.control.Option;`
	`19`	`+importjava.util.Objects;`
	`20`	`+`
`20`	`21`	`importorg.immutables.encode.Encoding;`
`21`	`22`
`22`		`-importjava.util.Objects;`
	`23`	`+importio.vavr.control.Option;`
`23`	`24`
`24`	`25`	`@Encoding`
`25`	`26`	`classVavrOptionEncoding<T>`
`@@ -43,7 +44,7 @@ public Option<T> withOption(`
`43`	`44`	`publicOption<T>with(`
`44`	`45`	`finalTvalue)`
`45`	`46`	`{`
`46`		`-returnOption.some(value);`
	`47`	`+returnOption.some(Objects.requireNonNull(value));`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`@Encoding.Builder`
`@@ -61,14 +62,14 @@ static final class Builder<T>`
`61`	`62`	`voidset(`
`62`	`63`	`finalOption<T>opt)`
`63`	`64`	`{`
`64`		`-this.optional =opt;`
	`65`	`+this.optional =Objects.requireNonNull(opt);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Encoding.Init`
`68`	`69`	`voidsetValue(`
`69`	`70`	`finalTx)`
`70`	`71`	`{`
`71`		`-this.optional =Option.of(x);`
	`72`	`+this.optional =Option.some(Objects.requireNonNull(x));`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`@Encoding.Naming(value ="unset*")`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,36 @@ public void testUnset()`
`69`	`69`	`finalImmutableExampleOptionTypea0 =b.build();`
`70`	`70`	`Assert.assertEquals(Option.none(),a0.optionalInteger());`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+@Test(expected =NullPointerException.class)`
	`74`	`+publicvoidtestSetNullValue()`
	`75`	`+ {`
	`76`	`+finalImmutableExampleOptionType.Builderb =`
	`77`	`+ImmutableExampleOptionType.builder();`
	`78`	`+b.optionalInteger((Integer)null);`
	`79`	`+ }`
	`80`	`+`
	`81`	`+@Test(expected =NullPointerException.class)`
	`82`	`+publicvoidtestSetNullOption()`
	`83`	`+ {`
	`84`	`+finalImmutableExampleOptionType.Builderb =`
	`85`	`+ImmutableExampleOptionType.builder();`
	`86`	`+b.optionalInteger((Option<Integer>)null);`
	`87`	`+ }`
	`88`	`+`
	`89`	`+@Test(expected =NullPointerException.class)`
	`90`	`+publicvoidtestWithNull()`
	`91`	`+ {`
	`92`	`+finalImmutableExampleOptionTypeb =`
	`93`	`+ImmutableExampleOptionType.builder().build();`
	`94`	`+b.withOptionalInteger((Integer)null);`
	`95`	`+ }`
	`96`	`+`
	`97`	`+@Test(expected =NullPointerException.class)`
	`98`	`+publicvoidtestWithNullOption()`
	`99`	`+ {`
	`100`	`+finalImmutableExampleOptionTypeb =`
	`101`	`+ImmutableExampleOptionType.builder().build();`
	`102`	`+b.withOptionalInteger((Option<Integer>)null);`
	`103`	`+ }`
`72`	`104`	`}`

Comments

(0)