Fixed NPE when commands not defined

wildmountainfarms · Aug 10, 2020 · 6be0aac · 6be0aac
1 parent 1106743
commit 6be0aac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/client/src/main/java/me/retrodaredevil/solarthing/config/options/CommandOption.java b/client/src/main/java/me/retrodaredevil/solarthing/config/options/CommandOption.java
@@ -1,16 +1,22 @@
 package me.retrodaredevil.solarthing.config.options;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import me.retrodaredevil.solarthing.annotations.NotNull;
+import me.retrodaredevil.solarthing.annotations.Nullable;
 import me.retrodaredevil.solarthing.commands.CommandInfo;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public interface CommandOption {
-	List<Command> getDeclaredCommands();
+	@Nullable List<Command> getDeclaredCommandsNullable();
+	default @NotNull List<Command> getDeclaredCommands() {
+		List<Command> commands = getDeclaredCommandsNullable();
+		if (commands == null) {
+			return Collections.emptyList();
+		}
+		return commands;
+	}
 
 	default Map<String, File> getCommandFileMap() {
 		Map<String, File> commandFileMap = new HashMap<>();

diff --git a/client/src/main/java/me/retrodaredevil/solarthing/config/options/MateProgramOptions.java b/client/src/main/java/me/retrodaredevil/solarthing/config/options/MateProgramOptions.java
@@ -37,7 +37,7 @@ public class MateProgramOptions extends PacketHandlingOptionBase implements IOBu
 
 
 	@Override
-	public List<Command> getDeclaredCommands() {
+	public @Nullable List<Command> getDeclaredCommandsNullable() {
 		return commands;
 	}
 

diff --git a/client/src/main/java/me/retrodaredevil/solarthing/config/options/RoverProgramOptions.java b/client/src/main/java/me/retrodaredevil/solarthing/config/options/RoverProgramOptions.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import me.retrodaredevil.solarthing.annotations.Nullable;
 
 import java.io.File;
 import java.util.List;
@@ -25,7 +26,7 @@ public class RoverProgramOptions extends RequestProgramOptionsBase implements Ro
 	private List<Command> commands;
 
 	@Override
-	public List<Command> getDeclaredCommands() {
+	public @Nullable List<Command> getDeclaredCommandsNullable() {
 		return commands;
 	}