Merge pull request #237 from avaje/feature/add-missing-nullable

Add missing @nullable annotations on internal methods

Author: SentryMan

avaje-config/src/main/java/io/avaje/config/Configuration.java

@@ -569,7 +569,8 @@ interface ExpressionEval {
     /**
      * Evaluate a configuration expression.
      */
-    String eval(String expression);
+    @Nullable
+    String eval(@Nullable String expression);
   }
 
   /**
@@ -818,11 +819,13 @@ interface Entry {
     /**
      * Return the source of the entry.
      */
+    @Nullable
     String source();
 
     /**
      * Return the String value of the entry.
      */
+    @Nullable
     String value();
   }
 }

avaje-config/src/main/java/io/avaje/config/CoreConfiguration.java

@@ -40,8 +40,8 @@ final class CoreConfiguration implements Configuration {
   private final List<ConfigurationPlugin> plugins;
 
   private boolean loadedSystemProperties;
-  private FileWatch watcher;
-  private Timer timer;
+  private @Nullable FileWatch watcher;
+  private @Nullable Timer timer;
   private final String pathPrefix;
 
   CoreConfiguration(CoreComponents components, CoreEntry.CoreMap entries) {
@@ -259,7 +259,8 @@ public String getNullable(String key) {
   }
 
   @Override
-  public String getNullable(String key, String defaultValue) {
+  @Nullable
+  public String getNullable(String key, @Nullable String defaultValue) {
     requireNonNull(key, "key is required");
     return properties.entry(key, defaultValue).value();
   }
@@ -268,7 +269,7 @@ public String getNullable(String key, String defaultValue) {
   public String get(String key, String defaultValue) {
     requireNonNull(key, "key is required");
     requireNonNull(defaultValue, "defaultValue is required, use getOptional() instead");
-    return properties.entry(key, defaultValue).value();
+    return requireNonNull(properties.entry(key, defaultValue).value());
   }
 
   @Override
@@ -277,7 +278,7 @@ public Optional<String> getOptional(String key) {
   }
 
   @Override
-  public Optional<String> getOptional(String key, String defaultValue) {
+  public Optional<String> getOptional(String key, @Nullable String defaultValue) {
     return Optional.ofNullable(getNullable(key, defaultValue));
   }
 
@@ -504,6 +505,7 @@ int size() {
       return entries.size();
     }
 
+    @Nullable
     String eval(String value) {
       return eval.eval(value);
     }
@@ -527,7 +529,7 @@ CoreEntry entry(String key) {
       return _entry(key, null);
     }
 
-    CoreEntry entry(String key, String defaultValue) {
+    CoreEntry entry(String key, @Nullable String defaultValue) {
       return _entry(key, defaultValue);
     }
 
@@ -576,7 +578,7 @@ private static String systemValue(String key) {
     void loadIntoSystemProperties(Set<String> excludedSet) {
       entries.forEach((key, entry) -> {
         if (!excludedSet.contains(key) && !entry.isNull()) {
-          System.setProperty(key, entry.value());
+          System.setProperty(key, requireNonNull(entry.value()));
         }
       });
     }

avaje-config/src/main/java/io/avaje/config/CoreEntry.java

@@ -20,9 +20,9 @@ final class CoreEntry implements Configuration.Entry {
    */
   static final CoreEntry NULL_ENTRY = new CoreEntry();
 
-  private final String value;
+  private @Nullable final String value;
   private final boolean boolValue;
-  private final String source;
+  private @Nullable final String source;
 
   /**
    * Return a new empty entryMap for entries.
@@ -80,6 +80,7 @@ boolean needsEvaluation() {
   }
 
   @Override
+  @Nullable
   public String value() {
     return value;
   }
@@ -89,6 +90,7 @@ boolean boolValue() {
   }
 
   @Override
+  @Nullable
   public String source() {
     return source;
   }

avaje-config/src/main/java/io/avaje/config/CoreExpressionEval.java

@@ -1,7 +1,11 @@
 package io.avaje.config;
 
+import org.jspecify.annotations.Nullable;
+
 import java.util.Properties;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Helper used to evaluate expressions such as ${CATALINA_HOME}.
  * <p>
@@ -51,14 +55,15 @@ static CoreEntry.CoreMap evalFor(CoreEntry.CoreMap map) {
   private CoreEntry.CoreMap evalAll() {
     sourceMap.forEach((key, entry) -> {
       if (entry.needsEvaluation()) {
-        sourceMap.put(key, eval(entry.value()), entry.source());
+        sourceMap.put(key, eval(entry.value()), requireNonNull(entry.source()));
       }
     });
     return sourceMap;
   }
 
   @Override
-  public String eval(String val) {
+  @Nullable
+  public String eval(@Nullable String val) {
     return val == null ? null : evalRecurse(val);
   }