Merge pull request #699 from mP1/feature/ExpressionFunctionParameter-…

…checkName-extracted ExpressionFunctionParameter.checkName extracted
mP1 · Dec 6, 2023 · 9dd83b5 · 9dd83b5
2 parents 08dfb0c + 17d81cb
commit 9dd83b5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameter.java b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameter.java
@@ -87,7 +87,7 @@ public static <T> ExpressionFunctionParameter<T> with(final ExpressionFunctionPa
                                                           final List<Class<?>> typeParameters,
                                                           final ExpressionFunctionParameterCardinality cardinality,
                                                           final Set<ExpressionFunctionParameterKind> kinds) {
-        Objects.requireNonNull(name, "name");
+        checkName(name);
         checkType(type);
         Objects.requireNonNull(typeParameters, "typeParameters");
         Objects.requireNonNull(cardinality, "cardinality");
@@ -102,6 +102,10 @@ public static <T> ExpressionFunctionParameter<T> with(final ExpressionFunctionPa
         );
     }
 
+    private static ExpressionFunctionParameterName checkName(final ExpressionFunctionParameterName name) {
+        return Objects.requireNonNull(name, "name");
+    }
+
     private static <T> Class<T> checkType(final Class<T> type) {
         return Objects.requireNonNull(type, "type");
     }
@@ -127,7 +131,7 @@ public ExpressionFunctionParameterName name() {
      * Would be setter that returns a {@link ExpressionFunctionParameter} with the given {@link ExpressionFunctionParameterName}.
      */
     public ExpressionFunctionParameter<T> setName(final ExpressionFunctionParameterName name) {
-        Objects.requireNonNull(name, "name");
+        checkName(name);
 
         return this.name.equals(name) ?
                 this :