Types & safety

voruti · Jul 22, 2023 · d95793d · d95793d
1 parent f309d64
commit d95793d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/voruti/velocityplayerlistquery/model/Config.java b/src/main/java/voruti/velocityplayerlistquery/model/Config.java
@@ -3,6 +3,7 @@
 import lombok.Builder;
 import lombok.Value;
 import lombok.experimental.Accessors;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @Value
 @Builder
@@ -30,6 +31,7 @@ public class Config {
      *      <li>{@code %2$s}: placeholder for the server name, on which that player is currently playing on</li>
      * </ul>
      */
+    @Nullable
     String serverListEntryFormat;
 
     /**
@@ -72,5 +74,6 @@ public class Config {
      * The version name to be set.
      * Used by {@link #fillMissingVersionInfo} and {@link #replaceVersionInfo}.
      */
+    @Nullable
     String versionName;
 }
diff --git a/src/main/java/voruti/velocityplayerlistquery/service/PersistenceService.java b/src/main/java/voruti/velocityplayerlistquery/service/PersistenceService.java
@@ -23,11 +23,12 @@ public class PersistenceService {
     Path dataDirectory;
 
     @NonNull
-    final Gson gson = new GsonBuilder()
+    Gson gson = new GsonBuilder()
             .setPrettyPrinting()
             .create();
 
 
+    @NonNull
     public Config loadConfig() {
         logger.trace("Loading config...");
 
@@ -47,17 +48,20 @@ public Config loadConfig() {
             }
 
             // load:
-            return gson.fromJson(
+            final Config loadedConfig = gson.fromJson(
                     Files.readString(configPath),
                     Config.class
             );
+            return loadedConfig != null
+                    ? loadedConfig
+                    : Config.DEFAULT;
         } catch (IOException | IllegalStateException e) {
             logger.error("Error while loading config", e);
             return Config.DEFAULT;
         }
     }
 
-    private <T> void writeFile(Path path, T content) throws IOException {
+    private <T> void writeFile(@NonNull final Path path, @NonNull final T content) throws IOException {
         logger.trace("Writing file: {}", path);
 
         Files.write(path, gson.toJson(content).getBytes());