Use Objects.requireNonNull()

apache · Dec 26, 2024 · f195e60 · f195e60
1 parent 54131ff
commit f195e60
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/org/apache/commons/validator/FormSet.java b/src/main/java/org/apache/commons/validator/FormSet.java
@@ -22,6 +22,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -222,19 +223,18 @@ private Log getLog() {
      *      definition (not sure about this)
      */
     protected int getType() {
+        final String myLanguage = getLanguage();
+        final String myCountry = getCountry();
         if (getVariant() != null) {
-            if (getLanguage() == null || getCountry() == null) {
-                throw new NullPointerException("When variant is specified, country and language must be specified.");
-            }
+            Objects.requireNonNull(myLanguage, "When variant is specified, country and language must be specified.");
+            Objects.requireNonNull(myCountry, "When variant is specified, country and language must be specified.");
             return VARIANT_FORMSET;
         }
-        if (getCountry() != null) {
-            if (getLanguage() == null) {
-                throw new NullPointerException("When country is specified, language must be specified.");
-            }
+        if (myCountry != null) {
+            Objects.requireNonNull(myLanguage, "When country is specified, language must be specified.");
             return COUNTRY_FORMSET;
         }
-        if (getLanguage() != null) {
+        if (myLanguage != null) {
             return LANGUAGE_FORMSET;
         }
         return GLOBAL_FORMSET;