From 7221f37fb2c2ebf2ff66c865c3226479235c1d25 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 26 Mar 2019 20:34:36 +0100 Subject: [PATCH] Offload null value checking to CodeHelpers Since we are using a fixed string, we can easily offload the call to a centralized place in CodeHelpers, thus providing some minor class size improvements. Change-Id: I25991e7020bafc535dab6731063e39e92de03d95 Signed-off-by: Robert Varga --- .../binding/java/api/generator/ClassTemplate.xtend | 3 +-- .../yangtools/yang/binding/CodeHelpers.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend index 24f2972c62..d7acf20b7d 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend @@ -22,7 +22,6 @@ import java.util.Base64; import java.util.Collections import java.util.List import java.util.Map -import java.util.Objects import java.util.regex.Pattern import org.opendaylight.mdsal.binding.model.api.ConcreteType import org.opendaylight.mdsal.binding.model.api.Constant @@ -224,7 +223,7 @@ class ClassTemplate extends BaseTemplate { * consequence of how this code is structured. */ IF genTO.typedef && !allProperties.empty && allProperties.size == 1 && allProperties.get(0).name.equals("value")» - «Objects.importedName».requireNonNull(_value, "Supplied value may not be null"); + «CodeHelpers.importedName».requireValue(_value); «genPatternEnforcer("_value")» «ENDIF» diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java index 774ee6cdeb..a3fde03a2f 100644 --- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java +++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java @@ -67,6 +67,16 @@ public final class CodeHelpers { return value; } + /** + * A shortcut for {@code Objects.requireNonNull(value, "Supplied value may not be null")}. + * + * @param value Value itself + * @throws NullPointerException if value is null + */ + public static void requireValue(@Nullable final Object value) { + requireNonNull(value, "Supplied value may not be null"); + } + /** * Append a named value to a ToStringHelper. If the value is null, this method does nothing. * -- 2.36.6