Repository: incubator-tamaya Updated Branches: refs/heads/master 3a50d2e6e -> 74a73954a
TAMAYA-333: null checks for ::equals(Object) methods This adds a null check for arguments passed to ::equals methods in the various converter classes. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/6119affa Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/6119affa Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/6119affa Branch: refs/heads/master Commit: 6119affa7b0c9e7841c21a9af23e07a4f6c1ca2d Parents: 119c498 Author: Aaron Coburn <[email protected]> Authored: Tue Mar 6 09:56:11 2018 -0500 Committer: Aaron Coburn <[email protected]> Committed: Tue Mar 6 09:56:11 2018 -0500 ---------------------------------------------------------------------- .../tamaya/core/internal/converters/BigDecimalConverter.java | 2 +- .../tamaya/core/internal/converters/BigIntegerConverter.java | 2 +- .../apache/tamaya/core/internal/converters/BooleanConverter.java | 2 +- .../org/apache/tamaya/core/internal/converters/ByteConverter.java | 2 +- .../org/apache/tamaya/core/internal/converters/CharConverter.java | 2 +- .../apache/tamaya/core/internal/converters/ClassConverter.java | 2 +- .../apache/tamaya/core/internal/converters/CurrencyConverter.java | 2 +- .../apache/tamaya/core/internal/converters/DoubleConverter.java | 2 +- .../apache/tamaya/core/internal/converters/DurationConverter.java | 3 ++- .../org/apache/tamaya/core/internal/converters/FileConverter.java | 2 +- .../apache/tamaya/core/internal/converters/FloatConverter.java | 2 +- .../apache/tamaya/core/internal/converters/InstantConverter.java | 3 ++- .../apache/tamaya/core/internal/converters/IntegerConverter.java | 2 +- .../tamaya/core/internal/converters/LocalDateConverter.java | 3 ++- .../tamaya/core/internal/converters/LocalDateTimeConverter.java | 3 ++- .../tamaya/core/internal/converters/LocalTimeConverter.java | 3 ++- .../org/apache/tamaya/core/internal/converters/LongConverter.java | 2 +- .../apache/tamaya/core/internal/converters/NumberConverter.java | 2 +- .../tamaya/core/internal/converters/OffsetDateTimeConverter.java | 3 ++- .../tamaya/core/internal/converters/OffsetTimeConverter.java | 3 ++- .../apache/tamaya/core/internal/converters/OptionalConverter.java | 3 ++- .../org/apache/tamaya/core/internal/converters/PathConverter.java | 2 +- .../apache/tamaya/core/internal/converters/ShortConverter.java | 2 +- .../apache/tamaya/core/internal/converters/SupplierConverter.java | 3 ++- .../org/apache/tamaya/core/internal/converters/URIConverter.java | 2 +- .../org/apache/tamaya/core/internal/converters/URLConverter.java | 2 +- 26 files changed, 35 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java index 7e71b7e..648f8bc 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java @@ -66,7 +66,7 @@ public class BigDecimalConverter implements PropertyConverter<BigDecimal>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java index edca14a..724362b 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java @@ -95,7 +95,7 @@ public class BigIntegerConverter implements PropertyConverter<BigInteger>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java index 7e61140..1f0a128 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java @@ -63,7 +63,7 @@ public class BooleanConverter implements PropertyConverter<Boolean> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java index 9b213cf..81d9cc5 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java @@ -73,7 +73,7 @@ public class ByteConverter implements PropertyConverter<Byte>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java index 7958ac3..b17e959 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java @@ -73,7 +73,7 @@ public class CharConverter implements PropertyConverter<Character>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java index b29bc15..7be9ec2 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java @@ -68,7 +68,7 @@ public class ClassConverter implements PropertyConverter<Class<?>>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java index b769d06..15e10e0 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java @@ -92,7 +92,7 @@ public class CurrencyConverter implements PropertyConverter<Currency> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java index e527756..2e71b61 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java @@ -83,7 +83,7 @@ public class DoubleConverter implements PropertyConverter<Double> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DurationConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DurationConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DurationConverter.java index f258186..84fb184 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DurationConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DurationConverter.java @@ -24,6 +24,7 @@ import org.osgi.service.component.annotations.Component; import java.time.Duration; import java.time.temporal.ChronoUnit; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -49,7 +50,7 @@ public class DurationConverter implements PropertyConverter<Duration> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FileConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FileConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FileConverter.java index e9891be..056c10c 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FileConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FileConverter.java @@ -52,7 +52,7 @@ public class FileConverter implements PropertyConverter<File> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java index 84daa10..1ed5b67 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java @@ -83,7 +83,7 @@ public class FloatConverter implements PropertyConverter<Float> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java index 4198b72..83a7c0b 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; import java.time.Instant; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,7 +48,7 @@ public class InstantConverter implements PropertyConverter<Instant> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java index d09df9b..ea3e6ea 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java @@ -76,7 +76,7 @@ public class IntegerConverter implements PropertyConverter<Integer>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java index 3bf9b67..b166e0c 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; import java.time.LocalDate; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,7 +48,7 @@ public class LocalDateConverter implements PropertyConverter<LocalDate> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java index eb14000..aa868e2 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; import java.time.LocalDateTime; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,7 +48,7 @@ public class LocalDateTimeConverter implements PropertyConverter<LocalDateTime> @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java index bf7d8ab..e4e10b4 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; import java.time.LocalTime; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,7 +48,7 @@ public class LocalTimeConverter implements PropertyConverter<LocalTime> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java index 121c490..3dbe432 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java @@ -73,7 +73,7 @@ public class LongConverter implements PropertyConverter<Long>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java index a7b2c43..08c8760 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java @@ -74,7 +74,7 @@ public class NumberConverter implements PropertyConverter<Number>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverter.java index 062d584..318e7ab 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverter.java @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; import java.time.OffsetDateTime; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,7 +48,7 @@ public class OffsetDateTimeConverter implements PropertyConverter<OffsetDateTime @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverter.java index 794ad8a..41acc64 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverter.java @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; import java.time.OffsetTime; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,7 +48,7 @@ public class OffsetTimeConverter implements PropertyConverter<OffsetTime> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OptionalConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OptionalConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OptionalConverter.java index dc53c84..edac1d1 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OptionalConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/OptionalConverter.java @@ -26,6 +26,7 @@ import org.osgi.service.component.annotations.Component; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.Objects; import java.util.Optional; /** @@ -54,7 +55,7 @@ public class OptionalConverter implements PropertyConverter<Optional> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/PathConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/PathConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/PathConverter.java index 404daee..5c66e91 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/PathConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/PathConverter.java @@ -53,7 +53,7 @@ public class PathConverter implements PropertyConverter<Path> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java index 7b561f3..beda7e7 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java @@ -73,7 +73,7 @@ public class ShortConverter implements PropertyConverter<Short>{ @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/SupplierConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/SupplierConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/SupplierConverter.java index 05aa3d5..7177d6a 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/SupplierConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/SupplierConverter.java @@ -26,6 +26,7 @@ import org.osgi.service.component.annotations.Component; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.Objects; import java.util.function.Supplier; import java.util.logging.Logger; @@ -60,7 +61,7 @@ public class SupplierConverter implements PropertyConverter<Supplier> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java index 793631e..2e653f2 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java @@ -52,7 +52,7 @@ public class URIConverter implements PropertyConverter<URI> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6119affa/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java index e1994bf..3f29979 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java @@ -52,7 +52,7 @@ public class URLConverter implements PropertyConverter<URL> { @Override public boolean equals(Object o){ - return getClass().equals(o.getClass()); + return Objects.nonNull(o) && getClass().equals(o.getClass()); } @Override
