Fixed CF bugs

Author: DavyLandman

src/main/java/io/usethesource/vallang/IWithKeywordParameters.java

@@ -26,7 +26,7 @@ public interface IWithKeywordParameters<T extends IValue> {
      * @param label identifies the parameter
      * @return a value if the parameter has a value on this node or null otherwise
      */
-    public <X extends IValue> @Nullable X getParameter(String label);
+    public <X extends @Nullable IValue> X getParameter(String label);
 
     /**
      * Set the value of an parameter

src/main/java/io/usethesource/vallang/impl/fields/AbstractDefaultWithKeywordParameters.java

@@ -14,10 +14,9 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-
+import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
-
 import io.usethesource.capsule.util.collection.AbstractSpecialisedImmutableMap;
 import io.usethesource.vallang.IValue;
 import io.usethesource.vallang.IWithKeywordParameters;
@@ -67,7 +66,7 @@ public String toString() {
 
     @SuppressWarnings("unchecked")
     @Override
-    public @Nullable <X extends IValue> X getParameter(String label) {
+    public <X extends @Nullable IValue> X getParameter(String label) {
         return (X) parameters.get(label);
     }
 
@@ -92,7 +91,8 @@ public T unsetAll() {
     }
 
     @Override
-    @Pure
+    @SuppressWarnings("contracts.conditional.postcondition") // CF has a bug around super classes with EnsuresNonNullIf
+    @EnsuresNonNullIf(expression="getParameter(#1)", result=true)
     public boolean hasParameter(String label) {
         return parameters.containsKey(label);
     }

src/main/java/io/usethesource/vallang/type/FunctionType.java

@@ -22,9 +22,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
+import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
 import org.checkerframework.checker.nullness.qual.Nullable;
-
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.IList;
 import io.usethesource.vallang.IListWriter;
@@ -212,6 +211,8 @@ public Type getKeywordParameterTypes() {
     }
 
     @Override
+    @SuppressWarnings("contracts.conditional.postcondition") // CF has a bug around superclass annotations
+    @EnsuresNonNullIf(expression="getKeywordParameterType(#1)", result=true)
     public boolean hasKeywordParameter(String label) {
         return keywordParameters != null ? keywordParameters.hasField(label) : false;
     }

src/main/java/io/usethesource/vallang/type/TypeStore.java

@@ -910,6 +910,7 @@ public boolean hasKeywordParameters(Type onType) {
         }
     }
 
+    @SuppressWarnings({"flowexpr.parameter.not.final", "contracts.conditional.postcondition"}) // CF has issues trusting our annotation
     @EnsuresNonNullIf(expression="getKeywordParameterType(#1,#2)", result=true)
     public boolean hasKeywordParameter(Type onType, String label) {
         if (!onType.isConstructor()) {